add: specific selector for operator (#390)

Issue #, if available: [#1632](aws-controllers-k8s/community#1632) Description of changes: Improve label selection for service and deployment association with pods. When multiple operators are deployed you may get inconsistent results on the service. Related [s3-controller/pull/94](aws-controllers-k8s/s3-controller#94) By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
aws-controllers-k8s · Jan 27, 2023 · 6713768 · 6713768
1 parent fd06571
commit 6713768
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/templates/config/controller/deployment.yaml.tpl b/templates/config/controller/deployment.yaml.tpl
@@ -1,8 +1,6 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  labels:
-    control-plane: controller
   name: ack-system
 ---
 apiVersion: apps/v1
@@ -11,16 +9,17 @@ metadata:
   name: ack-{{ .ServicePackageName }}-controller
   namespace: ack-system
   labels:
-    control-plane: controller
+    app.kubernetes.io/name: ack-{{ .ServicePackageName }}-controller
+    app.kubernetes.io/part-of: ack-system
 spec:
   selector:
     matchLabels:
-      control-plane: controller
+      app.kubernetes.io/name: ack-{{ .ServicePackageName }}-controller
   replicas: 1
   template:
     metadata:
       labels:
-        control-plane: controller
+        app.kubernetes.io/name: ack-{{ .ServicePackageName }}-controller
     spec:
       containers:
       - command:

diff --git a/templates/config/controller/service.yaml.tpl b/templates/config/controller/service.yaml.tpl
@@ -5,7 +5,7 @@ metadata:
   namespace: ack-system
 spec:
   selector:
-    control-plane: controller
+    app.kubernetes.io/name: ack-{{ .ServicePackageName }}-controller
   ports:
     - name: metricsport
       port: 8080

diff --git a/templates/helm/templates/deployment.yaml b/templates/helm/templates/deployment.yaml
@@ -10,7 +10,6 @@ metadata:
     app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
     k8s-app: {{ include "app.name" . }}
     helm.sh/chart: {{ include "chart.name-version" . }}
-    control-plane: controller
 spec:
   replicas: 1
   selector:

diff --git a/templates/helm/templates/metrics-service.yaml b/templates/helm/templates/metrics-service.yaml
@@ -11,7 +11,6 @@ metadata:
     app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
     k8s-app: {{ include "app.name" . }}
     helm.sh/chart: {{ include "chart.name-version" . }}
-    control-plane: controller
 spec:
   selector:
     app.kubernetes.io/name: {{ include "app.name" . }}