Add labels to the podSpec selectors

- Added labels to the podSpec of DaemonSet and StatefulSet - wrapped curl with run method - corrected formatting and removed unusefule echo
kubernetes-csi · May 2, 2021 · 80a5cc0 · 80a5cc0
1 parent a4b1e45
commit 80a5cc0
Show file tree

Hide file tree

Showing 22 changed files with 234 additions and 52 deletions.
diff --git a/deploy/kubernetes-1.18/hostpath/csi-hostpath-attacher.yaml b/deploy/kubernetes-1.18/hostpath/csi-hostpath-attacher.yaml
@@ -12,18 +12,24 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: csi-hostpath-attacher
+      app.kubernetes.io/instance: hostpath.csi.k8s.io
+      app.kubernetes.io/part-of: csi-driver-host-path
+      app.kubernetes.io/name: csi-hostpath-attacher
+      app.kubernetes.io/component: attacher
   template:
     metadata:
       labels:
-        app: csi-hostpath-attacher
+        app.kubernetes.io/instance: hostpath.csi.k8s.io
+        app.kubernetes.io/part-of: csi-driver-host-path
+        app.kubernetes.io/name: csi-hostpath-attacher
+        app.kubernetes.io/component: attacher
     spec:
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app
+              - key: app.kubernetes.io/name
                 operator: In
                 values:
                 - csi-hostpathplugin

diff --git a/deploy/kubernetes-1.18/hostpath/csi-hostpath-plugin.yaml b/deploy/kubernetes-1.18/hostpath/csi-hostpath-plugin.yaml
@@ -13,7 +13,10 @@ metadata:
     app.kubernetes.io/component: plugin
 spec:
   selector:
-    app: csi-hostpathplugin
+    app.kubernetes.io/instance: hostpath.csi.k8s.io
+    app.kubernetes.io/part-of: csi-driver-host-path
+    app.kubernetes.io/name: csi-hostpathplugin
+    app.kubernetes.io/component: plugin
   ports:
     - name: dummy
       port: 12345
@@ -36,11 +39,17 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: csi-hostpathplugin
+      app.kubernetes.io/instance: hostpath.csi.k8s.io
+      app.kubernetes.io/part-of: csi-driver-host-path
+      app.kubernetes.io/name: csi-hostpathplugin
+      app.kubernetes.io/component: plugin
   template:
     metadata:
       labels:
-        app: csi-hostpathplugin
+        app.kubernetes.io/instance: hostpath.csi.k8s.io
+        app.kubernetes.io/part-of: csi-driver-host-path
+        app.kubernetes.io/name: csi-hostpathplugin
+        app.kubernetes.io/component: plugin
     spec:
       serviceAccountName: csi-external-health-monitor-controller
       containers:

diff --git a/deploy/kubernetes-1.18/hostpath/csi-hostpath-provisioner.yaml b/deploy/kubernetes-1.18/hostpath/csi-hostpath-provisioner.yaml
@@ -12,18 +12,24 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: csi-hostpath-provisioner
+      app.kubernetes.io/instance: hostpath.csi.k8s.io
+      app.kubernetes.io/part-of: csi-driver-host-path
+      app.kubernetes.io/name: csi-hostpath-provisioner
+      app.kubernetes.io/component: provisioner
   template:
     metadata:
       labels:
-        app: csi-hostpath-provisioner
+        app.kubernetes.io/instance: hostpath.csi.k8s.io
+        app.kubernetes.io/part-of: csi-driver-host-path
+        app.kubernetes.io/name: csi-hostpath-provisioner
+        app.kubernetes.io/component: provisioner
     spec:
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app
+              - key: app.kubernetes.io/name
                 operator: In
                 values:
                 - csi-hostpathplugin

diff --git a/deploy/kubernetes-1.18/hostpath/csi-hostpath-resizer.yaml b/deploy/kubernetes-1.18/hostpath/csi-hostpath-resizer.yaml
@@ -12,18 +12,24 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: csi-hostpath-resizer
+      app.kubernetes.io/instance: hostpath.csi.k8s.io
+      app.kubernetes.io/part-of: csi-driver-host-path
+      app.kubernetes.io/name: csi-hostpath-resizer
+      app.kubernetes.io/component: resizer
   template:
     metadata:
       labels:
-        app: csi-hostpath-resizer
+        app.kubernetes.io/instance: hostpath.csi.k8s.io
+        app.kubernetes.io/part-of: csi-driver-host-path
+        app.kubernetes.io/name: csi-hostpath-resizer
+        app.kubernetes.io/component: resizer
     spec:
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app
+              - key: app.kubernetes.io/name
                 operator: In
                 values:
                 - csi-hostpathplugin

