Merge pull request #29 from hughdanliu/helm-labels

Adopt Kubernetes recommended labels

Author: k8s-ci-robot

charts/aws-fsx-openzfs-csi-driver/templates/_helpers.tpl

@@ -49,7 +49,7 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 Common selector labels
 */}}
 {{- define "aws-fsx-openzfs-csi-driver.selectorLabels" -}}
-app.kubernetes.io/name: {{ include "aws-fsx-openzfs-csi-driver.name" . }}
+app.kubernetes.io/part-of: {{ include "aws-fsx-openzfs-csi-driver.name" . }}
 {{- if ne .Release.Name "kustomize" }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}

charts/aws-fsx-openzfs-csi-driver/templates/controller-deployment.yaml

@@ -12,12 +12,12 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: fsx-openzfs-csi-controller
+      app.kubernetes.io/name: fsx-openzfs-csi-controller
       {{- include "aws-fsx-openzfs-csi-driver.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: fsx-openzfs-csi-controller
+        app.kubernetes.io/name: fsx-openzfs-csi-controller
         {{- include "aws-fsx-openzfs-csi-driver.labels" . | nindent 8 }}
         {{- if .Values.controller.podLabels }}
         {{- toYaml .Values.controller.podLabels | nindent 8 }}

charts/aws-fsx-openzfs-csi-driver/templates/node-daemonset.yaml

@@ -5,18 +5,19 @@ metadata:
   name: fsx-openzfs-csi-node
   namespace: {{ .Release.Namespace }}
   labels:
+    app.kubernetes.io/name: fsx-openzfs-csi-node
     {{- include "aws-fsx-openzfs-csi-driver.labels" . | nindent 4 }}
 spec:
   selector:
     matchLabels:
-      app: fsx-openzfs-csi-node
+      app.kubernetes.io/name: fsx-openzfs-csi-node
       {{- include "aws-fsx-openzfs-csi-driver.selectorLabels" . | nindent 6 }}
   updateStrategy:
     {{- toYaml .Values.node.updateStrategy | nindent 4 }}
   template:
     metadata:
       labels:
-        app: fsx-openzfs-csi-node
+        app.kubernetes.io/name: fsx-openzfs-csi-node
         {{- include "aws-fsx-openzfs-csi-driver.labels" . | nindent 8 }}
         {{- if .Values.node.podLabels }}
         {{- toYaml .Values.node.podLabels | nindent 8 }}

charts/aws-fsx-openzfs-csi-driver/templates/poddisruptionbudget-controller.yaml

@@ -12,7 +12,7 @@ metadata:
 spec:
   selector:
     matchLabels:
-      app: fsx-openzfs-csi-controller
+      app.kubernetes.io/name: fsx-openzfs-csi-controller
       {{- include "aws-fsx-openzfs-csi-driver.selectorLabels" . | nindent 6 }}
   {{- if le (.Values.controller.replicaCount | int) 2 }}
   maxUnavailable: 1

charts/aws-fsx-openzfs-csi-driver/values.yaml

@@ -102,7 +102,7 @@ controller:
         - podAffinityTerm:
             labelSelector:
               matchExpressions:
-                - key: app
+                - key: app.kubernetes.io/name
                   operator: In
                   values:
                     - fsx-openzfs-csi-controller

deploy/kubernetes/base/controller-deployment.yaml

@@ -5,7 +5,7 @@ apiVersion: apps/v1
 metadata:
   name: fsx-openzfs-csi-controller
   labels:
-    app.kubernetes.io/name: aws-fsx-openzfs-csi-driver
+    app.kubernetes.io/part-of: aws-fsx-openzfs-csi-driver
 spec:
   replicas: 2
   strategy:
@@ -14,13 +14,13 @@ spec:
     type: RollingUpdate
   selector:
     matchLabels:
-      app: fsx-openzfs-csi-controller
-      app.kubernetes.io/name: aws-fsx-openzfs-csi-driver
+      app.kubernetes.io/name: fsx-openzfs-csi-controller
+      app.kubernetes.io/part-of: aws-fsx-openzfs-csi-driver
   template:
     metadata:
       labels:
-        app: fsx-openzfs-csi-controller
-        app.kubernetes.io/name: aws-fsx-openzfs-csi-driver
+        app.kubernetes.io/name: fsx-openzfs-csi-controller
+        app.kubernetes.io/part-of: aws-fsx-openzfs-csi-driver
     spec:
       nodeSelector:
         kubernetes.io/os: linux
@@ -41,7 +41,7 @@ spec:
           - podAffinityTerm:
               labelSelector:
                 matchExpressions:
-                - key: app
+                - key: app.kubernetes.io/name
                   operator: In
                   values:
                   - fsx-openzfs-csi-controller

deploy/kubernetes/base/controller-serviceaccount.yaml

@@ -5,15 +5,15 @@ kind: ServiceAccount
 metadata:
   name: fsx-openzfs-csi-controller-sa
   labels:
-    app.kubernetes.io/name: aws-fsx-openzfs-csi-driver
+    app.kubernetes.io/part-of: aws-fsx-openzfs-csi-driver
 ---
 # Source: aws-fsx-openzfs-csi-driver/templates/controller-serviceaccount.yaml
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: fsx-openzfs-csi-external-provisioner-role
   labels:
-    app.kubernetes.io/name: aws-fsx-openzfs-csi-driver
+    app.kubernetes.io/part-of: aws-fsx-openzfs-csi-driver
 rules:
   # The following rule should be uncommented for plugins that require secrets
   # for provisioning.
@@ -54,7 +54,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: fsx-openzfs-csi-external-resizer-role
   labels:
-    app.kubernetes.io/name: aws-fsx-openzfs-csi-driver
+    app.kubernetes.io/part-of: aws-fsx-openzfs-csi-driver
 rules:
   # The following rule should be uncommented for plugins that require secrets
   # for provisioning.
@@ -86,7 +86,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: fsx-openzfs-csi-external-snapshotter-role
   labels:
-    app.kubernetes.io/name: aws-fsx-openzfs-csi-driver
+    app.kubernetes.io/part-of: aws-fsx-openzfs-csi-driver
 rules:
   - apiGroups: [ "" ]
     resources: [ "events" ]
@@ -112,7 +112,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: fsx-openzfs-csi-external-provisioner-binding
   labels:
-    app.kubernetes.io/name: aws-fsx-openzfs-csi-driver
+    app.kubernetes.io/part-of: aws-fsx-openzfs-csi-driver
 subjects:
   - kind: ServiceAccount
     name: fsx-openzfs-csi-controller-sa
@@ -127,7 +127,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: fsx-openzfs-csi-external-resizer-binding
   labels:
-    app.kubernetes.io/name: aws-fsx-openzfs-csi-driver
+    app.kubernetes.io/part-of: aws-fsx-openzfs-csi-driver
 subjects:
   - kind: ServiceAccount
     name: fsx-openzfs-csi-controller-sa
@@ -142,7 +142,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: fsx-openzfs-csi-external-snapshotter-binding
   labels:
-    app.kubernetes.io/name: aws-fsx-openzfs-csi-driver
+    app.kubernetes.io/part-of: aws-fsx-openzfs-csi-driver
 subjects:
   - kind: ServiceAccount
     name: fsx-openzfs-csi-controller-sa

deploy/kubernetes/base/csidriver.yaml

@@ -5,7 +5,7 @@ kind: CSIDriver
 metadata:
   name: fsx.openzfs.csi.aws.com
   labels:
-    app.kubernetes.io/name: aws-fsx-openzfs-csi-driver
+    app.kubernetes.io/part-of: aws-fsx-openzfs-csi-driver
 spec:
   attachRequired: false
   podInfoOnMount: false

deploy/kubernetes/base/node-daemonset.yaml

@@ -6,21 +6,22 @@ apiVersion: apps/v1
 metadata:
   name: fsx-openzfs-csi-node
   labels:
-    app.kubernetes.io/name: aws-fsx-openzfs-csi-driver
+    app.kubernetes.io/name: fsx-openzfs-csi-node
+    app.kubernetes.io/part-of: aws-fsx-openzfs-csi-driver
 spec:
   selector:
     matchLabels:
-      app: fsx-openzfs-csi-node
-      app.kubernetes.io/name: aws-fsx-openzfs-csi-driver
+      app.kubernetes.io/name: fsx-openzfs-csi-node
+      app.kubernetes.io/part-of: aws-fsx-openzfs-csi-driver
   updateStrategy:
     rollingUpdate:
       maxUnavailable: 10%
     type: RollingUpdate
   template:
     metadata:
       labels:
-        app: fsx-openzfs-csi-node
-        app.kubernetes.io/name: aws-fsx-openzfs-csi-driver
+        app.kubernetes.io/name: fsx-openzfs-csi-node
+        app.kubernetes.io/part-of: aws-fsx-openzfs-csi-driver
     spec:
       affinity:
         nodeAffinity:

deploy/kubernetes/base/node-serviceaccount.yaml

@@ -5,4 +5,4 @@ kind: ServiceAccount
 metadata:
   name: fsx-openzfs-csi-node-sa
   labels:
-    app.kubernetes.io/name: aws-fsx-openzfs-csi-driver
+    app.kubernetes.io/part-of: aws-fsx-openzfs-csi-driver