chore(deploy): refactor image structure (#878)

bytedance · Aug 19, 2021 · 8e2216f · 8e2216f
1 parent 0c25ce6
commit 8e2216f
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 24 deletions.
diff --git a/deploy/charts/fedlearner-stack/charts/sparkoperator/README.md b/deploy/charts/fedlearner-stack/charts/sparkoperator/README.md
@@ -42,9 +42,9 @@ The following table lists the configurable parameters of the Spark operator char
 
 | Parameter                 | Description                                                  | Default                                |
 | ------------------------- | ------------------------------------------------------------ | -------------------------------------- |
-| `operatorImageName`       | The name of the operator image                               | `gcr.io/spark-operator/spark-operator` |
-| `operatorVersion`         | The version of the operator to install                       | `v1beta2-1.2.0-3.0.0`                  |
-| `imagePullPolicy`         | Docker image pull policy                                     | `IfNotPresent`                         |
+| `image.repository`       | The name of the operator image                               | `gcr.io/spark-operator/spark-operator` |
+| `image.tag`         | The version of the operator to install                       | `v1beta2-1.2.0-3.0.0`                  |
+| `image.pullPolicy`         | Docker image pull policy                                     | `IfNotPresent`                         |
 | `imagePullSecrets`        | Docker image pull secrets                                    |                                        |
 | `replicas`                | The number of replicas of the operator Deployment            | 1                                      |
 | `sparkJobNamespace`       | K8s namespace where Spark jobs are to be deployed            | ``                                     |

diff --git a/deploy/charts/fedlearner-stack/charts/sparkoperator/ci/test-values.yaml b/deploy/charts/fedlearner-stack/charts/sparkoperator/ci/test-values.yaml
@@ -1,6 +1,7 @@
-operatorImageName: gcr.io/spark-operator/spark-operator
-operatorVersion: v1beta2-1.2.0-3.0.0
-imagePullPolicy: IfNotPresent
+image:
+  repository: registry.cn-beijing.aliyuncs.com/fedlearner/spark-operator
+  pullPolicy: IfNotPresent
+  tag: v1beta2-1.2.0-3.0.0
 imagePullSecrets: []
 
 rbac:

diff --git a/deploy/charts/fedlearner-stack/charts/sparkoperator/templates/crd-cleanup-job.yaml b/deploy/charts/fedlearner-stack/charts/sparkoperator/templates/crd-cleanup-job.yaml
@@ -27,8 +27,8 @@ spec:
 {{ toYaml .Values.imagePullSecrets | trim | indent 8 }}
       containers:
         - name: delete-sparkapp-crd
-          image: {{ .Values.operatorImageName }}:{{ .Values.operatorVersion }}
-          imagePullPolicy: {{ .Values.imagePullPolicy }}
+          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+          imagePullPolicy: {{ .Values.image.pullPolicy}}
           {{- if .Values.securityContext }}
           securityContext:
             {{- range $securityPolicy, $value := .Values.securityContext }}
@@ -45,8 +45,8 @@ spec:
           -H \"Content-Type: application/json\" \
           https://kubernetes.default.svc/apis/apiextensions.k8s.io/v1beta1/customresourcedefinitions/sparkapplications.sparkoperator.k8s.io"
         - name: delete-scheduledsparkapp-crd
-          image: {{ .Values.operatorImageName }}:{{ .Values.operatorVersion }}
-          imagePullPolicy: {{ .Values.imagePullPolicy }}
+          image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+          imagePullPolicy: {{ .Values.image.pullPolicy}}
           {{- if .Values.securityContext }}
           securityContext:
             {{- range $securityPolicy, $value := .Values.securityContext }}

diff --git a/deploy/charts/fedlearner-stack/charts/sparkoperator/templates/spark-operator-deployment.yaml b/deploy/charts/fedlearner-stack/charts/sparkoperator/templates/spark-operator-deployment.yaml
@@ -19,7 +19,7 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "sparkoperator.name" . }}
-      app.kubernetes.io/version: {{ .Values.operatorVersion }}
+      app.kubernetes.io/version: {{ .Values.image.tag }}
   strategy:
     type: Recreate
   template:
@@ -37,7 +37,7 @@ spec:
     {{- end }}
       labels:
         app.kubernetes.io/name: {{ include "sparkoperator.name" . }}
