Fix nil pointer bug in credentials

kubernetes-sigs · Jan 18, 2024 · 6b79e37 · 6b79e37
1 parent 6deb57d
commit 6b79e37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/controllers/helmchartproxy/helmchartproxy_controller_phases.go b/controllers/helmchartproxy/helmchartproxy_controller_phases.go
@@ -230,7 +230,7 @@ func constructHelmReleaseProxy(existing *addonsv1alpha1.HelmReleaseProxy, helmCh
 	}
 
 	// Set the default value for EnableClientCache if it is not set
-	if helmReleaseProxy.Spec.Options.EnableClientCache == nil {
+	if helmReleaseProxy.Spec.Options != nil && helmReleaseProxy.Spec.Options.EnableClientCache == nil {
 		helmReleaseProxy.Spec.Options.EnableClientCache = &defaultEnableClientCache
 	}
 

diff --git a/internal/helm_client.go b/internal/helm_client.go
@@ -210,7 +210,7 @@ func (c *HelmClient) InstallHelmRelease(ctx context.Context, kubeconfig string,
 	settings.RegistryConfig = credentialsPath
 
 	enableClientCache := true
-	if spec.Options.EnableClientCache != nil {
+	if spec.Options != nil && spec.Options.EnableClientCache != nil {
 		enableClientCache = *spec.Options.EnableClientCache
 	}
 	log.V(2).Info("Creating install registry client", "enableClientCache", enableClientCache, "credentialsPath", credentialsPath)
@@ -343,7 +343,7 @@ func (c *HelmClient) UpgradeHelmReleaseIfChanged(ctx context.Context, kubeconfig
 	settings.RegistryConfig = credentialsPath
 
 	enableClientCache := true
-	if spec.Options.EnableClientCache != nil {
+	if spec.Options != nil && spec.Options.EnableClientCache != nil {
 		enableClientCache = *spec.Options.EnableClientCache
 	}
 	log.V(2).Info("Creating upgrade registry client", "enableClientCache", enableClientCache, "credentialsPath", credentialsPath)