diff --git a/helm-chart/templates/adservice.yaml b/helm-chart/templates/adservice.yaml index 887f0ec23b3..c065eca57fe 100644 --- a/helm-chart/templates/adservice.yaml +++ b/helm-chart/templates/adservice.yaml @@ -60,6 +60,10 @@ spec: seccompProfile: type: {{ .Values.seccompProfile.type }} {{- end }} + {{- if .Values.images.imagePullSecrets }} + imagePullSecrets: + {{- toYaml .Values.images.imagePullSecrets | nindent 8 }} + {{- end }} containers: - name: server securityContext: diff --git a/helm-chart/templates/cartservice.yaml b/helm-chart/templates/cartservice.yaml index b4e3f9fa9c4..08f15d7dca9 100644 --- a/helm-chart/templates/cartservice.yaml +++ b/helm-chart/templates/cartservice.yaml @@ -64,6 +64,10 @@ spec: seccompProfile: type: {{ .Values.seccompProfile.type }} {{- end }} + {{- if .Values.images.imagePullSecrets }} + imagePullSecrets: + {{- toYaml .Values.images.imagePullSecrets | nindent 8 }} + {{- end }} containers: - name: server securityContext: @@ -242,6 +246,10 @@ spec: seccompProfile: type: {{ .Values.seccompProfile.type }} {{- end }} + {{- if .Values.images.imagePullSecrets }} + imagePullSecrets: + {{- toYaml .Values.images.imagePullSecrets | nindent 8 }} + {{- end }} containers: - name: redis securityContext: @@ -253,6 +261,8 @@ spec: readOnlyRootFilesystem: true {{- if .Values.cartDatabase.inClusterRedis.publicRepository }} image: redis:alpine@sha256:c35af3bbcef51a62c8bae5a9a563c6f1b60d7ebaea4cb5a3ccbcc157580ae098 + {{- else if .Values.cartDatabase.inClusterRedis.imageRepository }} + image: {{ .Values.cartDatabase.inClusterRedis.imageRepository }}/redis:alpine {{- else }} image: {{ .Values.images.repository }}/redis:alpine {{- end }} diff --git a/helm-chart/templates/checkoutservice.yaml b/helm-chart/templates/checkoutservice.yaml index 127ae0bfd55..5d4f23619cb 100644 --- a/helm-chart/templates/checkoutservice.yaml +++ b/helm-chart/templates/checkoutservice.yaml @@ -59,6 +59,10 @@ spec: seccompProfile: type: {{ .Values.seccompProfile.type }} {{- end }} + {{- if .Values.images.imagePullSecrets }} + imagePullSecrets: + {{- toYaml .Values.images.imagePullSecrets | nindent 8 }} + {{- end }} containers: - name: server securityContext: diff --git a/helm-chart/templates/currencyservice.yaml b/helm-chart/templates/currencyservice.yaml index 2681cc8a965..62c0533d347 100644 --- a/helm-chart/templates/currencyservice.yaml +++ b/helm-chart/templates/currencyservice.yaml @@ -60,6 +60,10 @@ spec: seccompProfile: type: {{ .Values.seccompProfile.type }} {{- end }} + {{- if .Values.images.imagePullSecrets }} + imagePullSecrets: + {{- toYaml .Values.images.imagePullSecrets | nindent 8 }} + {{- end }} containers: - name: server securityContext: diff --git a/helm-chart/templates/emailservice.yaml b/helm-chart/templates/emailservice.yaml index d3b70d98882..9ea071770e1 100644 --- a/helm-chart/templates/emailservice.yaml +++ b/helm-chart/templates/emailservice.yaml @@ -60,6 +60,10 @@ spec: seccompProfile: type: {{ .Values.seccompProfile.type }} {{- end }} + {{- if .Values.images.imagePullSecrets }} + imagePullSecrets: + {{- toYaml .Values.images.imagePullSecrets | nindent 8 }} + {{- end }} containers: - name: server securityContext: diff --git a/helm-chart/templates/frontend.yaml b/helm-chart/templates/frontend.yaml index 24ae2b8d9da..9a090c2e50b 100644 --- a/helm-chart/templates/frontend.yaml +++ b/helm-chart/templates/frontend.yaml @@ -61,6 +61,10 @@ spec: seccompProfile: type: {{ .Values.seccompProfile.type }} {{- end }} + {{- if .Values.images.imagePullSecrets }} + imagePullSecrets: + {{- toYaml .Values.images.imagePullSecrets | nindent 8 }} + {{- end }} containers: - name: server securityContext: diff --git a/helm-chart/templates/loadgenerator.yaml b/helm-chart/templates/loadgenerator.yaml index cda2df112b7..5219df39e4d 100644 --- a/helm-chart/templates/loadgenerator.yaml +++ b/helm-chart/templates/loadgenerator.yaml @@ -64,6 +64,10 @@ spec: seccompProfile: type: {{ .Values.seccompProfile.type }} {{- end }} + {{- if .Values.images.imagePullSecrets }} + imagePullSecrets: + {{- toYaml .Values.images.imagePullSecrets | nindent 8 }} + {{- end }} {{- if .Values.loadGenerator.checkFrontendInitContainer }} initContainers: - command: diff --git a/helm-chart/templates/opentelemetry-collector.yaml b/helm-chart/templates/opentelemetry-collector.yaml index 4c26d0b9a3a..d789eedca3a 100644 --- a/helm-chart/templates/opentelemetry-collector.yaml +++ b/helm-chart/templates/opentelemetry-collector.yaml @@ -56,6 +56,10 @@ spec: seccompProfile: type: {{ .Values.seccompProfile.type }} {{- end }} + {{- if .Values.images.imagePullSecrets }} + imagePullSecrets: + {{- toYaml .Values.images.imagePullSecrets | nindent 8 }} + {{- end }} {{- if eq .Values.opentelemetryCollector.projectId "PROJECT_ID" }} initContainers: # Init container retrieves the current cloud project id from the metadata server @@ -136,7 +140,7 @@ data: collector-gateway-config-template.yaml: | receivers: otlp: - protocols: + protocols: grpc: processors: exporters: diff --git a/helm-chart/templates/paymentservice.yaml b/helm-chart/templates/paymentservice.yaml index fc2f5094340..360a2591912 100644 --- a/helm-chart/templates/paymentservice.yaml +++ b/helm-chart/templates/paymentservice.yaml @@ -58,6 +58,10 @@ spec: seccompProfile: type: {{ .Values.seccompProfile.type }} {{- end }} + {{- if .Values.images.imagePullSecrets }} + imagePullSecrets: + {{- toYaml .Values.images.imagePullSecrets | nindent 8 }} + {{- end }} containers: - name: server securityContext: diff --git a/helm-chart/templates/productcatalogservice.yaml b/helm-chart/templates/productcatalogservice.yaml index 856a6555170..10d803952cc 100644 --- a/helm-chart/templates/productcatalogservice.yaml +++ b/helm-chart/templates/productcatalogservice.yaml @@ -60,6 +60,10 @@ spec: seccompProfile: type: {{ .Values.seccompProfile.type }} {{- end }} + {{- if .Values.images.imagePullSecrets }} + imagePullSecrets: + {{- toYaml .Values.images.imagePullSecrets | nindent 8 }} + {{- end }} containers: - name: server securityContext: diff --git a/helm-chart/templates/recommendationservice.yaml b/helm-chart/templates/recommendationservice.yaml index 1ecf2a579f1..c4387ab8242 100644 --- a/helm-chart/templates/recommendationservice.yaml +++ b/helm-chart/templates/recommendationservice.yaml @@ -60,6 +60,10 @@ spec: seccompProfile: type: {{ .Values.seccompProfile.type }} {{- end }} + {{- if .Values.images.imagePullSecrets }} + imagePullSecrets: + {{- toYaml .Values.images.imagePullSecrets | nindent 8 }} + {{- end }} containers: - name: server securityContext: diff --git a/helm-chart/templates/shippingservice.yaml b/helm-chart/templates/shippingservice.yaml index ec63b7b5372..dd4e27fe7ee 100644 --- a/helm-chart/templates/shippingservice.yaml +++ b/helm-chart/templates/shippingservice.yaml @@ -59,6 +59,10 @@ spec: seccompProfile: type: {{ .Values.seccompProfile.type }} {{- end }} + {{- if .Values.images.imagePullSecrets }} + imagePullSecrets: + {{- toYaml .Values.images.imagePullSecrets | nindent 8 }} + {{- end }} containers: - name: server securityContext: diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index d460498cf5d..e3a3b815723 100644 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -20,6 +20,7 @@ images: repository: us-central1-docker.pkg.dev/google-samples/microservices-demo # Overrides the image tag whose default is the chart appVersion. tag: "" + imagePullSecrets: [] serviceAccounts: # Specifies whether service accounts should be created. @@ -206,6 +207,7 @@ cartDatabase: name: redis-cart # Uses the public redis image from Docker Hub, otherwise will use the images.repository. publicRepository: true + imageRepository: '' externalRedisTlsOrigination: enable: false name: exernal-redis-tls-origination