add repo to image registry patch

Signed-off-by: Puja Abbassi <[email protected]>
giantswarm · Dec 18, 2024 · cc458bb · cc458bb
1 parent 5b80367
commit cc458bb
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/diffs/helm__envoy-gateway__templates___helpers.tpl.patch b/diffs/helm__envoy-gateway__templates___helpers.tpl.patch
@@ -1,5 +1,5 @@
 diff --git a/vendor/gateway-helm/templates/_helpers.tpl b/helm/envoy-gateway/templates/_helpers.tpl
-index d9aefc2..d3bb56d 100644
+index d9aefc2..2645585 100644
 --- a/vendor/gateway-helm/templates/_helpers.tpl
 +++ b/helm/envoy-gateway/templates/_helpers.tpl
 @@ -40,6 +40,7 @@ helm.sh/chart: {{ include "eg.chart" . }}
@@ -17,7 +17,7 @@ index d9aefc2..d3bb56d 100644
 -{{- if .Values.deployment.envoyGateway.image.repository }}
 -{{- .Values.deployment.envoyGateway.image.repository }}:{{ .Values.deployment.envoyGateway.image.tag | default .Values.global.images.envoyGateway.tag | default .Chart.AppVersion }}
 +{{- if .Values.image.registry }}
-+{{- .Values.image.registry }}/{{- .Values.deployment.envoyGateway.image.name }}:{{ .Values.deployment.envoyGateway.image.tag | default .Chart.AppVersion }}
++{{- .Values.image.registry }}/{{- .Values.image.repository }}/{{- .Values.deployment.envoyGateway.image.name }}:{{ .Values.deployment.envoyGateway.image.tag | default .Chart.AppVersion }}
  {{- else if .Values.global.images.envoyGateway.image }}
  {{- .Values.global.images.envoyGateway.image }}
  {{- else }}
diff --git a/diffs/helm__envoy-gateway__values.yaml.patch b/diffs/helm__envoy-gateway__values.yaml.patch
@@ -1,13 +1,14 @@
 diff --git a/vendor/gateway-helm/values.yaml b/helm/envoy-gateway/values.yaml
-index 56cf308..810dabd 100644
+index 56cf308..7979274 100644
 --- a/vendor/gateway-helm/values.yaml
 +++ b/helm/envoy-gateway/values.yaml
-@@ -22,11 +22,14 @@ podDisruptionBudget:
+@@ -22,11 +22,15 @@ podDisruptionBudget:
    minAvailable: 0
    # maxUnavailable: 1
 
 +image:
 +  registry: gsoci.azurecr.io
++  repository: giantswarm
 +
  deployment:
    envoyGateway:
@@ -19,15 +20,15 @@ index 56cf308..810dabd 100644
      imagePullPolicy: ""
      imagePullSecrets: []
      resources:
-@@ -44,6 +47,7 @@ deployment:
+@@ -44,6 +48,7 @@ deployment:
        runAsNonRoot: true
        runAsGroup: 65532
        runAsUser: 65532
 +      readOnlyRootFilesystem: true
        seccompProfile:
          type: RuntimeDefault
    ports:
-@@ -88,11 +92,15 @@ createNamespace: false
+@@ -88,11 +93,15 @@ createNamespace: false
 
  kubernetesClusterDomain: cluster.local
 

diff --git a/helm/envoy-gateway/README.md b/helm/envoy-gateway/README.md
@@ -115,6 +115,7 @@ To uninstall the chart:
 | global.images.ratelimit.pullPolicy | string | `"IfNotPresent"` |  |
 | global.images.ratelimit.pullSecrets | list | `[]` |  |
 | image.registry | string | `"gsoci.azurecr.io"` |  |
+| image.repository | string | `"giantswarm"` |  |
 | kubernetesClusterDomain | string | `"cluster.local"` |  |
 | podDisruptionBudget.minAvailable | int | `0` |  |
 | service.annotations | object | `{}` |  |

diff --git a/helm/envoy-gateway/templates/_helpers.tpl b/helm/envoy-gateway/templates/_helpers.tpl
@@ -67,7 +67,7 @@ The name of the Envoy Gateway image.
 */}}
 {{- define "eg.image" -}}
 {{- if .Values.image.registry }}
-{{- .Values.image.registry }}/{{- .Values.deployment.envoyGateway.image.name }}:{{ .Values.deployment.envoyGateway.image.tag | default .Chart.AppVersion }}
+{{- .Values.image.registry }}/{{- .Values.image.repository }}/{{- .Values.deployment.envoyGateway.image.name }}:{{ .Values.deployment.envoyGateway.image.tag | default .Chart.AppVersion }}
 {{- else if .Values.global.images.envoyGateway.image }}
 {{- .Values.global.images.envoyGateway.image }}
 {{- else }}

diff --git a/helm/envoy-gateway/values.yaml b/helm/envoy-gateway/values.yaml
@@ -24,6 +24,7 @@ podDisruptionBudget:
 
 image:
   registry: gsoci.azurecr.io
+  repository: giantswarm
 
 deployment:
   envoyGateway:

diff --git a/sync/patches/image-registry/000-image-registry.patch b/sync/patches/image-registry/000-image-registry.patch
@@ -9,7 +9,7 @@ index d9aefc2..cdadc41 100644
 -{{- if .Values.deployment.envoyGateway.image.repository }}
 -{{- .Values.deployment.envoyGateway.image.repository }}:{{ .Values.deployment.envoyGateway.image.tag | default .Values.global.images.envoyGateway.tag | default .Chart.AppVersion }}
 +{{- if .Values.image.registry }}
-+{{- .Values.image.registry }}/{{- .Values.deployment.envoyGateway.image.name }}:{{ .Values.deployment.envoyGateway.image.tag | default .Chart.AppVersion }}
++{{- .Values.image.registry }}/{{- .Values.image.repository }}/{{- .Values.deployment.envoyGateway.image.name }}:{{ .Values.deployment.envoyGateway.image.tag | default .Chart.AppVersion }}
  {{- else if .Values.global.images.envoyGateway.image }}
  {{- .Values.global.images.envoyGateway.image }}
  {{- else }}
diff --git a/sync/patches/values/values.yaml b/sync/patches/values/values.yaml
@@ -24,6 +24,7 @@ podDisruptionBudget:
 
 image:
   registry: gsoci.azurecr.io
+  repository: giantswarm
 
 deployment:
   envoyGateway: