chore(chart): simplify helm chart

caicloud · Dec 21, 2020 · b7e7aac · b7e7aac
1 parent b2eaa54
commit b7e7aac
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/manifests/cyclone/templates/_helpers.tpl b/manifests/cyclone/templates/_helpers.tpl
@@ -30,3 +30,11 @@ Create chart name and version as used by the chart label.
 {{- define "cyclone.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
+{{- define "cyclone.registry.release" -}}
+{{- printf "%s/%s" .Values.platformConfig.imageRegistry .Values.platformConfig.imageRepositoryRelease -}}
+{{- end -}}
+
+{{- define "cyclone.registry.library" -}}
+{{- printf "%s/%s" .Values.platformConfig.imageRegistry .Values.platformConfig.imageRepositoryLibrary -}}
+{{- end -}}
diff --git a/manifests/cyclone/templates/controller.yaml b/manifests/cyclone/templates/controller.yaml
@@ -12,13 +12,13 @@ data:
   workflow-controller.json: |
     {
       "images": {
-        "git-resolver": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-resolver-git:{{ .Chart.AppVersion }}",
-        "svn-resolver": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-resolver-svn:{{ .Chart.AppVersion }}",
-        "image-resolver": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-resolver-image:{{ .Chart.AppVersion }}",
-        "http-resolver": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-resolver-http:{{ .Chart.AppVersion }}",
-        "coordinator": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-workflow-coordinator:{{ .Chart.AppVersion }}",
-        "toolbox": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-toolbox:{{ .Chart.AppVersion }}",
-        "gc": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryLibrary }}/{{ .Values.engine.images.gc }}"
+        "git-resolver": "{{ include "cyclone.registry.release" . }}/cyclone-resolver-git:{{ .Chart.AppVersion }}",
+        "svn-resolver": "{{ include "cyclone.registry.release" . }}/cyclone-resolver-svn:{{ .Chart.AppVersion }}",
+        "image-resolver": "{{ include "cyclone.registry.release" . }}/cyclone-resolver-image:{{ .Chart.AppVersion }}",
+        "http-resolver": "{{ include "cyclone.registry.release" . }}/cyclone-resolver-http:{{ .Chart.AppVersion }}",
+        "coordinator": "{{ include "cyclone.registry.release" . }}/cyclone-workflow-coordinator:{{ .Chart.AppVersion }}",
+        "toolbox": "{{ include "cyclone.registry.release" . }}/cyclone-toolbox:{{ .Chart.AppVersion }}",
+        "gc": "{{ include "cyclone.registry.library" . }}/{{ .Values.engine.images.gc }}"
       },
       "logging": {
         "level": "info"
@@ -87,7 +87,7 @@ spec:
       - name: controller
         command:
         - /workspace/controller
-        image: "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-workflow-controller:{{ .Chart.AppVersion }}"
+        image: "{{ include "cyclone.registry.release" . }}/cyclone-workflow-controller:{{ .Chart.AppVersion }}"
         imagePullPolicy: Always
         env:
         - name: DEVELOP_MODE

diff --git a/manifests/cyclone/templates/server.yaml b/manifests/cyclone/templates/server.yaml
@@ -27,7 +27,7 @@ data:
       "init_default_tenant": {{ .Values.server.init.defaultTenant }},
       "open_control_cluster": {{ .Values.server.openControlCluster }},
       "storage_usage_watcher": {
-        "image": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-watcher:{{ .Chart.AppVersion }}",
+        "image": "{{ include "cyclone.registry.release" . }}/cyclone-watcher:{{ .Chart.AppVersion }}",
         "report_url": "http://{{ .Values.platformConfig.controlClusterVIP }}:6041/apis/v1alpha1/storage/usages",
         "interval_seconds": "{{ .Values.server.storageWatcher.intervalSeconds }}",
         "resource_requirements": {
@@ -38,7 +38,7 @@ data:
         }
       },
       "cache_cleaner": {
-        "image": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryLibrary }}/{{ .Values.server.cacheCleaner.image }}",
+        "image": "{{ include "cyclone.registry.library" . }}/{{ .Values.server.cacheCleaner.image }}",
         "resource_requirements": {
           "limits.cpu": "{{ .Values.server.cacheCleaner.resourceRequirements.limits.cpu }}",
           "limits.memory": "{{ .Values.server.cacheCleaner.resourceRequirements.limits.memory }}",
@@ -47,7 +47,7 @@ data:
         }
       },
       "images": {
-        "gc": "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryLibrary }}/{{ .Values.engine.images.gc }}"
+        "gc": "{{ include "cyclone.registry.library" . }}/{{ .Values.engine.images.gc }}"
       },
       "notifications": [
         {
@@ -97,7 +97,7 @@ spec:
       serviceAccountName: {{ .Values.serviceAccount }}
       containers:
       - name: server
-        image: "{{ .Values.platformConfig.imageRegistry }}/{{ .Values.platformConfig.imageRepositoryRelease }}/cyclone-server:{{ .Chart.AppVersion }}"
+        image: "{{ include "cyclone.registry.release" . }}/cyclone-server:{{ .Chart.AppVersion }}"
         imagePullPolicy: Always
         command:
         - /cyclone-server