diff --git a/deploy/kubernetes-1.18/hostpath/csi-hostpath-snapshotter.yaml b/deploy/kubernetes-1.18/hostpath/csi-hostpath-snapshotter.yaml
@@ -12,18 +12,24 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: csi-hostpath-snapshotter
+      app.kubernetes.io/instance: hostpath.csi.k8s.io
+      app.kubernetes.io/part-of: csi-driver-host-path
+      app.kubernetes.io/name: csi-hostpath-snapshotter
+      app.kubernetes.io/component: snapshotter
   template:
     metadata:
       labels:
-        app: csi-hostpath-snapshotter
+        app.kubernetes.io/instance: hostpath.csi.k8s.io
+        app.kubernetes.io/part-of: csi-driver-host-path
+        app.kubernetes.io/name: csi-hostpath-snapshotter
+        app.kubernetes.io/component: snapshotter
     spec:
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app
+              - key: app.kubernetes.io/name
                 operator: In
                 values:
                 - csi-hostpathplugin

diff --git a/deploy/kubernetes-1.18/hostpath/csi-hostpath-testing.yaml b/deploy/kubernetes-1.18/hostpath/csi-hostpath-testing.yaml
@@ -19,7 +19,10 @@ metadata:
 spec:
   type: NodePort
   selector:
-    app: csi-hostpath-socat
+    app.kubernetes.io/instance: hostpath.csi.k8s.io
+    app.kubernetes.io/part-of: csi-driver-host-path
+    app.kubernetes.io/name: csi-hostpath-socat
+    app.kubernetes.io/component: socat
   ports:
   - port: 10000 # fixed port inside the pod, dynamically allocated port outside
 ---
@@ -37,18 +40,24 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: csi-hostpath-socat
+      app.kubernetes.io/instance: hostpath.csi.k8s.io
+      app.kubernetes.io/part-of: csi-driver-host-path
+      app.kubernetes.io/name: csi-hostpath-socat
+      app.kubernetes.io/component: socat
   template:
     metadata:
       labels:
-        app: csi-hostpath-socat
+        app.kubernetes.io/instance: hostpath.csi.k8s.io
+        app.kubernetes.io/part-of: csi-driver-host-path
+        app.kubernetes.io/name: csi-hostpath-socat
+        app.kubernetes.io/component: socat
     spec:
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app
+              - key: app.kubernetes.io/name
                 operator: In
                 values:
                 - csi-hostpathplugin

diff --git a/deploy/kubernetes-1.20/hostpath/csi-hostpath-attacher.yaml b/deploy/kubernetes-1.20/hostpath/csi-hostpath-attacher.yaml
@@ -12,21 +12,27 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: csi-hostpath-attacher
+      app.kubernetes.io/instance: hostpath.csi.k8s.io
+      app.kubernetes.io/part-of: csi-driver-host-path
+      app.kubernetes.io/name: csi-hostpath-attacher
+      app.kubernetes.io/component: attacher
   template:
     metadata:
       labels:
-        app: csi-hostpath-attacher
+        app.kubernetes.io/instance: hostpath.csi.k8s.io
+        app.kubernetes.io/part-of: csi-driver-host-path
+        app.kubernetes.io/name: csi-hostpath-attacher
+        app.kubernetes.io/component: attacher
     spec:
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app
+              - key: app.kubernetes.io/instance
                 operator: In
                 values:
-                - csi-hostpathplugin
+                  - hostpath.csi.k8s.io
             topologyKey: kubernetes.io/hostname
       serviceAccountName: csi-attacher
       containers:

diff --git a/deploy/kubernetes-1.20/hostpath/csi-hostpath-plugin.yaml b/deploy/kubernetes-1.20/hostpath/csi-hostpath-plugin.yaml
@@ -36,11 +36,17 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: csi-hostpathplugin
+      app.kubernetes.io/instance: hostpath.csi.k8s.io
+      app.kubernetes.io/part-of: csi-driver-host-path
+      app.kubernetes.io/name: csi-hostpathplugin
+      app.kubernetes.io/component: plugin
   template:
     metadata:
       labels:
-        app: csi-hostpathplugin
+        app.kubernetes.io/instance: hostpath.csi.k8s.io
+        app.kubernetes.io/part-of: csi-driver-host-path
+        app.kubernetes.io/name: csi-hostpathplugin
+        app.kubernetes.io/component: plugin
     spec:
       serviceAccountName: csi-external-health-monitor-controller
       containers:

diff --git a/deploy/kubernetes-1.20/hostpath/csi-hostpath-provisioner.yaml b/deploy/kubernetes-1.20/hostpath/csi-hostpath-provisioner.yaml
@@ -12,21 +12,27 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: csi-hostpath-provisioner
+      app.kubernetes.io/instance: hostpath.csi.k8s.io
+      app.kubernetes.io/part-of: csi-driver-host-path
+      app.kubernetes.io/name: csi-hostpath-provisioner
+      app.kubernetes.io/component: provisioner
   template:
     metadata:
       labels:
