From 0f8c2017c7634d3d17164733df8a94d110f1d212 Mon Sep 17 00:00:00 2001 From: shucheng Date: Sun, 2 May 2021 11:28:10 +0800 Subject: [PATCH] update --- templates/_helpers.tpl | 2 +- templates/chartmuseum/chartmuseum-dpl.yaml | 2 +- templates/clair/clair-dpl.yaml | 4 ++-- templates/core/core-dpl.yaml | 2 +- templates/database/database-ss.yaml | 6 +++--- templates/jobservice/jobservice-dpl.yaml | 2 +- templates/nginx/deployment.yaml | 2 +- templates/notary/notary-server.yaml | 2 +- templates/notary/notary-signer.yaml | 2 +- templates/portal/deployment.yaml | 2 +- templates/redis/statefulset.yaml | 2 +- templates/registry/registry-dpl.yaml | 4 ++-- templates/trivy/trivy-sts.yaml | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index ec191ca..f9e79d5 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -1,7 +1,7 @@ {{/* Create chart imageArch suffix. */}} -{{- define "beagle.imageArch" -}} +{{- define ".beagle.imageArch" -}} {{- if not (eq "amd64" .Values.global.imageArch) -}} {{- print "-" .Values.global.imageArch -}} {{- else -}} diff --git a/templates/chartmuseum/chartmuseum-dpl.yaml b/templates/chartmuseum/chartmuseum-dpl.yaml index d9420ae..4c9aeb3 100644 --- a/templates/chartmuseum/chartmuseum-dpl.yaml +++ b/templates/chartmuseum/chartmuseum-dpl.yaml @@ -49,7 +49,7 @@ spec: {{- if contains "/" .Values.chartmuseum.image.repository }} image: "{{ .Values.chartmuseum.image.repository }}" {{- else }} - image: "{{ .Values.chartmuseum.image.hub | default .Values.global.hub }}/{{ .Values.chartmuseum.image.repository }}:{{ .Values.chartmuseum.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}" + image: "{{ .Values.chartmuseum.image.hub | default .Values.global.hub }}/{{ .Values.chartmuseum.image.repository }}:{{ .Values.chartmuseum.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}" {{- end }} imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}" livenessProbe: diff --git a/templates/clair/clair-dpl.yaml b/templates/clair/clair-dpl.yaml index 384d7ee..039db0d 100644 --- a/templates/clair/clair-dpl.yaml +++ b/templates/clair/clair-dpl.yaml @@ -42,7 +42,7 @@ spec: {{- if contains "/" .Values.clair.clair.image.repository }} image: "{{ .Values.clair.clair.image.repository }}" {{- else }} - image: "{{ .Values.clair.clair.image.hub | default .Values.global.hub }}/{{ .Values.clair.clair.image.repository }}:{{ .Values.clair.clair.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}" + image: "{{ .Values.clair.clair.image.hub | default .Values.global.hub }}/{{ .Values.clair.clair.image.repository }}:{{ .Values.clair.clair.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}" {{- end }} imagePullPolicy: "{{ .Values.global.imagePullPolicy }}" livenessProbe: @@ -88,7 +88,7 @@ spec: {{- if contains "/" .Values.clair.adapter.image.repository }} image: "{{ .Values.clair.adapter.image.repository }}" {{- else }} - image: "{{ .Values.clair.adapter.image.hub | default .Values.global.hub }}/{{ .Values.clair.adapter.image.repository }}:{{ .Values.clair.adapter.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}" + image: "{{ .Values.clair.adapter.image.hub | default .Values.global.hub }}/{{ .Values.clair.adapter.image.repository }}:{{ .Values.clair.adapter.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}" {{- end }} imagePullPolicy: "{{ .Values.global.imagePullPolicy }}" livenessProbe: diff --git a/templates/core/core-dpl.yaml b/templates/core/core-dpl.yaml index 21eb120..72c3778 100644 --- a/templates/core/core-dpl.yaml +++ b/templates/core/core-dpl.yaml @@ -43,7 +43,7 @@ spec: {{- if contains "/" .Values.core.image.repository }} image: "{{ .Values.core.image.repository }}" {{- else }} - image: "{{ .Values.core.image.hub | default .Values.global.hub }}/{{ .Values.core.image.repository }}:{{ .Values.core.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}" + image: "{{ .Values.core.image.hub | default .Values.global.hub }}/{{ .Values.core.image.repository }}:{{ .Values.core.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}" {{- end }} imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}" {{- if .Values.core.startupProbe.enabled }} diff --git a/templates/database/database-ss.yaml b/templates/database/database-ss.yaml index 8811da1..df29258 100644 --- a/templates/database/database-ss.yaml +++ b/templates/database/database-ss.yaml @@ -39,7 +39,7 @@ spec: {{- if contains "/" .Values.database.internal.image.repository }} image: "{{ .Values.database.internal.image.repository }}" {{- else }} - image: "{{ .Values.database.internal.image.hub | default .Values.global.hub }}/{{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}" + image: "{{ .Values.database.internal.image.hub | default .Values.global.hub }}/{{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}" {{- end }} imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}" command: ["/bin/sh"] @@ -52,7 +52,7 @@ spec: {{- if contains "/" .Values.database.internal.image.repository }} image: "{{ .Values.database.internal.image.repository }}" {{- else }} - image: "{{ .Values.database.internal.image.hub | default .Values.global.hub }}/{{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}" + image: "{{ .Values.database.internal.image.hub | default .Values.global.hub }}/{{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}" {{- end }} imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}" command: ["rm", "-Rf", "/var/lib/postgresql/data/lost+found"] @@ -65,7 +65,7 @@ spec: {{- if contains "/" .Values.database.internal.image.repository }} image: "{{ .Values.database.internal.image.repository }}" {{- else }} - image: "{{ .Values.database.internal.image.hub | default .Values.global.hub }}/{{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}" + image: "{{ .Values.database.internal.image.hub | default .Values.global.hub }}/{{ .Values.database.internal.image.repository }}:{{ .Values.database.internal.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}" {{- end }} imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}" livenessProbe: diff --git a/templates/jobservice/jobservice-dpl.yaml b/templates/jobservice/jobservice-dpl.yaml index b940b9e..ba62cba 100644 --- a/templates/jobservice/jobservice-dpl.yaml +++ b/templates/jobservice/jobservice-dpl.yaml @@ -49,7 +49,7 @@ spec: {{- if contains "/" .Values.jobservice.image.repository }} image: "{{ .Values.jobservice.image.repository }}" {{- else }} - image: "{{ .Values.jobservice.image.hub | default .Values.global.hub }}/{{ .Values.jobservice.image.repository }}:{{ .Values.jobservice.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}" + image: "{{ .Values.jobservice.image.hub | default .Values.global.hub }}/{{ .Values.jobservice.image.repository }}:{{ .Values.jobservice.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}" {{- end }} imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}" livenessProbe: diff --git a/templates/nginx/deployment.yaml b/templates/nginx/deployment.yaml index a5530e4..337c447 100644 --- a/templates/nginx/deployment.yaml +++ b/templates/nginx/deployment.yaml @@ -44,7 +44,7 @@ spec: {{- if contains "/" .Values.nginx.image.repository }} image: "{{ .Values.nginx.image.repository }}" {{- else }} - image: "{{ .Values.nginx.image.hub | default .Values.global.hub }}/{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}" + image: "{{ .Values.nginx.image.hub | default .Values.global.hub }}/{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}" {{- end }} imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}" {{- $_ := set . "scheme" "HTTP" -}} diff --git a/templates/notary/notary-server.yaml b/templates/notary/notary-server.yaml index dc942b7..306f365 100644 --- a/templates/notary/notary-server.yaml +++ b/templates/notary/notary-server.yaml @@ -38,7 +38,7 @@ spec: {{- if contains "/" .Values.notary.server.image.repository }} image: "{{ .Values.notary.server.image.repository }}" {{- else }} - image: "{{ .Values.notary.server.image.hub | default .Values.global.hub }}/{{ .Values.notary.server.image.repository }}:{{ .Values.notary.server.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}" + image: "{{ .Values.notary.server.image.hub | default .Values.global.hub }}/{{ .Values.notary.server.image.repository }}:{{ .Values.notary.server.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}" {{- end }} imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}" {{- if .Values.notary.server.resources }} diff --git a/templates/notary/notary-signer.yaml b/templates/notary/notary-signer.yaml index f067725..b7b955f 100644 --- a/templates/notary/notary-signer.yaml +++ b/templates/notary/notary-signer.yaml @@ -34,7 +34,7 @@ spec: {{- if contains "/" .Values.notary.signer.image.repository }} image: "{{ .Values.notary.signer.image.repository }}" {{- else }} - image: "{{ .Values.notary.signer.image.hub | default .Values.global.hub }}/{{ .Values.notary.signer.image.repository }}:{{ .Values.notary.signer.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}" + image: "{{ .Values.notary.signer.image.hub | default .Values.global.hub }}/{{ .Values.notary.signer.image.repository }}:{{ .Values.notary.signer.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}" {{- end }} imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}" {{- if .Values.notary.signer.resources }} diff --git a/templates/portal/deployment.yaml b/templates/portal/deployment.yaml index 2b34b43..887fcf8 100644 --- a/templates/portal/deployment.yaml +++ b/templates/portal/deployment.yaml @@ -38,7 +38,7 @@ spec: {{- if contains "/" .Values.portal.image.repository }} image: "{{ .Values.portal.image.repository }}" {{- else }} - image: "{{ .Values.portal.image.hub | default .Values.global.hub }}/{{ .Values.portal.image.repository }}:{{ .Values.portal.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}" + image: "{{ .Values.portal.image.hub | default .Values.global.hub }}/{{ .Values.portal.image.repository }}:{{ .Values.portal.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}" {{- end }} imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}" {{- if .Values.portal.resources }} diff --git a/templates/redis/statefulset.yaml b/templates/redis/statefulset.yaml index 464c718..93585d7 100644 --- a/templates/redis/statefulset.yaml +++ b/templates/redis/statefulset.yaml @@ -38,7 +38,7 @@ spec: {{- if contains "/" .Values.redis.internal.image.repository }} image: "{{ .Values.redis.internal.image.repository }}" {{- else }} - image: "{{ .Values.redis.internal.image.hub | default .Values.global.hub }}/{{ .Values.redis.internal.image.repository }}:{{ .Values.redis.internal.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}" + image: "{{ .Values.redis.internal.image.hub | default .Values.global.hub }}/{{ .Values.redis.internal.image.repository }}:{{ .Values.redis.internal.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}" {{- end }} imagePullPolicy: "{{ .Values.global.imagePullPolicy }}" livenessProbe: diff --git a/templates/registry/registry-dpl.yaml b/templates/registry/registry-dpl.yaml index c711848..dedacdc 100644 --- a/templates/registry/registry-dpl.yaml +++ b/templates/registry/registry-dpl.yaml @@ -49,7 +49,7 @@ spec: {{- if contains "/" .Values.registry.registry.image.repository }} image: "{{ .Values.registry.registry.image.repository }}" {{- else }} - image: "{{ .Values.registry.registry.image.hub | default .Values.global.hub }}/{{ .Values.registry.registry.image.repository }}:{{ .Values.registry.registry.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}" + image: "{{ .Values.registry.registry.image.hub | default .Values.global.hub }}/{{ .Values.registry.registry.image.repository }}:{{ .Values.registry.registry.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}" {{- end }} imagePullPolicy: "{{ .Values.global.imagePullPolicy }}" livenessProbe: @@ -137,7 +137,7 @@ spec: {{- if contains "/" .Values.registry.controller.image.repository }} image: "{{ .Values.registry.controller.image.repository }}" {{- else }} - image: "{{ .Values.registry.controller.image.hub | default .Values.global.hub }}/{{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}" + image: "{{ .Values.registry.controller.image.hub | default .Values.global.hub }}/{{ .Values.registry.controller.image.repository }}:{{ .Values.registry.controller.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}" {{- end }} imagePullPolicy: "{{ .Values.global.imagePullPolicy }}" livenessProbe: diff --git a/templates/trivy/trivy-sts.yaml b/templates/trivy/trivy-sts.yaml index 2b253a8..ae0e0b5 100644 --- a/templates/trivy/trivy-sts.yaml +++ b/templates/trivy/trivy-sts.yaml @@ -47,7 +47,7 @@ spec: {{- if contains "/" .Values.trivy.image.repository }} image: "{{ .Values.trivy.image.repository }}" {{- else }} - image: "{{ .Values.trivy.image.hub | default .Values.global.hub }}/{{ .Values.trivy.image.repository }}:{{ .Values.trivy.image.tag | default .Values.global.tag }}{{ template "beagle.imageArch" . }}" + image: "{{ .Values.trivy.image.hub | default .Values.global.hub }}/{{ .Values.trivy.image.repository }}:{{ .Values.trivy.image.tag | default .Values.global.tag }}{{ template ".beagle.imageArch" . }}" {{- end }} imagePullPolicy: "{{ .Values.imagePullPolicy | default .Values.global.imagePullPolicy }}" securityContext: -- 2.26.0