helm: keep namespace in manager.yaml and remove from helm overlay

Signed-off-by: Eguzki Astiz Lezaun <[email protected]>
Kuadrant · Oct 10, 2024 · 824559f · 824559f
1 parent 0cb3d7c
commit 824559f
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 23 deletions.
diff --git a/charts/dns-operator/templates/manifests.yaml b/charts/dns-operator/templates/manifests.yaml
@@ -3,6 +3,8 @@ kind: CustomResourceDefinition
 metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.14.0
+  labels:
+    app.kubernetes.io/managed-by: helm
   name: dnsrecords.kuadrant.io
 spec:
   group: kuadrant.io
@@ -524,7 +526,7 @@ metadata:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: dns-operator
     app.kubernetes.io/instance: controller-manager-sa
-    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/managed-by: helm
     app.kubernetes.io/name: serviceaccount
     app.kubernetes.io/part-of: dns-operator
   name: dns-operator-controller-manager
@@ -537,7 +539,7 @@ metadata:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: dns-operator
     app.kubernetes.io/instance: leader-election-role
-    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/managed-by: helm
     app.kubernetes.io/name: role
     app.kubernetes.io/part-of: dns-operator
   name: dns-operator-leader-election-role
@@ -578,6 +580,8 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
+  labels:
+    app.kubernetes.io/managed-by: helm
   name: dns-operator-manager-role
 rules:
 - apiGroups:
@@ -622,7 +626,7 @@ metadata:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: dns-operator
     app.kubernetes.io/instance: leader-election-rolebinding
-    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/managed-by: helm
     app.kubernetes.io/name: rolebinding
     app.kubernetes.io/part-of: dns-operator
   name: dns-operator-leader-election-rolebinding
@@ -643,7 +647,7 @@ metadata:
     app.kubernetes.io/component: rbac
     app.kubernetes.io/created-by: dns-operator
     app.kubernetes.io/instance: manager-rolebinding
-    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/managed-by: helm
     app.kubernetes.io/name: clusterrolebinding
     app.kubernetes.io/part-of: dns-operator
   name: dns-operator-manager-rolebinding
@@ -660,6 +664,7 @@ apiVersion: v1
 kind: Service
 metadata:
   labels:
+    app.kubernetes.io/managed-by: helm
     control-plane: dns-operator-controller-manager
   name: dns-operator-controller-manager-metrics-service
   namespace: '{{ .Release.Namespace }}'
@@ -678,7 +683,7 @@ metadata:
     app.kubernetes.io/component: manager
     app.kubernetes.io/created-by: dns-operator
     app.kubernetes.io/instance: controller-manager
-    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/managed-by: helm
     app.kubernetes.io/name: deployment
     app.kubernetes.io/part-of: dns-operator
     control-plane: dns-operator-controller-manager
@@ -694,6 +699,7 @@ spec:
       annotations:
         kubectl.kubernetes.io/default-container: manager
       labels:
+        app.kubernetes.io/managed-by: helm
         control-plane: dns-operator-controller-manager
     spec:
       containers:

diff --git a/config/deploy/local/kustomization.yaml b/config/deploy/local/kustomization.yaml
@@ -3,12 +3,7 @@
 # Set the deployment imagePullPolicy to IfNotPresent. This is required if you are using a local image loaded into kind i.e. make kind-load-image
 #
 
----
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-namespace: dns-operator-system
 resources:
-  - namespace.yaml
   - ../../default
 
 patches:

diff --git a/config/deploy/local/namespace.yaml b/config/deploy/local/namespace.yaml
diff --git a/config/helm/kustomization.yaml b/config/helm/kustomization.yaml
@@ -2,5 +2,19 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: "{{ .Release.Namespace }}"
+
+labels:
+  - pairs:
+      app.kubernetes.io/managed-by: helm
+    includeTemplates: true
+
 resources:
 - ../default
+
+patches:
+- patch: |-
+    $patch: delete
+    apiVersion: v1
+    kind: Namespace
+    metadata:
+      name: dns-operator-system
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -1,3 +1,15 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  labels:
+    control-plane: dns-operator-controller-manager
+    app.kubernetes.io/name: namespace
+    app.kubernetes.io/instance: system
+    app.kubernetes.io/component: manager
+    app.kubernetes.io/created-by: dns-operator
+    app.kubernetes.io/part-of: dns-operator
+    app.kubernetes.io/managed-by: kustomize
+  name: system
 ---
 apiVersion: apps/v1
 kind: Deployment