fix: changes based on review

Author: faiq

make/dev.mk

@@ -12,14 +12,12 @@ endif
 	kind load docker-image --name $(KIND_CLUSTER_NAME) \
 		ghcr.io/nutanix-cloud-native/caren-helm-reg:$$(gojq -r .version dist/metadata.json)
 	helm upgrade --install cluster-api-runtime-extensions-nutanix ./charts/cluster-api-runtime-extensions-nutanix \
-		--create-namespace \
-		--namespace caren-system \
 		--set-string image.repository=ko.local/cluster-api-runtime-extensions-nutanix \
 		--set-string image.tag=$$(gojq -r .version dist/metadata.json) \
 		--set-string mindthegapImage.tag=$$(gojq -r .version dist/metadata.json) \
 		--wait --wait-for-jobs
-	kubectl rollout restart deployment -n caren-system cluster-api-runtime-extensions-nutanix
-	kubectl rollout status deployment  -n caren-system cluster-api-runtime-extensions-nutanix
+	kubectl rollout restart deployment cluster-api-runtime-extensions-nutanix
+	kubectl rollout status deployment cluster-api-runtime-extensions-nutanix
 
 .PHONY: dev.update-webhook-image-on-kind
 dev.update-webhook-image-on-kind: export KUBECONFIG := $(KIND_KUBECONFIG)
@@ -29,9 +27,9 @@ ifndef SKIP_BUILD
 endif
 	kind load docker-image --name $(KIND_CLUSTER_NAME) \
 		ko.local/cluster-api-runtime-extensions-nutanix:$$(gojq -r .version dist/metadata.json)
-	kubectl set image deployment -n caren-system cluster-api-runtime-extensions-nutanix webhook=ko.local/cluster-api-runtime-extensions-nutanix:$$(gojq -r .version dist/metadata.json)
-	kubectl rollout restart deployment -n caren-system cluster-api-runtime-extensions-nutanix
-	kubectl rollout status deployment -n caren-system cluster-api-runtime-extensions-nutanix
+	kubectl set image deployment cluster-api-runtime-extensions-nutanix webhook=ko.local/cluster-api-runtime-extensions-nutanix:$$(gojq -r .version dist/metadata.json)
+	kubectl rollout restart deployment cluster-api-runtime-extensions-nutanix
+	kubectl rollout status deployment cluster-api-runtime-extensions-nutanix
 
 
 .PHONY: dev.update-bootstrap-credentials-aws

pkg/handlers/generic/lifecycle/csi/nutanix-csi/handler.go

@@ -194,7 +194,6 @@ func (n *NutanixCSI) handleHelmAddonApply(
 			ValuesTemplate:   values,
 		},
 	}
-
 	lifecycleutils.SetTLSConfigForHelmChartProxyIfNeeded(storageChartProxy)
 	snapshotChartProxy := &caaphv1.HelmChartProxy{
 		TypeMeta: metav1.TypeMeta{

pkg/handlers/generic/lifecycle/utils/utils.go

@@ -6,6 +6,7 @@ package utils
 import (
 	"context"
 	"fmt"
+	"os"
 	"strings"
 
 	corev1 "k8s.io/api/core/v1"
@@ -224,11 +225,16 @@ func CreateConfigMapForCRS(configMapName, configMapNamespace string,
 }
 
 func SetTLSConfigForHelmChartProxyIfNeeded(hcp *caaphv1.HelmChartProxy) {
+	// this is set as an environment variable from the downward API on deployment
+	deploymentNS := os.Getenv("POD_NAMESPACE")
+	if deploymentNS == "" {
+		deploymentNS = v1alpha1.CarenNamespace
+	}
 	if strings.Contains(hcp.Spec.RepoURL, "mindthegap") {
 		hcp.Spec.TLSConfig = &caaphv1.TLSConfig{
 			CASecretRef: &corev1.SecretReference{
 				Name:      "mindthegap-tls",
-				Namespace: v1alpha1.CarenNamespace,
+				Namespace: deploymentNS,
 			},
 		}
 	}