-        app: csi-hostpath-provisioner
+        app.kubernetes.io/instance: hostpath.csi.k8s.io
+        app.kubernetes.io/part-of: csi-driver-host-path
+        app.kubernetes.io/name: csi-hostpath-provisioner
+        app.kubernetes.io/component: provisioner
     spec:
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app
+              - key: app.kubernetes.io/instance
                 operator: In
                 values:
-                - csi-hostpathplugin
+                  - hostpath.csi.k8s.io
             topologyKey: kubernetes.io/hostname
       serviceAccountName: csi-provisioner
       containers:

diff --git a/deploy/kubernetes-1.20/hostpath/csi-hostpath-resizer.yaml b/deploy/kubernetes-1.20/hostpath/csi-hostpath-resizer.yaml
@@ -12,21 +12,27 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: csi-hostpath-resizer
+      app.kubernetes.io/instance: hostpath.csi.k8s.io
+      app.kubernetes.io/part-of: csi-driver-host-path
+      app.kubernetes.io/name: csi-hostpath-resizer
+      app.kubernetes.io/component: resizer
   template:
     metadata:
       labels:
-        app: csi-hostpath-resizer
+        app.kubernetes.io/instance: hostpath.csi.k8s.io
+        app.kubernetes.io/part-of: csi-driver-host-path
+        app.kubernetes.io/name: csi-hostpath-resizer
+        app.kubernetes.io/component: resizer
     spec:
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app
+              - key: app.kubernetes.io/instance
                 operator: In
                 values:
-                - csi-hostpathplugin
+                  - hostpath.csi.k8s.io
             topologyKey: kubernetes.io/hostname
       serviceAccountName: csi-resizer
       containers:

diff --git a/deploy/kubernetes-1.20/hostpath/csi-hostpath-snapshotter.yaml b/deploy/kubernetes-1.20/hostpath/csi-hostpath-snapshotter.yaml
@@ -12,21 +12,27 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: csi-hostpath-snapshotter
+      app.kubernetes.io/instance: hostpath.csi.k8s.io
+      app.kubernetes.io/part-of: csi-driver-host-path
+      app.kubernetes.io/name: csi-hostpath-snapshotter
+      app.kubernetes.io/component: snapshotter
   template:
     metadata:
       labels:
-        app: csi-hostpath-snapshotter
+        app.kubernetes.io/instance: hostpath.csi.k8s.io
+        app.kubernetes.io/part-of: csi-driver-host-path
+        app.kubernetes.io/name: csi-hostpath-snapshotter
+        app.kubernetes.io/component: snapshotter
     spec:
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app
+              - key: app.kubernetes.io/instance
                 operator: In
                 values:
-                - csi-hostpathplugin
+                  - hostpath.csi.k8s.io
             topologyKey: kubernetes.io/hostname
       serviceAccountName: csi-snapshotter
       containers:

diff --git a/deploy/kubernetes-1.20/hostpath/csi-hostpath-testing.yaml b/deploy/kubernetes-1.20/hostpath/csi-hostpath-testing.yaml
@@ -37,21 +37,27 @@ spec:
   replicas: 1
   selector:
     matchLabels:
-      app: csi-hostpath-socat
+      app.kubernetes.io/instance: hostpath.csi.k8s.io
+      app.kubernetes.io/part-of: csi-driver-host-path
+      app.kubernetes.io/name: csi-hostpath-socat
+      app.kubernetes.io/component: socat
   template:
     metadata:
       labels:
-        app: csi-hostpath-socat
+        app.kubernetes.io/instance: hostpath.csi.k8s.io
+        app.kubernetes.io/part-of: csi-driver-host-path
+        app.kubernetes.io/name: csi-hostpath-socat
+        app.kubernetes.io/component: socat
     spec:
       affinity:
         podAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
           - labelSelector:
               matchExpressions:
-              - key: app
+              - key: app.kubernetes.io/instance
                 operator: In
                 values:
-                - csi-hostpathplugin
+                  - hostpath.csi.k8s.io
             topologyKey: kubernetes.io/hostname
       containers:
         - name: socat

diff --git a/deploy/kubernetes-distributed/app-generic-ephemeral.yaml b/deploy/kubernetes-distributed/app-generic-ephemeral.yaml
@@ -5,6 +5,11 @@ kind: Pod
 apiVersion: v1
 metadata:
   name: my-csi-app-inline-volume
+  labels:
+    app.kubernetes.io/instance: hostpath.csi.k8s.io
+    app.kubernetes.io/part-of: csi-driver-host-path
+    app.kubernetes.io/name: csi-hostpath-ephemral-inline-volume
+    app.kubernetes.io/component: ephemeral-volume
 spec:
   containers:
     - name: my-frontend