add global pod labels (#94)

Alluxio · Dec 4, 2023 · bfd4ce0 · bfd4ce0
1 parent 906fa87
commit bfd4ce0
Show file tree

Hide file tree

Showing 16 changed files with 96 additions and 1 deletion.
diff --git a/api/v1alpha1/alluxiocluster_types.go b/api/v1alpha1/alluxiocluster_types.go
@@ -33,6 +33,7 @@ type AlluxioClusterSpec struct {
 	DnsPolicy          string             `json:"dnsPolicy,omitempty" yaml:"dnsPolicy,omitempty"`
 	ServiceAccountName string             `json:"serviceAccountName,omitempty" yaml:"serviceAccountName,omitempty"`
 	HostAliases        []HostAlias        `json:"hostAliases,omitempty" yaml:"hostAliases,omitempty"`
+	GlobalPodLabel     map[string]string  `json:"globalPodLabel,omitempty" yaml:"globalPodLabel,omitempty"`
 	HostPaths          MountSpec          `json:"hostPaths,omitempty" yaml:"hostPaths,omitempty"`
 	NodeSelector       map[string]string  `json:"nodeSelector,omitempty" yaml:"nodeSelector,omitempty"`
 	Tolerations        []Toleration       `json:"tolerations,omitempty" yaml:"tolerations,omitempty"`
@@ -122,7 +123,7 @@ type PagestoreSpec struct {
 
 type MetastoreSpec struct {
 	Enabled      *bool  `json:"enabled,omitempty" yaml:"enabled,omitempty"`
-	HostPath     *bool  `json:"hostPath,omitempty" yaml:"hostPath,omitempty"`
+	HostPath     string `json:"hostPath,omitempty" yaml:"hostPath,omitempty"`
 	Size         string `json:"size,omitempty" yaml:"size,omitempty"`
 	StorageClass string `json:"storageClass,omitempty" yaml:"storageClass,omitempty"`
 	Type         string `json:"type,omitempty" yaml:"type,omitempty"`

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/deploy/charts/alluxio-operator/crds/k8s-operator.alluxio.com_alluxioclusters.yaml b/deploy/charts/alluxio-operator/crds/k8s-operator.alluxio.com_alluxioclusters.yaml
@@ -1061,6 +1061,10 @@ spec:
                   user:
                     type: integer
                 type: object
+              globalPodLabel:
+                additionalProperties:
+                  type: string
+                type: object
               group:
                 type: integer
               hostAliases:

diff --git a/deploy/charts/alluxio/templates/csi/csi-fuse.yaml b/deploy/charts/alluxio/templates/csi/csi-fuse.yaml
@@ -38,6 +38,9 @@ data:
         name: {{ $fullName }}-fuse
         app: {{ $name }}
         role: alluxio-fuse
+      {{- if .Values.globalPodLabel }}
+{{ toYaml .Values.globalPodLabel | trim | indent 8 }}
+      {{- end }}
     spec:
       securityContext:
         runAsUser: {{ .Values.fuse.user }}

diff --git a/deploy/charts/alluxio/templates/fuse/daemonset.yaml b/deploy/charts/alluxio/templates/fuse/daemonset.yaml
@@ -29,6 +29,9 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: alluxio-fuse
+    {{- if .Values.globalPodLabel }}
+{{ toYaml .Values.globalPodLabel | trim | indent 4 }}
+    {{- end }}
 spec:
   selector:
     matchLabels:
@@ -37,6 +40,9 @@ spec:
       release: {{ .Release.Name }}
       heritage: {{ .Release.Service }}
       role: alluxio-fuse
+    {{- if .Values.globalPodLabel }}
+{{ toYaml .Values.globalPodLabel | trim | indent 6 }}
+    {{- end }}
   template:
     metadata:
       labels:
@@ -45,6 +51,9 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: alluxio-fuse
+    {{- if .Values.globalPodLabel }}
+{{ toYaml .Values.globalPodLabel | trim | indent 8 }}
+    {{- end }}
       annotations:
       {{- if .Values.fuse.podAnnotations }}
 {{- toYaml .Values.fuse.podAnnotations | nindent 8 }}

diff --git a/deploy/charts/alluxio/templates/master/statefulset.yaml b/deploy/charts/alluxio/templates/master/statefulset.yaml
@@ -31,12 +31,18 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: alluxio-master
+    {{- if .Values.globalPodLabel }}
+{{ toYaml .Values.globalPodLabel | trim | indent 4 }}
+    {{- end }}
 spec:
   selector:
     matchLabels:
       app: {{ $name }}
       role: alluxio-master
       name: {{ $fullName }}-master
+      {{- if .Values.globalPodLabel }}
+{{ toYaml .Values.globalPodLabel | trim | indent 6 }}
+      {{- end }}
   serviceName: {{ $fullName }}-master
   replicas: {{ int .Values.master.count }}
   template:
@@ -48,6 +54,9 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: alluxio-master
+        {{- if .Values.globalPodLabel }}
+{{ toYaml .Values.globalPodLabel | trim | indent 8 }}
+        {{- end }}
       annotations:
       {{- if .Values.master.podAnnotations }}
 {{- toYaml .Values.master.podAnnotations | nindent 8 }}

diff --git a/deploy/charts/alluxio/templates/proxy/daemonset.yaml b/deploy/charts/alluxio/templates/proxy/daemonset.yaml
@@ -27,6 +27,9 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: alluxio-proxy
+    {{- if .Values.globalPodLabel }}
+{{ toYaml .Values.globalPodLabel | trim | indent 4 }}
+    {{- end }}
 spec:
   selector:
     matchLabels:
@@ -36,6 +39,9 @@ spec:
       release: {{ .Release.Name }}
       heritage: {{ .Release.Service }}
       role: alluxio-proxy
+      {{- if .Values.globalPodLabel }}
+{{ toYaml .Values.globalPodLabel | trim | indent 6 }}
+      {{- end }}
   template:
     metadata:
       labels:
@@ -45,6 +51,9 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: alluxio-proxy
+        {{- if .Values.globalPodLabel }}
+{{ toYaml .Values.globalPodLabel | trim | indent 8 }}
+        {{- end }}
       annotations:
       {{- if .Values.proxy.podAnnotations }}
 {{- toYaml .Values.worker.podAnnotations | nindent 8 }}

diff --git a/deploy/charts/alluxio/templates/worker/deployment.yaml b/deploy/charts/alluxio/templates/worker/deployment.yaml
@@ -48,6 +48,9 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
     role: {{ $workerRoleName }}
+    {{- if .Values.globalPodLabel }}
+{{ toYaml .Values.globalPodLabel | trim | indent 4 }}
+    {{- end }}
 spec:
   replicas: {{ .Values.worker.count }}
   selector:
@@ -58,6 +61,9 @@ spec:
       release: {{ .Release.Name }}
       heritage: {{ .Release.Service }}
       role: {{ $workerRoleName }}
+      {{- if .Values.globalPodLabel }}
+{{ toYaml .Values.globalPodLabel | trim | indent 6 }}
+      {{- end }}
   strategy:
     type: Recreate
   template:
@@ -69,6 +75,9 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         role: {{ $workerRoleName }}
+        {{- if .Values.globalPodLabel }}
+{{ toYaml .Values.globalPodLabel | trim | indent 8 }}
+        {{- end }}
       annotations:
       {{- if .Values.worker.podAnnotations }}
 {{- toYaml .Values.worker.podAnnotations | nindent 8 }}

diff --git a/deploy/charts/alluxio/values.yaml b/deploy/charts/alluxio/values.yaml
@@ -55,6 +55,12 @@ serviceAccountName:
 #       - "example2.com"
 hostAliases:
 
+# Labels attached to all components of Alluxio. Format:
+# globalPodLabel:
+#   <label key1>: <label value1>
+#   <label key2>: <label value2>
+globalPodLabel:
+
 # Use labels to run Alluxio on a subset of the K8s nodes. Format:
 # nodeSelector:
 #   <lable key1>: <label value1>

diff --git a/resources/crds/k8s-operator.alluxio.com_alluxioclusters.yaml b/resources/crds/k8s-operator.alluxio.com_alluxioclusters.yaml
@@ -1061,6 +1061,10 @@ spec:
                   user:
                     type: integer
                 type: object
+              globalPodLabel:
+                additionalProperties:
+                  type: string
+                type: object
               group:
                 type: integer
               hostAliases:

diff --git a/tests/helm/config_test.yaml b/tests/helm/config_test.yaml
@@ -65,6 +65,14 @@ hostAliases:
       - "example10.com"
       - "example11.com"
 
+# Labels attached to all components of Alluxio. Format:
+# globalPodLabel:
+#   <label key1>: <label value1>
+#   <label key2>: <label value2>
+globalPodLabel:
+  globalPodLabelKey1: globalPodLabelVal1
+  globalPodLabelKey2: globalPodLabelVal2
+
 # Use labels to run Alluxio on a subset of the K8s nodes. Format:
 # nodeSelector:
 #   <lable key1>: <label value1>

diff --git a/tests/helm/expectedTemplates/csi/csi-fuse.yaml b/tests/helm/expectedTemplates/csi/csi-fuse.yaml
@@ -20,6 +20,8 @@ data:
         name: dummy-alluxio-fuse
         app: alluxio
         role: alluxio-fuse
+        globalPodLabelKey1: globalPodLabelVal1
+        globalPodLabelKey2: globalPodLabelVal2
     spec:
       securityContext:
         runAsUser: 1000

diff --git a/tests/helm/expectedTemplates/fuse/daemonset.yaml b/tests/helm/expectedTemplates/fuse/daemonset.yaml
@@ -23,6 +23,8 @@ metadata:
     release: dummy
     heritage: Helm
     role: alluxio-fuse
+    globalPodLabelKey1: globalPodLabelVal1
+    globalPodLabelKey2: globalPodLabelVal2
 spec:
   selector:
     matchLabels:
@@ -31,6 +33,8 @@ spec:
       release: dummy
       heritage: Helm
       role: alluxio-fuse
+      globalPodLabelKey1: globalPodLabelVal1
+      globalPodLabelKey2: globalPodLabelVal2
   template:
     metadata:
       labels:
@@ -39,6 +43,8 @@ spec:
         release: dummy
         heritage: Helm
         role: alluxio-fuse
+        globalPodLabelKey1: globalPodLabelVal1
+        globalPodLabelKey2: globalPodLabelVal2
       annotations:
         proxyAnnotationKey1: fuseAnnotationVal1
         proxyAnnotationKey2: fuseAnnotationVal2

diff --git a/tests/helm/expectedTemplates/master/statefulset.yaml b/tests/helm/expectedTemplates/master/statefulset.yaml
@@ -22,12 +22,16 @@ metadata:
     release: dummy
     heritage: Helm
     role: alluxio-master
+    globalPodLabelKey1: globalPodLabelVal1
+    globalPodLabelKey2: globalPodLabelVal2
 spec:
   selector:
     matchLabels:
       app: alluxio
       role: alluxio-master
       name: dummy-alluxio-master
+      globalPodLabelKey1: globalPodLabelVal1
+      globalPodLabelKey2: globalPodLabelVal2
   serviceName: dummy-alluxio-master
   replicas: 3
   template:
@@ -39,6 +43,8 @@ spec:
         release: dummy
         heritage: Helm
         role: alluxio-master
+        globalPodLabelKey1: globalPodLabelVal1
+        globalPodLabelKey2: globalPodLabelVal2
       annotations:
         masterAnnotationKey1: masterAnnotationVal1
         masterAnnotationKey2: masterAnnotationVal2

diff --git a/tests/helm/expectedTemplates/proxy/daemonset.yaml b/tests/helm/expectedTemplates/proxy/daemonset.yaml
@@ -22,6 +22,8 @@ metadata:
     release: dummy
     heritage: Helm
     role: alluxio-proxy
+    globalPodLabelKey1: globalPodLabelVal1
+    globalPodLabelKey2: globalPodLabelVal2
 spec:
   selector:
     matchLabels:
@@ -31,6 +33,8 @@ spec:
       release: dummy
       heritage: Helm
       role: alluxio-proxy
+      globalPodLabelKey1: globalPodLabelVal1
+      globalPodLabelKey2: globalPodLabelVal2
   template:
     metadata:
       labels:
@@ -40,6 +44,8 @@ spec:
         release: dummy
         heritage: Helm
         role: alluxio-proxy
+        globalPodLabelKey1: globalPodLabelVal1
+        globalPodLabelKey2: globalPodLabelVal2
       annotations:
         workerAnnotationKey1: workerAnnotationVal1
         workerAnnotationKey2: workerAnnotationVal2

diff --git a/tests/helm/expectedTemplates/worker/deployment.yaml b/tests/helm/expectedTemplates/worker/deployment.yaml
@@ -22,6 +22,8 @@ metadata:
     release: dummy
     heritage: Helm
     role: alluxio-worker
+    globalPodLabelKey1: globalPodLabelVal1
+    globalPodLabelKey2: globalPodLabelVal2
 spec:
   replicas: 2
   selector:
@@ -32,6 +34,8 @@ spec:
       release: dummy
       heritage: Helm
       role: alluxio-worker
+      globalPodLabelKey1: globalPodLabelVal1
+      globalPodLabelKey2: globalPodLabelVal2
   strategy:
     type: Recreate
   template:
@@ -43,6 +47,8 @@ spec:
         release: dummy
         heritage: Helm
         role: alluxio-worker
+        globalPodLabelKey1: globalPodLabelVal1
+        globalPodLabelKey2: globalPodLabelVal2
       annotations:
         workerAnnotationKey1: workerAnnotationVal1
         workerAnnotationKey2: workerAnnotationVal2