fix: updates items with new namespace

Author: faiq

README.md

@@ -51,6 +51,7 @@ export KUBERNETES_VERSION=v1.28.7
 clusterctl generate cluster ${CLUSTER_NAME} \
   --from ${CLUSTER_FILE} \
   --kubernetes-version ${KUBERNETES_VERSION} \
+  -n caren-system \
   --worker-machine-count 1 | \
   kubectl apply --server-side -f -
 ```

charts/cluster-api-runtime-extensions-nutanix/crds/crd-trust.cert-manager.io_bundles.yaml

@@ -1,17 +1,10 @@
-# Copyright 2024 Nutanix. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
-# Copyright 2023 D2iQ, Inc. All rights reserved.
-# SPDX-License-Identifier: Apache-2.0
-
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: "bundles.trust.cert-manager.io"
   annotations:
-    helm.sh/resource-policy: keep
     meta.helm.sh/release-name: cluster-api-runtime-extensions-nutanix
-    meta.helm.sh/release-namespace: default
+    meta.helm.sh/release-namespace: caren-system
   labels:
     app.kubernetes.io/managed-by: Helm
 spec:

charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/aws-cluster-class.yaml

@@ -4,6 +4,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: aws
   name: aws-quick-start
+  namespace: caren-system
 spec:
   controlPlane:
     machineInfrastructure:
@@ -64,6 +65,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: aws
   name: aws-quick-start
+  namespace: caren-system
 spec:
   template:
     spec: {}
@@ -74,6 +76,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: aws
   name: aws-quick-start-control-plane
+  namespace: caren-system
 spec:
   template:
     spec:
@@ -102,6 +105,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: aws
   name: aws-quick-start-control-plane
+  namespace: caren-system
 spec:
   template:
     spec:
@@ -114,6 +118,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: aws
   name: aws-quick-start-worker-machinetemplate
+  namespace: caren-system
 spec:
   template:
     spec:
@@ -126,6 +131,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: aws
   name: aws-quick-start-worker-bootstraptemplate
+  namespace: caren-system
 spec:
   template:
     spec:

charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/docker-cluster-class.yaml

@@ -4,6 +4,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: docker
   name: docker-quick-start
+  namespace: caren-system
 spec:
   controlPlane:
     machineInfrastructure:
@@ -50,6 +51,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: docker
   name: docker-quick-start-cluster
+  namespace: caren-system
 spec:
   template:
     spec: {}
@@ -60,6 +62,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: docker
   name: docker-quick-start-control-plane
+  namespace: caren-system
 spec:
   template:
     spec:
@@ -76,6 +79,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: docker
   name: docker-quick-start-control-plane
+  namespace: caren-system
 spec:
   template:
     spec:
@@ -89,6 +93,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: docker
   name: docker-quick-start-default-worker-machinetemplate
+  namespace: caren-system
 spec:
   template:
     spec:
@@ -102,6 +107,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: docker
   name: docker-quick-start-default-worker-bootstraptemplate
+  namespace: caren-system
 spec:
   template:
     spec:

charts/cluster-api-runtime-extensions-nutanix/defaultclusterclasses/nutanix-cluster-class.yaml

@@ -4,6 +4,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: nutanix
   name: nutanix-quick-start-kcfg-0
+  namespace: caren-system
 spec:
   template:
     spec:
@@ -26,6 +27,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: nutanix
   name: nutanix-quick-start
+  namespace: caren-system
 spec:
   controlPlane:
     machineHealthCheck:
@@ -116,6 +118,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: nutanix
   name: nutanix-quick-start-kcpt
+  namespace: caren-system
 spec:
   template:
     spec:
@@ -164,6 +167,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: nutanix
   name: nutanix-quick-start-nct
+  namespace: caren-system
 spec:
   template:
     spec:
@@ -185,6 +189,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: nutanix
   name: nutanix-quick-start-cp-nmt
+  namespace: caren-system
 spec:
   template:
     spec:
@@ -210,6 +215,7 @@ metadata:
   labels:
     cluster.x-k8s.io/provider: nutanix
   name: nutanix-quick-start-md-nmt
+  namespace: caren-system
 spec:
   template:
     spec:

charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml

@@ -10,36 +10,37 @@ data:
   cilium: |
     ChartName: cilium
     ChartVersion: 1.15.0
-    RepositoryURL: oci://mindthegap.mindthegap.svc/charts
+    RepositoryURL: oci://mindthegap.caren-system.svc/charts
   cluster-autoscaler: |
     ChartName: cluster-autoscaler
     ChartVersion: 9.35.0
-    RepositoryURL: oci://mindthegap.mindthegap.svc/charts
+    RepositoryURL: oci://mindthegap.caren-system.svc/charts
   metallb: |
     ChartName: metallb
     ChartVersion: v0.14.5
-    RepositoryURL: oci://mindthegap.mindthegap.svc/charts
+    RepositoryURL: oci://mindthegap.caren-system.svc/charts
   nfd: |
     ChartName: node-feature-discovery
     ChartVersion: 0.15.2
-    RepositoryURL: oci://mindthegap.mindthegap.svc/charts
+    RepositoryURL: oci://mindthegap.caren-system.svc/charts
   nutanix-ccm: |
     ChartName: nutanix-cloud-provider
     ChartVersion: 0.3.3
-    RepositoryURL: oci://mindthegap.mindthegap.svc/charts
+    RepositoryURL: oci://mindthegap.caren-system.svc/charts
   nutanix-snapshot-csi: |
     ChartName: nutanix-csi-snapshot
     ChartVersion: 6.3.2
-    RepositoryURL: oci://mindthegap.mindthegap.svc/charts
+    RepositoryURL: oci://mindthegap.caren-system.svc/charts
   nutanix-storage-csi: |
     ChartName: nutanix-csi-storage
     ChartVersion: 3.0.0-beta.1912
-    RepositoryURL: oci://mindthegap.mindthegap.svc/charts
+    RepositoryURL: oci://mindthegap.caren-system.svc/charts
   tigera-operator: |
     ChartName: tigera-operator
     ChartVersion: v3.26.4
-    RepositoryURL: oci://mindthegap.mindthegap.svc/charts
+    RepositoryURL: oci://mindthegap.caren-system.svc/charts
 kind: ConfigMap
 metadata:
   creationTimestamp: null
   name: {{ .Values.helmAddonsConfigMap }}
+  namespace: caren-system

charts/cluster-api-runtime-extensions-nutanix/templates/mindthegap.yaml

@@ -3,32 +3,23 @@
 # This file contains the manifests to run a mindthegap deployment which contains helm charts for our addons.
 # The pod is built via goreleaser with configuration from hack/addons.
 #
-# NOTE: We use a hard code namespace here because trust-manager
-# need to set app.trust.namespace to be able to read secrets
-# from this namespace. We then distribute the certificates
-# to CAAPH system, which is the primary user of this service.
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: mindthegap
----
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
   name: mindthegap-selfsigned
-  namespace: mindthegap
+  namespace: {{ .Release.Namespace }}
 spec:
   selfSigned: {}
 ---
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
   name: mindthegap-tls
-  namespace: mindthegap
+  namespace: {{ .Release.Namespace }}
 spec:
   dnsNames:
-  - mindthegap.mindthegap.svc
-  - mindthegap.mindthegap.svc.cluster.local
+  - mindthegap.{{ .Release.Namespace }}.svc
+  - mindthegap.{{ .Release.Namespace }}.svc.cluster.local
   issuerRef:
     name: mindthegap-selfsigned
     kind: Issuer
@@ -38,7 +29,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mindthegap
-  namespace: mindthegap
+  namespace: {{ .Release.Namespace }}
   labels:
     app: mindthegap
 spec:
@@ -75,7 +66,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: mindthegap
-  namespace: mindthegap
+  namespace: {{ .Release.Namespace }}
 spec:
   selector:
     app: mindthegap

charts/cluster-api-runtime-extensions-nutanix/values.yaml

@@ -4,8 +4,7 @@
 trust-manager:
   app:
     trust:
-      namespace: mindthegap
-
+      namespace: caren-system
 hooks:
   cni:
     calico:

hack/addons/fetch-helm-crds.sh

@@ -20,8 +20,9 @@ CRD_FILE="${CRD_PATH}/crd-trust.cert-manager.io_bundles.yaml"
 curl -l -o "${CRD_FILE}" "${RAW_URL}/${VERSION}/${CRD_URL_PATH}"
 #shellcheck disable=SC1083 # this is supposed to be literal values
 sed -i s/{{\.*}}//g "${CRD_FILE}"
+sed -i '/helm.sh\/resource-policy: keep/d' "${CRD_FILE}"
 yq -Y '.metadata.annotations["meta.helm.sh/release-name"] = "cluster-api-runtime-extensions-nutanix" |
-    .metadata.annotations["meta.helm.sh/release-namespace"] = "default" |
+    .metadata.annotations["meta.helm.sh/release-namespace"] = "caren-system" |
     .metadata.labels["app.kubernetes.io/managed-by"] = "Helm"' <./charts/cluster-api-runtime-extensions-nutanix/crds/crd-trust.cert-manager.io_bundles.yaml >>tmp.yaml
 
 mv tmp.yaml "${CRD_FILE}"

hack/examples/overlays/clusterclasses/aws/kustomization.yaml.tmpl

@@ -3,6 +3,7 @@
 
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: caren-system
 
 resources:
 - ../../../bases/aws/clusterclass

hack/examples/overlays/clusterclasses/docker/kustomization.yaml.tmpl

@@ -3,6 +3,7 @@
 
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: caren-system
 
 resources:
 - ../../../bases/docker/clusterclass

hack/examples/overlays/clusterclasses/nutanix/kustomization.yaml.tmpl

@@ -3,6 +3,7 @@
 
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: caren-system
 
 resources:
 - ../../../bases/nutanix/clusterclass

hack/tools/helm-cm/main.go

@@ -134,7 +134,8 @@ func createConfigMapFromDir(kustomizeDir string) (*corev1.ConfigMap, error) {
 
 	finalCM := corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "placeholder",
+			Name:      "placeholder",
+			Namespace: "caren-system",
 		},
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: corev1.SchemeGroupVersion.String(),

make/addons.mk

@@ -65,4 +65,4 @@ generate-mindthegap-repofile: generate-helm-configmap ; $(info $(M) generating h
 
 .PHONY: replace-with-mindthegap
 replace-with-mindthegap: generate-mindthegap-repofile ## this is used by gorealeaser to set the helm value to this.
-	sed -i 's/RepositoryURL:.*/RepositoryURL: oci:\/\/mindthegap.mindthegap.svc\/charts/g' "./charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml"
+	sed -i 's/RepositoryURL:.*/RepositoryURL: oci:\/\/mindthegap.caren-system.svc\/charts/g' "./charts/cluster-api-runtime-extensions-nutanix/templates/helm-config.yaml"

make/dev.mk

@@ -13,13 +13,15 @@ endif
 		ko.local/cluster-api-runtime-extensions-nutanix:$$(gojq -r .version dist/metadata.json)
 	kind load docker-image --name $(KIND_CLUSTER_NAME) \
 		ghcr.io/nutanix-cloud-native/caren-helm-reg:$$(gojq -r .version dist/metadata.json)
+	kubectl create namespace caren-system || true
 	helm upgrade --install cluster-api-runtime-extensions-nutanix ./charts/cluster-api-runtime-extensions-nutanix \
+		--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 cluster-api-runtime-extensions-nutanix
-	kubectl rollout status deployment cluster-api-runtime-extensions-nutanix
+	kubectl rollout restart deployment cluster-api-runtime-extensions-nutanix -n caren-system
+	kubectl rollout status deployment cluster-api-runtime-extensions-nutanix -n caren-system
 
 .PHONY: dev.update-webhook-image-on-kind
 dev.update-webhook-image-on-kind: export KUBECONFIG := $(KIND_KUBECONFIG)
@@ -29,9 +31,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 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
+	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 cluster-api-runtime-extensions-nutanix -n caren-system
+	kubectl rollout status deployment cluster-api-runtime-extensions-nutanix -n caren-system
 
 
 .PHONY: dev.update-bootstrap-credentials-aws