helm: Unify labels and add recommended labels (#626)

* helm: Unify labels and add recommended labels We currently don't add the recommended labels on our helm deployed resources, we even don't have consistency among the different components of akri (e.g controller has an "app" one and agent and discovery handlers have a "name" one). This commit aims to solve both issues by using the recommended labels everywhere they are relevant. Signed-off-by: Nicolas Belouin <[email protected]>
project-akri · Jul 18, 2023 · 99c78b6 · 99c78b6
1 parent cdd1ae5
commit 99c78b6
Show file tree

Hide file tree

Showing 29 changed files with 142 additions and 74 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/agent/Cargo.toml b/agent/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "agent"
-version = "0.10.15"
+version = "0.10.16"
 authors = ["Kate Goldenring <[email protected]>", "<[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

diff --git a/controller/Cargo.toml b/controller/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "controller"
-version = "0.10.15"
+version = "0.10.16"
 authors = ["<[email protected]>", "<[email protected]>"]
 edition = "2018"
 rust-version = "1.68.1"

diff --git a/deployment/helm/Chart.yaml b/deployment/helm/Chart.yaml
@@ -16,9 +16,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.10.15
+version: 0.10.16
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.10.15
+appVersion: 0.10.16
diff --git a/deployment/helm/templates/_helpers.tpl b/deployment/helm/templates/_helpers.tpl
@@ -47,7 +47,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Selector labels
 */}}
 {{- define "akri.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "akri.name" . }}
+app.kubernetes.io/part-of: {{ include "akri.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 

diff --git a/deployment/helm/templates/agent.yaml b/deployment/helm/templates/agent.yaml
@@ -3,14 +3,18 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: akri-agent-daemonset
+  labels: {{- include "akri.labels" . | nindent 4 }}
+    app.kubernetes.io/name: akri-agent
+    app.kubernetes.io/component: agent
 spec:
   selector:
-    matchLabels:
-      name: akri-agent
+    matchLabels: {{- include "akri.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/name: akri-agent
   template:
     metadata:
-      labels:
-        name: akri-agent
+      labels: {{- include "akri.labels" . | nindent 8 }}
+        app.kubernetes.io/name: akri-agent
+        app.kubernetes.io/component: agent
     spec:
       {{- /* hostNetwork is only needed for embedded ONVIF discovery */}}
       {{- if .Values.agent.full }}

diff --git a/deployment/helm/templates/controller.yaml b/deployment/helm/templates/controller.yaml
@@ -3,15 +3,19 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: akri-controller-deployment
+  labels: {{- include "akri.labels" . | nindent 4 }}
+    app.kubernetes.io/name: akri-controller
+    app.kubernetes.io/component: controller
 spec:
   replicas: 1
   selector:
-    matchLabels:
-      app: akri-controller
+    matchLabels: {{- include "akri.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/name: akri-controller
   template:
     metadata:
-      labels:
-        app: akri-controller
+      labels: {{- include "akri.labels" . | nindent 8 }}
+        app.kubernetes.io/name: akri-controller
+        app.kubernetes.io/component: controller
     spec:
       {{- if .Values.rbac.enabled }}
       serviceAccountName: 'akri-controller-sa'

diff --git a/deployment/helm/templates/custom-discovery-handler.yaml b/deployment/helm/templates/custom-discovery-handler.yaml
@@ -3,14 +3,18 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: {{ printf "%s-daemonset" .Values.custom.discovery.name }}
+  labels: {{- include "akri.labels" . | nindent 4 }}
+    app.kubernetes.io/name: {{ .Values.custom.discovery.name }}
+    app.kubernetes.io/component: discovery-handler
 spec:
   selector:
-    matchLabels:
-      name: {{ .Values.custom.discovery.name }}
+    matchLabels: {{- include "akri.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/name: {{ .Values.custom.discovery.name }}
   template:
     metadata:
-      labels:
-        name: {{ .Values.custom.discovery.name }}
+      labels: {{- include "akri.labels" . | nindent 8 }}
+        app.kubernetes.io/name: {{ .Values.custom.discovery.name }}
+        app.kubernetes.io/component: discovery-handler
     spec:
       containers:
       - name: {{ .Values.custom.discovery.name }}

diff --git a/deployment/helm/templates/debug-echo-discovery-handler.yaml b/deployment/helm/templates/debug-echo-discovery-handler.yaml
@@ -3,14 +3,18 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: akri-debug-echo-discovery-daemonset
+  labels: {{- include "akri.labels" . | nindent 4 }}
+    app.kubernetes.io/name: akri-debug-echo-discovery
+    app.kubernetes.io/component: discovery-handler
 spec:
   selector:
-    matchLabels:
-      name: akri-debug-echo-discovery
+    matchLabels: {{- include "akri.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/name: akri-debug-echo-discovery
   template:
     metadata:
-      labels:
-        name: akri-debug-echo-discovery
+      labels: {{- include "akri.labels" . | nindent 8 }}
+        app.kubernetes.io/name: akri-debug-echo-discovery
+        app.kubernetes.io/component: discovery-handler
     spec:
       containers:
       - name: akri-debug-echo-discovery

diff --git a/deployment/helm/templates/onvif-discovery-handler.yaml b/deployment/helm/templates/onvif-discovery-handler.yaml
@@ -3,14 +3,18 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: akri-onvif-discovery-daemonset
+  labels: {{- include "akri.labels" . | nindent 4 }}
+    app.kubernetes.io/name: akri-onvif-discovery
+    app.kubernetes.io/component: discovery-handler
 spec:
   selector:
-    matchLabels:
-      name: akri-onvif-discovery
+    matchLabels: {{- include "akri.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/name: akri-onvif-discovery
   template:
     metadata:
-      labels:
-        name: akri-onvif-discovery
+      labels: {{- include "akri.labels" . | nindent 8 }}
+        app.kubernetes.io/name: akri-onvif-discovery
+        app.kubernetes.io/component: discovery-handler
     spec:
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet

diff --git a/deployment/helm/templates/opcua-discovery-handler.yaml b/deployment/helm/templates/opcua-discovery-handler.yaml
@@ -3,14 +3,18 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: akri-opcua-discovery-daemonset
+  labels: {{- include "akri.labels" . | nindent 4 }}
+    app.kubernetes.io/name: akri-opcua-discovery
+    app.kubernetes.io/component: discovery-handler
 spec:
   selector:
-    matchLabels:
-      name: akri-opcua-discovery
+    matchLabels: {{- include "akri.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/name: akri-opcua-discovery
   template:
     metadata:
-      labels:
-        name: akri-opcua-discovery
+      labels: {{- include "akri.labels" . | nindent 8 }}
+        app.kubernetes.io/name: akri-opcua-discovery
+        app.kubernetes.io/component: discovery-handler
     spec:
       containers:
       - name: akri-opcua-discovery

diff --git a/deployment/helm/templates/prometheus.yaml b/deployment/helm/templates/prometheus.yaml
@@ -4,12 +4,13 @@ kind: PodMonitor
 metadata:
   name: akri-agent-metrics
   namespace: {{ .Release.Namespace }}
-  labels:
+  labels: {{- include "akri.labels" . | nindent 4 }}
+    app.kubernetes.io/name: akri-agent
     release: prometheus
 spec:
   selector:
-    matchLabels:
-      name: akri-agent
+    matchLabels: {{- include "akri.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/name: akri-agent
   podMetricsEndpoints:
   - port: {{ .Values.prometheus.portName | quote }}
     path: {{ .Values.prometheus.endpoint }}
@@ -19,12 +20,13 @@ kind: PodMonitor
 metadata:
   name: akri-controller-metrics
   namespace: {{ .Release.Namespace }}
-  labels:
+  labels: {{- include "akri.labels" . | nindent 4 }}
+    app.kubernetes.io/name: akri-controller
     release: prometheus
 spec:
   selector:
-    matchLabels:
-      app: akri-controller
+    matchLabels: {{- include "akri.selectorLabels" . | nindent 6 }}
+      app.kubernetes.io/name: akri-controller
   podMetricsEndpoints:
   - port: {{ .Values.prometheus.portName | quote }}
     path: {{ .Values.prometheus.endpoint }}

diff --git a/deployment/helm/templates/rbac.yaml b/deployment/helm/templates/rbac.yaml
@@ -3,16 +3,25 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: akri-controller-sa
+  labels: {{- include "akri.labels" . | nindent 4 }}
+    app.kubernetes.io/name: akri-controller
+    app.kubernetes.io/component: controller
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: akri-agent-sa
+  labels: {{- include "akri.labels" . | nindent 4 }}
+    app.kubernetes.io/name: akri-agent
+    app.kubernetes.io/component: agent
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: "akri-controller-role"
+  labels: {{- include "akri.labels" . | nindent 4 }}
+    app.kubernetes.io/name: akri-controller
+    app.kubernetes.io/component: controller
 rules:
 - apiGroups: [""]
   resources: ["pods", "services"]
@@ -34,6 +43,9 @@ kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: "akri-agent-role"
+  labels: {{- include "akri.labels" . | nindent 4 }}
+    app.kubernetes.io/name: akri-agent
+    app.kubernetes.io/component: agent
 rules:
 - apiGroups: [""]
   resources: ["pods"]
@@ -50,6 +62,9 @@ kind: 'ClusterRoleBinding'
 metadata:
   name: 'akri-controller-binding'
   namespace: {{ .Release.Namespace }}
+  labels: {{- include "akri.labels" . | nindent 4 }}
+    app.kubernetes.io/name: akri-controller
+    app.kubernetes.io/component: controller
 roleRef:
   apiGroup: ''
   kind: 'ClusterRole'
@@ -64,6 +79,9 @@ kind: 'ClusterRoleBinding'
 metadata:
   name: 'akri-agent-binding'
   namespace: {{ .Release.Namespace }}
+  labels: {{- include "akri.labels" . | nindent 4 }}
+    app.kubernetes.io/name: akri-agent
+    app.kubernetes.io/component: agent
 roleRef:
   apiGroup: ''
   kind: 'ClusterRole'