diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl index 59c8b4b293b5f4fc4fe4274221c51c686c7328ff..ec191ca14e727b792ec06aa35ad9f585a823ba80 100644 --- a/templates/_helpers.tpl +++ b/templates/_helpers.tpl @@ -1,9 +1,9 @@ {{/* -Create chart arch suffix. +Create chart imageArch suffix. */}} -{{- define "beagle.arch" -}} -{{- if not (eq "amd64" .Values.global.arch) -}} -{{- print "-" .Values.global.arch -}} +{{- define "beagle.imageArch" -}} +{{- if not (eq "amd64" .Values.global.imageArch) -}} +{{- print "-" .Values.global.imageArch -}} {{- else -}} {{- print "" -}} {{- end -}} diff --git a/templates/chartmuseum/chartmuseum-dpl.yaml b/templates/chartmuseum/chartmuseum-dpl.yaml index c0f61b3b7f8aa664afdbc8ed8a7d8bd071b9652b..d9420ae3b3e63fed1a3407beae0d64c32bc1377f 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.arch" . }}" + 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 b431fd746d80c2bb4b17073eab7b657e402a46c2..384d7ee41d4ebe09678d1b7dc44dcb051c07f5a1 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.arch" . }}" + 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.arch" . }}" + 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 23a83160707f3c95285aef34cae587e11e4ed898..21eb12091636025b541d387184ee26488ae84832 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.arch" . }}" + 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 51bf4ce0845a1fd5b2ef35ac4f552a405a167081..8811da11f2e45cab132ff412bd08e6dd95e4f3de 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.arch" . }}" + 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.arch" . }}" + 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.arch" . }}" + 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 5981c643be192ebdf1497c061aff0cda5f5f2bf9..b940b9e414812c8296a68c73a526d8833b88dc02 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.arch" . }}" + 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 621b6d3a9e383c1c2a7fe7d5b1eedb2f34be934d..a5530e4f39448a0cb3898105d11546dcb3dd6062 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.arch" . }}" + 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 abfa3a0b0064b83bd5c20ecae30f75badbeeccbf..dc942b7e51144ed7e0758ddbce5717e1561bf855 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.arch" . }}" + 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 cc702cd7de717d8859409a3ea08370f5d91eda1d..f067725ef84fdb3fc65d16ca690e8fc0946b3517 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.arch" . }}" + 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 73fd641c8e602141094f5ca3627896e0f46b334b..2b34b4392f13e1b9eb83f26157ee2ab6f6d805d5 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.arch" . }}" + 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 aea7b30d4ac3a465c1472de2d3b7cc786ecedd29..464c718fdc36b62f04193600b23091d8358b8147 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.arch" . }}" + 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 2313e9218e9dca162c56473581c0dc960a3d9ffb..c7118486da77222275d4a314838fd35597eca510 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.arch" . }}" + 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.arch" . }}" + 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 432100e2e96fed3da67dab99fb91d4b32a8e5268..2b253a81ca02a41918bbd3cb0db22a6083e11b7a 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.arch" . }}" + 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: diff --git a/values-operator.yaml b/values-operator.yaml index 022aa54f4f20356269c1ced5a6575b8a7369c056..3cce11d6a0f81f78644df7210f4e1550e7d9f023 100644 --- a/values-operator.yaml +++ b/values-operator.yaml @@ -1,10 +1,5 @@ global: hub: registry.cn-qingdao.aliyuncs.com/wod imagePullPolicy: "IfNotPresent" - arch: amd64 - host: wodcloud.local - -persistence: - persistentVolumeClaim: - registry: - size: 50Gi \ No newline at end of file + imageArch: amd64 + host: wodcloud.local \ No newline at end of file diff --git a/values.yaml b/values.yaml index a8e0e0eed5e42faf3daba535347e37e250a4d8ec..f96a4b69c75eb891723238650ecb3b34a6d71d74 100644 --- a/values.yaml +++ b/values.yaml @@ -201,7 +201,7 @@ persistence: storageClass: "hostpath" subPath: "" accessMode: ReadWriteOnce - size: 500Gi + size: 5Gi chartmuseum: existingClaim: "" storageClass: "hostpath"