fix(controllers): don't cache secrets as it can consume a lot of memory

enix · Oct 19, 2023 · c77d8e6 · c77d8e6
1 parent 26a2eb2
commit c77d8e6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/cmd/cache/main.go b/cmd/cache/main.go
@@ -95,6 +95,7 @@ func main() {
 		Client:      mgr.GetClient(),
 		Scheme:      mgr.GetScheme(),
 		Recorder:    mgr.GetEventRecorderFor("cachedimage-controller"),
+		ApiReader:   mgr.GetAPIReader(),
 		ExpiryDelay: time.Duration(expiryDelay*24) * time.Hour,
 	}).SetupWithManager(mgr, maxConcurrentCachedImageReconciles); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "CachedImage")

diff --git a/controllers/cachedimage_controller.go b/controllers/cachedimage_controller.go
@@ -38,6 +38,7 @@ type CachedImageReconciler struct {
 	client.Client
 	Scheme      *runtime.Scheme
 	Recorder    record.EventRecorder
+	ApiReader   client.Reader
 	ExpiryDelay time.Duration
 }
 
@@ -128,7 +129,7 @@ func (r *CachedImageReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 	if !isCached {
 		r.Recorder.Eventf(&cachedImage, "Normal", "Caching", "Start caching image %s", cachedImage.Spec.SourceImage)
-		keychain := registry.NewKubernetesKeychain(r.Client, cachedImage.Spec.PullSecretsNamespace, cachedImage.Spec.PullSecretNames)
+		keychain := registry.NewKubernetesKeychain(r.ApiReader, cachedImage.Spec.PullSecretsNamespace, cachedImage.Spec.PullSecretNames)
 		if err := registry.CacheImage(cachedImage.Spec.SourceImage, keychain); err != nil {
 			log.Error(err, "failed to cache image")
 			r.Recorder.Eventf(&cachedImage, "Warning", "CacheFailed", "Failed to cache image %s, reason: %s", cachedImage.Spec.SourceImage, err)

diff --git a/internal/registry/keychain.go b/internal/registry/keychain.go
@@ -24,13 +24,13 @@ const (
 )
 
 type kubernetesKeychain struct {
-	client     client.Client
+	client     client.Reader
 	mu         sync.Mutex
 	namespace  string
 	pullSecret string
 }
 
-func NewKubernetesKeychain(client client.Client, namespace string, pullSecrets []string) authn.Keychain {
+func NewKubernetesKeychain(client client.Reader, namespace string, pullSecrets []string) authn.Keychain {
 	keychains := []authn.Keychain{}
 	for _, pullSecret := range pullSecrets {
 		keychains = append(keychains, &kubernetesKeychain{