-        app.kubernetes.io/version: {{ .Values.operatorVersion }}
+        app.kubernetes.io/version: {{ .Values.image.tag }}
     spec:
       serviceAccountName: {{ include "sparkoperator.serviceAccountName" . }}
       imagePullSecrets:
@@ -50,8 +50,8 @@ spec:
       {{- end }}
       containers:
       - name: sparkoperator
-        image: {{ .Values.operatorImageName }}:{{ .Values.operatorVersion }}
-        imagePullPolicy: {{ .Values.imagePullPolicy }}
+        image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+        imagePullPolicy: {{ .Values.image.pullPolicy}}
         {{- if .Values.securityContext }}
         securityContext:
           {{- range $securityPolicy, $value := .Values.securityContext }}

diff --git a/deploy/charts/fedlearner-stack/charts/sparkoperator/templates/webhook-cleanup-job.yaml b/deploy/charts/fedlearner-stack/charts/sparkoperator/templates/webhook-cleanup-job.yaml
@@ -27,8 +27,8 @@ spec:
 {{ toYaml .Values.imagePullSecrets | trim | indent 8 }}
       containers:
       - name: clean-secret
-        image: {{ .Values.operatorImageName }}:{{ .Values.operatorVersion }}
-        imagePullPolicy: {{ .Values.imagePullPolicy }}
+        image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+        imagePullPolicy: {{ .Values.image.pullPolicy}}
         {{- if .Values.securityContext }}
         securityContext:
           {{- range $securityPolicy, $value := .Values.securityContext }}

diff --git a/deploy/charts/fedlearner-stack/charts/sparkoperator/templates/webhook-init-job.yaml b/deploy/charts/fedlearner-stack/charts/sparkoperator/templates/webhook-init-job.yaml
@@ -24,8 +24,8 @@ spec:
 {{ toYaml .Values.imagePullSecrets | trim | indent 8 }}
       containers:
       - name: main
-        image: {{ .Values.operatorImageName }}:{{ .Values.operatorVersion }}
-        imagePullPolicy: {{ .Values.imagePullPolicy }}
+        image: {{ .Values.image.repository }}:{{ .Values.image.tag }}
+        imagePullPolicy: {{ .Values.image.pullPolicy}}
         {{- if .Values.securityContext }}
         securityContext:
           {{- range $securityPolicy, $value := .Values.securityContext }}

diff --git a/deploy/charts/fedlearner-stack/charts/sparkoperator/templates/webhook-service.yaml b/deploy/charts/fedlearner-stack/charts/sparkoperator/templates/webhook-service.yaml
@@ -16,5 +16,5 @@ spec:
     name: webhook
   selector:
     app.kubernetes.io/name: {{ include "sparkoperator.name" . }}
-    app.kubernetes.io/version: {{ .Values.operatorVersion }}
+    app.kubernetes.io/version: {{ .Values.image.tag }}
 {{ end }}
diff --git a/deploy/charts/fedlearner-stack/charts/sparkoperator/values.yaml b/deploy/charts/fedlearner-stack/charts/sparkoperator/values.yaml
@@ -1,6 +1,8 @@
-operatorImageName: registry.cn-beijing.aliyuncs.com/fedlearner/spark-operator
-operatorVersion: v1beta2-1.2.0-3.0.0
-imagePullPolicy: IfNotPresent
+image:
+  repository: registry.cn-beijing.aliyuncs.com/fedlearner/spark-operator
+  pullPolicy: IfNotPresent
+  tag: v1beta2-1.2.0-3.0.0
+
 imagePullSecrets: []
 
 rbac:

diff --git a/deploy/charts/fedlearner-stack/values.yaml b/deploy/charts/fedlearner-stack/values.yaml
@@ -88,8 +88,10 @@ sparkoperator:
       create: true
       name: spark
 
-  operatorImageName: registry.cn-beijing.aliyuncs.com/fedlearner/spark-operator
-  operatorVersion: v1beta2-1.2.0-3.0.0
+  image:
+    repository: registry.cn-beijing.aliyuncs.com/fedlearner/spark-operator
+    pullPolicy: IfNotPresent
+    tag: v1beta2-1.2.0-3.0.0
 
   sparkJobNamespace: default
   installCrds: true