From e2d28cf8388484bf7b07249c52e555533cdd434a Mon Sep 17 00:00:00 2001 From: mgarciaLKS Date: Fri, 2 Aug 2024 11:15:55 +0200 Subject: [PATCH 1/6] feat: add imagePullScrets --- .../portal/templates/deployment-backend-administration.yaml | 6 ++++++ .../portal/templates/deployment-backend-appmarketplace.yaml | 6 ++++++ .../portal/templates/deployment-backend-notification.yaml | 6 ++++++ .../portal/templates/deployment-backend-registration.yaml | 6 ++++++ charts/portal/templates/deployment-backend-services.yaml | 6 ++++++ charts/portal/templates/deployment-frontend-assets.yaml | 6 ++++++ charts/portal/templates/deployment-frontend-portal.yaml | 6 ++++++ .../portal/templates/deployment-frontend-registration.yaml | 6 ++++++ 8 files changed, 48 insertions(+) diff --git a/charts/portal/templates/deployment-backend-administration.yaml b/charts/portal/templates/deployment-backend-administration.yaml index ea0055de8..8216d8b2a 100644 --- a/charts/portal/templates/deployment-backend-administration.yaml +++ b/charts/portal/templates/deployment-backend-administration.yaml @@ -38,6 +38,12 @@ spec: app: {{ include "portal.fullname" . }}-{{ .Values.backend.administration.name }} {{- include "portal.selectorLabels" . | nindent 8 }} spec: + {{- with .Values.backend.administration.image.imagePullSecrets }} + imagePullSecrets: + {{- range . }} + - name: {{ .name }} + {{- end }} + {{- end }} containers: - name: {{ include "portal.fullname" . }}-{{ .Values.backend.administration.name }} securityContext: diff --git a/charts/portal/templates/deployment-backend-appmarketplace.yaml b/charts/portal/templates/deployment-backend-appmarketplace.yaml index 1316c6f59..0f12f9a57 100644 --- a/charts/portal/templates/deployment-backend-appmarketplace.yaml +++ b/charts/portal/templates/deployment-backend-appmarketplace.yaml @@ -38,6 +38,12 @@ spec: app: {{ include "portal.fullname" . }}-{{ .Values.backend.appmarketplace.name }} {{- include "portal.selectorLabels" . | nindent 8 }} spec: + {{- with .Values.backend.appmarketplace.image.imagePullSecrets }} + imagePullSecrets: + {{- range . }} + - name: {{ .name }} + {{- end }} + {{- end }} containers: - name: {{ include "portal.fullname" . }}-{{ .Values.backend.appmarketplace.name }} securityContext: diff --git a/charts/portal/templates/deployment-backend-notification.yaml b/charts/portal/templates/deployment-backend-notification.yaml index 0d70e6ecc..49ea2e559 100644 --- a/charts/portal/templates/deployment-backend-notification.yaml +++ b/charts/portal/templates/deployment-backend-notification.yaml @@ -38,6 +38,12 @@ spec: app: {{ include "portal.fullname" . }}-{{ .Values.backend.notification.name }} {{- include "portal.selectorLabels" . | nindent 8 }} spec: + {{- with .Values.backend.notification.image.imagePullSecrets }} + imagePullSecrets: + {{- range . }} + - name: {{ .name }} + {{- end }} + {{- end }} containers: - name: {{ include "portal.fullname" . }}-{{ .Values.backend.notification.name }} securityContext: diff --git a/charts/portal/templates/deployment-backend-registration.yaml b/charts/portal/templates/deployment-backend-registration.yaml index 51b5eeb9b..eb15954f5 100644 --- a/charts/portal/templates/deployment-backend-registration.yaml +++ b/charts/portal/templates/deployment-backend-registration.yaml @@ -38,6 +38,12 @@ spec: app: {{ include "portal.fullname" . }}-{{ .Values.backend.registration.name }} {{- include "portal.selectorLabels" . | nindent 8 }} spec: + {{- with .Values.backend.registration.image.imagePullSecrets }} + imagePullSecrets: + {{- range . }} + - name: {{ .name }} + {{- end }} + {{- end }} containers: - name: {{ include "portal.fullname" . }}-{{ .Values.backend.registration.name }} securityContext: diff --git a/charts/portal/templates/deployment-backend-services.yaml b/charts/portal/templates/deployment-backend-services.yaml index 283013a2a..a44da0a95 100644 --- a/charts/portal/templates/deployment-backend-services.yaml +++ b/charts/portal/templates/deployment-backend-services.yaml @@ -38,6 +38,12 @@ spec: app: {{ include "portal.fullname" . }}-{{ .Values.backend.services.name }} {{- include "portal.selectorLabels" . | nindent 8 }} spec: + {{- with .Values.backend.services.image.imagePullSecrets }} + imagePullSecrets: + {{- range . }} + - name: {{ .name }} + {{- end }} + {{- end }} containers: - name: {{ include "portal.fullname" . }}-{{ .Values.backend.services.name }} securityContext: diff --git a/charts/portal/templates/deployment-frontend-assets.yaml b/charts/portal/templates/deployment-frontend-assets.yaml index 02700a16f..5549f1719 100644 --- a/charts/portal/templates/deployment-frontend-assets.yaml +++ b/charts/portal/templates/deployment-frontend-assets.yaml @@ -38,6 +38,12 @@ spec: app: {{ include "portal.fullname" . }}-{{ .Values.frontend.assets.name }} {{- include "portal.selectorLabels" . | nindent 8 }} spec: + {{- with .Values.frontend.assets.image.imagePullSecrets }} + imagePullSecrets: + {{- range . }} + - name: {{ .name }} + {{- end }} + {{- end }} containers: - name: {{ include "portal.fullname" . }}-{{ .Values.frontend.assets.name }} securityContext: diff --git a/charts/portal/templates/deployment-frontend-portal.yaml b/charts/portal/templates/deployment-frontend-portal.yaml index 7d3219baa..eb644f305 100644 --- a/charts/portal/templates/deployment-frontend-portal.yaml +++ b/charts/portal/templates/deployment-frontend-portal.yaml @@ -38,6 +38,12 @@ spec: app: {{ include "portal.fullname" . }}-{{ .Values.frontend.portal.name }} {{- include "portal.selectorLabels" . | nindent 8 }} spec: + {{- with .Values.frontend.portal.image.imagePullSecrets }} + imagePullSecrets: + {{- range . }} + - name: {{ .name }} + {{- end }} + {{- end }} containers: - name: {{ include "portal.fullname" . }}-{{ .Values.frontend.portal.name }} securityContext: diff --git a/charts/portal/templates/deployment-frontend-registration.yaml b/charts/portal/templates/deployment-frontend-registration.yaml index 565a08790..a7414cc72 100644 --- a/charts/portal/templates/deployment-frontend-registration.yaml +++ b/charts/portal/templates/deployment-frontend-registration.yaml @@ -38,6 +38,12 @@ spec: app: {{ include "portal.fullname" . }}-{{ .Values.frontend.registration.name }} {{- include "portal.selectorLabels" . | nindent 8 }} spec: + {{- with .Values.frontend.registration.image.imagePullSecrets }} + imagePullSecrets: + {{- range . }} + - name: {{ .name }} + {{- end }} + {{- end }} containers: - name: {{ include "portal.fullname" . }}-{{ .Values.frontend.registration.name }} securityContext: From 5117fed8a317e699d5642dc3cc9ddf5631f0e08b Mon Sep 17 00:00:00 2001 From: mgarciaLKS Date: Fri, 2 Aug 2024 15:33:42 +0200 Subject: [PATCH 2/6] Update values.yaml with comments --- charts/portal/values.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index 497710757..2adb94273 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -128,6 +128,8 @@ frontend: name: "docker.io/tractusx/portal-frontend" portaltag: 37cd674aa1324f0fbd9c7662b5e43fde89e1a748 pullPolicy: "IfNotPresent" + # -- Pull secrets for private docker registry + imagePullSecrets: [] # -- We recommend to review the default resource limits as this should a conscious choice. resources: requests: @@ -143,6 +145,8 @@ frontend: name: "docker.io/tractusx/portal-frontend-registration" registrationtag: 064a96674c239433e85d2599b17a95c3434e9bb9 pullPolicy: "IfNotPresent" + # -- Pull secrets for private docker registry + imagePullSecrets: [] # -- We recommend to review the default resource limits as this should a conscious choice. resources: requests: @@ -157,6 +161,8 @@ frontend: name: "docker.io/tractusx/portal-assets" assetstag: 39ec46dcb883080c5d0ac94984630ec0409929c7 pullPolicy: "IfNotPresent" + # -- Pull secrets for private docker registry + imagePullSecrets: [] # -- We recommend to review the default resource limits as this should a conscious choice. resources: requests: @@ -293,6 +299,8 @@ backend: name: "docker.io/tractusx/portal-registration-service" registrationservicetag: d3dd7919c03d815bad3b10e8ddb4c306e549e92a pullPolicy: "IfNotPresent" + # -- Pull secrets for private docker registry + imagePullSecrets: [] # -- We recommend to review the default resource limits as this should a conscious choice. resources: requests: @@ -342,6 +350,8 @@ backend: name: "docker.io/tractusx/portal-administration-service" administrationservicetag: 7825b1be9caf62790002ffc522ba1b1d520db431 pullPolicy: "IfNotPresent" + # -- Pull secrets for private docker registry + imagePullSecrets: [] # -- We recommend to review the default resource limits as this should a conscious choice. resources: requests: @@ -460,6 +470,8 @@ backend: name: "docker.io/tractusx/portal-marketplace-app-service" appmarketplaceservicetag: d3dd7919c03d815bad3b10e8ddb4c306e549e92a pullPolicy: "IfNotPresent" + # -- Pull secrets for private docker registry + imagePullSecrets: [] # -- We recommend to review the default resource limits as this should a conscious choice. resources: requests: @@ -634,6 +646,8 @@ backend: name: "docker.io/tractusx/portal-notification-service" notificationservicetag: d3dd7919c03d815bad3b10e8ddb4c306e549e92a pullPolicy: "IfNotPresent" + # -- Pull secrets for private docker registry + imagePullSecrets: [] # -- We recommend to review the default resource limits as this should a conscious choice. resources: requests: @@ -661,6 +675,8 @@ backend: name: "docker.io/tractusx/portal-services-service" servicesservicetag: d3dd7919c03d815bad3b10e8ddb4c306e549e92a pullPolicy: "IfNotPresent" + # -- Pull secrets for private docker registry + imagePullSecrets: [] # -- We recommend to review the default resource limits as this should a conscious choice. resources: requests: From e73a7df5a5e889f63f615c44bbe255838b82d968 Mon Sep 17 00:00:00 2001 From: mgarciaLKS Date: Mon, 5 Aug 2024 12:18:27 +0200 Subject: [PATCH 3/6] Request changes --- .../deployment-backend-administration.yaml | 4 +--- .../deployment-backend-appmarketplace.yaml | 8 +++----- .../deployment-backend-notification.yaml | 8 +++----- .../deployment-backend-registration.yaml | 8 +++----- .../templates/deployment-backend-services.yaml | 8 +++----- .../templates/deployment-frontend-assets.yaml | 4 ++-- .../templates/deployment-frontend-portal.yaml | 4 ++-- .../deployment-frontend-registration.yaml | 4 ++-- charts/portal/values.yaml | 16 ++++++++-------- 9 files changed, 27 insertions(+), 37 deletions(-) diff --git a/charts/portal/templates/deployment-backend-administration.yaml b/charts/portal/templates/deployment-backend-administration.yaml index 8216d8b2a..a1ff24fa7 100644 --- a/charts/portal/templates/deployment-backend-administration.yaml +++ b/charts/portal/templates/deployment-backend-administration.yaml @@ -40,9 +40,7 @@ spec: spec: {{- with .Values.backend.administration.image.imagePullSecrets }} imagePullSecrets: - {{- range . }} - - name: {{ .name }} - {{- end }} + {{- toYaml . | nindent 8 }} {{- end }} containers: - name: {{ include "portal.fullname" . }}-{{ .Values.backend.administration.name }} diff --git a/charts/portal/templates/deployment-backend-appmarketplace.yaml b/charts/portal/templates/deployment-backend-appmarketplace.yaml index 0f12f9a57..75abf1be8 100644 --- a/charts/portal/templates/deployment-backend-appmarketplace.yaml +++ b/charts/portal/templates/deployment-backend-appmarketplace.yaml @@ -38,11 +38,9 @@ spec: app: {{ include "portal.fullname" . }}-{{ .Values.backend.appmarketplace.name }} {{- include "portal.selectorLabels" . | nindent 8 }} spec: - {{- with .Values.backend.appmarketplace.image.imagePullSecrets }} - imagePullSecrets: - {{- range . }} - - name: {{ .name }} - {{- end }} + {{- with .Values.backend.appmarketplace.image.pullSecrets }} + pullSecrets: + {{- toYaml . | nindent 8 }} {{- end }} containers: - name: {{ include "portal.fullname" . }}-{{ .Values.backend.appmarketplace.name }} diff --git a/charts/portal/templates/deployment-backend-notification.yaml b/charts/portal/templates/deployment-backend-notification.yaml index 49ea2e559..fcf8e5759 100644 --- a/charts/portal/templates/deployment-backend-notification.yaml +++ b/charts/portal/templates/deployment-backend-notification.yaml @@ -38,11 +38,9 @@ spec: app: {{ include "portal.fullname" . }}-{{ .Values.backend.notification.name }} {{- include "portal.selectorLabels" . | nindent 8 }} spec: - {{- with .Values.backend.notification.image.imagePullSecrets }} - imagePullSecrets: - {{- range . }} - - name: {{ .name }} - {{- end }} + {{- with .Values.backend.notification.image.pullSecrets }} + pullSecrets: + {{- toYaml . | nindent 8 }} {{- end }} containers: - name: {{ include "portal.fullname" . }}-{{ .Values.backend.notification.name }} diff --git a/charts/portal/templates/deployment-backend-registration.yaml b/charts/portal/templates/deployment-backend-registration.yaml index eb15954f5..2ad26d17a 100644 --- a/charts/portal/templates/deployment-backend-registration.yaml +++ b/charts/portal/templates/deployment-backend-registration.yaml @@ -38,11 +38,9 @@ spec: app: {{ include "portal.fullname" . }}-{{ .Values.backend.registration.name }} {{- include "portal.selectorLabels" . | nindent 8 }} spec: - {{- with .Values.backend.registration.image.imagePullSecrets }} - imagePullSecrets: - {{- range . }} - - name: {{ .name }} - {{- end }} + {{- with .Values.backend.registration.image.pullSecrets }} + pullSecrets: + {{- toYaml . | nindent 8 }} {{- end }} containers: - name: {{ include "portal.fullname" . }}-{{ .Values.backend.registration.name }} diff --git a/charts/portal/templates/deployment-backend-services.yaml b/charts/portal/templates/deployment-backend-services.yaml index a44da0a95..2640252f6 100644 --- a/charts/portal/templates/deployment-backend-services.yaml +++ b/charts/portal/templates/deployment-backend-services.yaml @@ -38,11 +38,9 @@ spec: app: {{ include "portal.fullname" . }}-{{ .Values.backend.services.name }} {{- include "portal.selectorLabels" . | nindent 8 }} spec: - {{- with .Values.backend.services.image.imagePullSecrets }} - imagePullSecrets: - {{- range . }} - - name: {{ .name }} - {{- end }} + {{- with .Values.backend.services.image.pullSecrets }} + pullSecrets: + {{- toYaml . | nindent 8 }} {{- end }} containers: - name: {{ include "portal.fullname" . }}-{{ .Values.backend.services.name }} diff --git a/charts/portal/templates/deployment-frontend-assets.yaml b/charts/portal/templates/deployment-frontend-assets.yaml index 5549f1719..2db3c56c4 100644 --- a/charts/portal/templates/deployment-frontend-assets.yaml +++ b/charts/portal/templates/deployment-frontend-assets.yaml @@ -38,8 +38,8 @@ spec: app: {{ include "portal.fullname" . }}-{{ .Values.frontend.assets.name }} {{- include "portal.selectorLabels" . | nindent 8 }} spec: - {{- with .Values.frontend.assets.image.imagePullSecrets }} - imagePullSecrets: + {{- with .Values.frontend.assets.image.pullSecrets }} + pullSecrets: {{- range . }} - name: {{ .name }} {{- end }} diff --git a/charts/portal/templates/deployment-frontend-portal.yaml b/charts/portal/templates/deployment-frontend-portal.yaml index eb644f305..830c2947a 100644 --- a/charts/portal/templates/deployment-frontend-portal.yaml +++ b/charts/portal/templates/deployment-frontend-portal.yaml @@ -38,8 +38,8 @@ spec: app: {{ include "portal.fullname" . }}-{{ .Values.frontend.portal.name }} {{- include "portal.selectorLabels" . | nindent 8 }} spec: - {{- with .Values.frontend.portal.image.imagePullSecrets }} - imagePullSecrets: + {{- with .Values.frontend.portal.image.pullSecrets }} + pullSecrets: {{- range . }} - name: {{ .name }} {{- end }} diff --git a/charts/portal/templates/deployment-frontend-registration.yaml b/charts/portal/templates/deployment-frontend-registration.yaml index a7414cc72..364e1a266 100644 --- a/charts/portal/templates/deployment-frontend-registration.yaml +++ b/charts/portal/templates/deployment-frontend-registration.yaml @@ -38,8 +38,8 @@ spec: app: {{ include "portal.fullname" . }}-{{ .Values.frontend.registration.name }} {{- include "portal.selectorLabels" . | nindent 8 }} spec: - {{- with .Values.frontend.registration.image.imagePullSecrets }} - imagePullSecrets: + {{- with .Values.frontend.registration.image.pullSecrets }} + pullSecrets: {{- range . }} - name: {{ .name }} {{- end }} diff --git a/charts/portal/values.yaml b/charts/portal/values.yaml index fa48e907a..21c63a6eb 100644 --- a/charts/portal/values.yaml +++ b/charts/portal/values.yaml @@ -129,7 +129,7 @@ frontend: portaltag: 37cd674aa1324f0fbd9c7662b5e43fde89e1a748 pullPolicy: "IfNotPresent" # -- Pull secrets for private docker registry - imagePullSecrets: [] + pullSecrets: [] # -- We recommend to review the default resource limits as this should a conscious choice. resources: requests: @@ -146,7 +146,7 @@ frontend: registrationtag: 064a96674c239433e85d2599b17a95c3434e9bb9 pullPolicy: "IfNotPresent" # -- Pull secrets for private docker registry - imagePullSecrets: [] + pullSecrets: [] # -- We recommend to review the default resource limits as this should a conscious choice. resources: requests: @@ -162,7 +162,7 @@ frontend: assetstag: 587cfb232860b5dc221aefc60758dd81c00f53bb pullPolicy: "IfNotPresent" # -- Pull secrets for private docker registry - imagePullSecrets: [] + pullSecrets: [] # -- We recommend to review the default resource limits as this should a conscious choice. resources: requests: @@ -300,7 +300,7 @@ backend: registrationservicetag: 294eea9b508022239c633dc84022116b1ba3694d pullPolicy: "IfNotPresent" # -- Pull secrets for private docker registry - imagePullSecrets: [] + pullSecrets: [] # -- We recommend to review the default resource limits as this should a conscious choice. resources: requests: @@ -351,7 +351,7 @@ backend: administrationservicetag: 294eea9b508022239c633dc84022116b1ba3694d pullPolicy: "IfNotPresent" # -- Pull secrets for private docker registry - imagePullSecrets: [] + pullSecrets: [] # -- We recommend to review the default resource limits as this should a conscious choice. resources: requests: @@ -471,7 +471,7 @@ backend: appmarketplaceservicetag: 294eea9b508022239c633dc84022116b1ba3694d pullPolicy: "IfNotPresent" # -- Pull secrets for private docker registry - imagePullSecrets: [] + pullSecrets: [] # -- We recommend to review the default resource limits as this should a conscious choice. resources: requests: @@ -647,7 +647,7 @@ backend: notificationservicetag: 294eea9b508022239c633dc84022116b1ba3694d pullPolicy: "IfNotPresent" # -- Pull secrets for private docker registry - imagePullSecrets: [] + pullSecrets: [] # -- We recommend to review the default resource limits as this should a conscious choice. resources: requests: @@ -676,7 +676,7 @@ backend: servicesservicetag: 294eea9b508022239c633dc84022116b1ba3694d pullPolicy: "IfNotPresent" # -- Pull secrets for private docker registry - imagePullSecrets: [] + pullSecrets: [] # -- We recommend to review the default resource limits as this should a conscious choice. resources: requests: From 26f440872d1783422765dcb07d2fba040382eae5 Mon Sep 17 00:00:00 2001 From: mgarciaLKS Date: Mon, 5 Aug 2024 12:22:54 +0200 Subject: [PATCH 4/6] Request changes v2 --- .../portal/templates/deployment-backend-administration.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/portal/templates/deployment-backend-administration.yaml b/charts/portal/templates/deployment-backend-administration.yaml index a1ff24fa7..1ff10cb17 100644 --- a/charts/portal/templates/deployment-backend-administration.yaml +++ b/charts/portal/templates/deployment-backend-administration.yaml @@ -38,8 +38,8 @@ spec: app: {{ include "portal.fullname" . }}-{{ .Values.backend.administration.name }} {{- include "portal.selectorLabels" . | nindent 8 }} spec: - {{- with .Values.backend.administration.image.imagePullSecrets }} - imagePullSecrets: + {{- with .Values.backend.administration.image.pullSecrets }} + pullSecrets: {{- toYaml . | nindent 8 }} {{- end }} containers: From f103cef3bb26213e54e62af4b553c7fa0a491a4e Mon Sep 17 00:00:00 2001 From: mgarciaLKS Date: Mon, 5 Aug 2024 14:37:30 +0200 Subject: [PATCH 5/6] Fix Code Errors --- .../portal/templates/deployment-backend-administration.yaml | 2 +- .../portal/templates/deployment-backend-appmarketplace.yaml | 2 +- .../portal/templates/deployment-backend-notification.yaml | 2 +- charts/portal/templates/deployment-backend-services.yaml | 2 +- charts/portal/templates/deployment-frontend-assets.yaml | 6 ++---- charts/portal/templates/deployment-frontend-portal.yaml | 6 ++---- .../portal/templates/deployment-frontend-registration.yaml | 6 ++---- 7 files changed, 10 insertions(+), 16 deletions(-) diff --git a/charts/portal/templates/deployment-backend-administration.yaml b/charts/portal/templates/deployment-backend-administration.yaml index 1ff10cb17..5a3c7113c 100644 --- a/charts/portal/templates/deployment-backend-administration.yaml +++ b/charts/portal/templates/deployment-backend-administration.yaml @@ -39,7 +39,7 @@ spec: {{- include "portal.selectorLabels" . | nindent 8 }} spec: {{- with .Values.backend.administration.image.pullSecrets }} - pullSecrets: + imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} containers: diff --git a/charts/portal/templates/deployment-backend-appmarketplace.yaml b/charts/portal/templates/deployment-backend-appmarketplace.yaml index 75abf1be8..cb9180e0a 100644 --- a/charts/portal/templates/deployment-backend-appmarketplace.yaml +++ b/charts/portal/templates/deployment-backend-appmarketplace.yaml @@ -39,7 +39,7 @@ spec: {{- include "portal.selectorLabels" . | nindent 8 }} spec: {{- with .Values.backend.appmarketplace.image.pullSecrets }} - pullSecrets: + imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} containers: diff --git a/charts/portal/templates/deployment-backend-notification.yaml b/charts/portal/templates/deployment-backend-notification.yaml index fcf8e5759..6ef30721d 100644 --- a/charts/portal/templates/deployment-backend-notification.yaml +++ b/charts/portal/templates/deployment-backend-notification.yaml @@ -39,7 +39,7 @@ spec: {{- include "portal.selectorLabels" . | nindent 8 }} spec: {{- with .Values.backend.notification.image.pullSecrets }} - pullSecrets: + imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} containers: diff --git a/charts/portal/templates/deployment-backend-services.yaml b/charts/portal/templates/deployment-backend-services.yaml index 2640252f6..add08d127 100644 --- a/charts/portal/templates/deployment-backend-services.yaml +++ b/charts/portal/templates/deployment-backend-services.yaml @@ -39,7 +39,7 @@ spec: {{- include "portal.selectorLabels" . | nindent 8 }} spec: {{- with .Values.backend.services.image.pullSecrets }} - pullSecrets: + imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} containers: diff --git a/charts/portal/templates/deployment-frontend-assets.yaml b/charts/portal/templates/deployment-frontend-assets.yaml index 2db3c56c4..34810a43c 100644 --- a/charts/portal/templates/deployment-frontend-assets.yaml +++ b/charts/portal/templates/deployment-frontend-assets.yaml @@ -39,10 +39,8 @@ spec: {{- include "portal.selectorLabels" . | nindent 8 }} spec: {{- with .Values.frontend.assets.image.pullSecrets }} - pullSecrets: - {{- range . }} - - name: {{ .name }} - {{- end }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} {{- end }} containers: - name: {{ include "portal.fullname" . }}-{{ .Values.frontend.assets.name }} diff --git a/charts/portal/templates/deployment-frontend-portal.yaml b/charts/portal/templates/deployment-frontend-portal.yaml index 830c2947a..579ebc25d 100644 --- a/charts/portal/templates/deployment-frontend-portal.yaml +++ b/charts/portal/templates/deployment-frontend-portal.yaml @@ -39,10 +39,8 @@ spec: {{- include "portal.selectorLabels" . | nindent 8 }} spec: {{- with .Values.frontend.portal.image.pullSecrets }} - pullSecrets: - {{- range . }} - - name: {{ .name }} - {{- end }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} {{- end }} containers: - name: {{ include "portal.fullname" . }}-{{ .Values.frontend.portal.name }} diff --git a/charts/portal/templates/deployment-frontend-registration.yaml b/charts/portal/templates/deployment-frontend-registration.yaml index 364e1a266..d92b15fb2 100644 --- a/charts/portal/templates/deployment-frontend-registration.yaml +++ b/charts/portal/templates/deployment-frontend-registration.yaml @@ -39,10 +39,8 @@ spec: {{- include "portal.selectorLabels" . | nindent 8 }} spec: {{- with .Values.frontend.registration.image.pullSecrets }} - pullSecrets: - {{- range . }} - - name: {{ .name }} - {{- end }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} {{- end }} containers: - name: {{ include "portal.fullname" . }}-{{ .Values.frontend.registration.name }} From 80e58a8b1193776b9153865881eba66432295374 Mon Sep 17 00:00:00 2001 From: mgarciaLKS Date: Mon, 5 Aug 2024 14:49:20 +0200 Subject: [PATCH 6/6] Fix K8s code error --- charts/portal/templates/deployment-backend-registration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/portal/templates/deployment-backend-registration.yaml b/charts/portal/templates/deployment-backend-registration.yaml index 2ad26d17a..3450712c4 100644 --- a/charts/portal/templates/deployment-backend-registration.yaml +++ b/charts/portal/templates/deployment-backend-registration.yaml @@ -39,7 +39,7 @@ spec: {{- include "portal.selectorLabels" . | nindent 8 }} spec: {{- with .Values.backend.registration.image.pullSecrets }} - pullSecrets: + imagePullSecrets: {{- toYaml . | nindent 8 }} {{- end }} containers: