feat: Allow using other providers by bkochendorfer · Pull Request #186 · mozilla/helm-charts

bkochendorfer · 2026-03-12T14:04:22Z

Description

Currently we produce annotations, negs, and other items specifically tied to GKE. This PR is a first pass at adding conditionals around these GKE specific implementations.

As our next target is likely to be an on-prem we introduce another values file to render the charts and test them without these specific implementations.

As we gather more information about what we need to support for on-prem or other providers we can add specific cases for those options.

References

MZCLD-2405

bkochendorfer · 2026-03-12T14:05:14Z

mozcloud-gateway/library/templates/_gateway.yaml

  {{- end }}
 spec:
  gatewayClassName: {{ $gateway.className }}
+  {{- if $gateway.addresses }}


addresses is part of the standard Gateway API spec https://gateway-api.sigs.k8s.io/reference/spec/#gatewayspecaddress but it is optional. This is not a provider specific change rather it does not render addresses if none are provided.

bkochendorfer · 2026-03-12T14:06:36Z

mozcloud/application/templates/gateway/gateway.yaml

        - {{ $cert }}
        {{- end }}
-      type: certmap
+      type: {{ $gatewayConfig.tlsType }}


certmap is GKE specific

bkochendorfer · 2026-03-12T14:09:39Z

mozcloud/application/templates/gateway/gateway.yaml

    component: gateway
    type: {{ $gatewayConfig.type }}
    className: {{ $gatewayConfig.className }}
    addresses:


I wonder if we want to do the same addresses optional if here.

bkochendorfer · 2026-03-12T14:11:06Z

mozcloud/application/templates/serviceaccount/serviceaccount.yaml

    {{- $labels.labels | toYaml | nindent 4 }}
  {{- $params = dict "type" "serviceAccount" }}
  {{- $annotations := include "mozcloud.annotations.argo" $params | fromYaml }}
+  {{- if or (eq (index (index .Values "cloud" | default dict) "provider" | default "gke") "gke") $annotations }}


Not sure if this is correct. We likely still want annotations here. Just maybe different annotations.

Leaving the non-GKE annotations is good. We'll need those for Argo.

On that note, we'll probably need to make Argo optional as well. That can be a future PR though.

Currently we produce annotations, negs, and other items specifically tied to GKE. This PR is a first pass at adding conditionals around these GKE specific implementations. As our next target is likely to be an `on-prem` we introduce another values file to render the charts and test them without these specific implementations. As we gather more information about what we need to support for `on-prem` or other `providers` we can add specific cases for those options.

emaydeck-mozilla · 2026-03-17T21:29:29Z

mozcloud/application/templates/gateway/backend.yaml

 */ -}}
 {{- define "mozcloud.gateway.backends" -}}
 {{- $workloads := .workloads -}}
+{{- $provider := index (index .Values "cloud" | default dict) "provider" | default "gke" -}}


Suggested change

{{- $provider := index (index .Values "cloud" | default dict) "provider" | default "gke" -}}

{{- $provider := dig "cloud" "provider" "gke" .Values }}

I think you could simplify this using something like this.

emaydeck-mozilla · 2026-03-17T21:33:56Z

mozcloud/application/templates/gateway/gateway.yaml

  */}}
  {{- if not (include "mozcloud.preview.usePreviewHttpRoute" .) }}
-    {{- $params := mergeOverwrite $context (dict "globals" .Values.global.mozcloud "workloads" $workloads) }}
+    {{- $provider := index (index .Values "cloud" | default dict) "provider" | default "gke" }}


Suggested change

{{- $provider := index (index .Values "cloud" | default dict) "provider" | default "gke" }}

{{- $provider := dig "cloud" "provider" "gke" .Values }}

Same simplification here.

emaydeck-mozilla · 2026-03-17T21:35:24Z

mozcloud/application/templates/gke/backend.yaml

+GKE-specific gateway backend resources: GCPBackendPolicy, HealthCheckPolicy.
+Only rendered when cloud.provider is "gke".
+*/ -}}
+{{- $provider := index (index .Values "cloud" | default dict) "provider" | default "gke" }}


Suggested change

{{- $provider := index (index .Values "cloud" | default dict) "provider" | default "gke" }}

{{- $provider := dig "cloud" "provider" "gke" .Values }}

emaydeck-mozilla · 2026-03-17T21:41:53Z

mozcloud/application/templates/gke/frontendconfig.yaml

+    redirectToHttps:
+      enabled: true
+      responseCodeName: MOVED_PERMANENTLY_DEFAULT
+    sslPolicy: mozilla-intermediate


I believe this is unique to our specific GCP projects. We may want to make this configurable when cloud.provider == gke.

emaydeck-mozilla · 2026-03-17T21:47:39Z

mozcloud/application/templates/gke/frontendconfig.yaml

+{{- end -}}
+
+{{- /* We do not use ingress resources for preview environments, and FrontendConfig is GKE-only */}}
+{{- if and .Values.enabled (not (include "mozcloud.preview.enabled" .)) (eq (index (index .Values "cloud" | default dict) "provider" | default "gke") "gke") }}


Suggested change

{{- if and .Values.enabled (not (include "mozcloud.preview.enabled" .)) (eq (index (index .Values "cloud" | default dict) "provider" | default "gke") "gke") }}

{{- if and .Values.enabled (not (include "mozcloud.preview.enabled" .)) (eq (dig "cloud" "provider" "gke" .Values) "gke") }}

emaydeck-mozilla · 2026-03-17T21:49:16Z

mozcloud/application/templates/gke/podmonitoring.yaml

@@ -1,10 +1,12 @@
+{{- $provider := index (index .Values "cloud" | default dict) "provider" | default "gke" }}


Suggested change

{{- $provider := index (index .Values "cloud" | default dict) "provider" | default "gke" }}

{{- $provider := dig "cloud" "provider" "gke" .Values }}

emaydeck-mozilla · 2026-03-17T21:50:27Z

mozcloud/application/templates/gke/gateway.yaml

+GKE-specific gateway resources: GCPGatewayPolicy.
+Only rendered when cloud.provider is "gke".
+*/ -}}
+{{- $provider := index (index .Values "cloud" | default dict) "provider" | default "gke" }}


Suggested change

{{- $provider := index (index .Values "cloud" | default dict) "provider" | default "gke" }}

{{- $provider := dig "cloud" "provider" "gke" .Values }}

emaydeck-mozilla · 2026-03-17T21:52:45Z

mozcloud/application/templates/gke/gateway.yaml

+{{- $provider := index (index .Values "cloud" | default dict) "provider" | default "gke" }}
+{{- if and (eq $provider "gke") (not (include "mozcloud.preview.usePreviewHttpRoute" .)) }}
+  {{- $chartMetadata := dict "Chart" .Chart "Release" .Release }}
+  {{- $context := deepCopy . }}
+  {{- $labelParams := mergeOverwrite $chartMetadata (include "mozcloud.labelParams" . | fromYaml) }}
+  {{- $previewConfig := mergeOverwrite (default dict .Values.global.preview) (default dict .Values.preview) }}
+  {{- $formatterParams := dict "api" "gateway" "workloads" (.Values.workloads | deepCopy) "preview" $previewConfig }}
+  {{- $workloads := include "mozcloud.formatter.workloads" $formatterParams | fromYaml -}}
+  {{- $hosts := list }}
+  {{- range $workloadName, $workloadConfig := $workloads }}
+    {{- range $hostName, $hostConfig := $workloadConfig.hosts }}
+      {{- $hosts = append $hosts $hostName }}
+    {{- end }}
+  {{- end }}


Since we keep doing some form of this across the Gateway and Ingress templates, I think it may make sense to create a helper function for this that we can call to get workloads and hosts.

emaydeck-mozilla · 2026-03-17T21:53:24Z

mozcloud/application/templates/gke/ingress.yaml

+GKE-specific ingress resources: BackendConfig, ManagedCertificate.
+Only rendered when cloud.provider is "gke".
+*/ -}}
+{{- $provider := index (index .Values "cloud" | default dict) "provider" | default "gke" }}


Suggested change

{{- $provider := index (index .Values "cloud" | default dict) "provider" | default "gke" }}

{{- $provider := dig "cloud" "provider" "gke" .Values }}

emaydeck-mozilla · 2026-03-17T21:56:35Z

mozcloud/application/templates/serviceaccount/serviceaccount.yaml

+  {{- if or (eq (index (index .Values "cloud" | default dict) "provider" | default "gke") "gke") $annotations }}
  annotations:
+    {{- if eq (index (index .Values "cloud" | default dict) "provider" | default "gke") "gke" }}


Suggested change

{{- if or (eq (index (index .Values "cloud" | default dict) "provider" | default "gke") "gke") $annotations }}

annotations:

{{- if eq (index (index .Values "cloud" | default dict) "provider" | default "gke") "gke" }}

{{- $provider := dig "cloud" "provider" "gke" .Values }}

{{- if or (eq $provider "gke") $annotations }}

annotations:

{{- if eq $provider "gke" }}

emaydeck-mozilla · 2026-03-17T22:02:32Z

mozcloud/application/values-onprem.yaml

+# On-premises / non-GKE values profile for the mozcloud chart.
+#
+# Usage:
+#   helm template my-release . -f values.yaml -f values-onprem.yaml


Suggested change

# helm template my-release . -f values.yaml -f values-onprem.yaml

# helm template my-release . -f values-onprem.yaml

values.yaml will always be rendered by default, even when specifying an alternate values file.

emaydeck-mozilla · 2026-03-17T22:03:36Z

mozcloud/application/values.schema.json

+          "type": "string",
+          "description": "Cloud provider. Use \"gke\" for Google Kubernetes Engine (default), or \"on-prem\" for self hosted clusters.",
+          "default": "gke"


Do we know which providers we will be supporting yet? Is it boudned? If so, we may want to use an enum for this.

emaydeck-mozilla · 2026-03-17T22:06:21Z

mozcloud/application/tests/__snapshot__/preview-all-resources_test.yaml.snap

-    apiVersion: networking.gke.io/v1
-    kind: GCPBackendPolicy
-    metadata:
-      labels:
-        app.kubernetes.io/component: api
-        app.kubernetes.io/managed-by: argocd
-        app.kubernetes.io/name: mozcloud-test
-        app_code: mozcloud-test
-        component_code: api
-        env_code: dev
-        helm.sh/chart: test-chart
-        mozcloud_chart: mozcloud
-        mozcloud_chart_version: 1.0.0
-        preview_pr: "789"
-        realm: nonprod
-      name: pr789-api-service
-    spec:
-      default:
-        logging:
-          enabled: true
-          sampleRate: 100000
-      targetRef:
-        group: ""
-        kind: Service
-        name: pr789-api-service
-  6: |
-    apiVersion: networking.gke.io/v1
-    kind: HealthCheckPolicy
-    metadata:
-      labels:
-        app.kubernetes.io/component: api
-        app.kubernetes.io/managed-by: argocd
-        app.kubernetes.io/name: mozcloud-test
-        app_code: mozcloud-test
-        component_code: api
-        env_code: dev
-        helm.sh/chart: test-chart
-        mozcloud_chart: mozcloud
-        mozcloud_chart_version: 1.0.0
-        preview_pr: "789"
-        realm: nonprod
-      name: pr789-api-service
-    spec:
-      default:
-        config:
-          httpHealthCheck:
-            requestPath: /__lbheartbeat__
-          type: HTTP
-      targetRef:
-        group: ""
-        kind: Service
-        name: pr789-api-service


It seems like this shouldn't be getting deleted outright. Was this intentional?

emaydeck-mozilla

Left several comments above with some suggestions and thoughts.

bkochendorfer requested a review from a team as a code owner March 12, 2026 14:04

bkochendorfer commented Mar 12, 2026

View reviewed changes

bkochendorfer force-pushed the MZCLD-2405 branch from 2b88553 to 9507293 Compare March 12, 2026 14:13

bkochendorfer force-pushed the MZCLD-2405 branch from 9507293 to 9513a40 Compare March 12, 2026 14:23

bkochendorfer and others added 8 commits March 12, 2026 15:01

feat: Try separating out into directory

302db22

fix: Move podmonitoring to gke

165b822

fix: Remove podmonitoring from basic test

bffe9bf

fix: Fix tests

66019f8

fix: Fixup tests

8e1819e

fix: Tease apart backend to remove GCP specific components

dafa4bb

Merge branch 'main' into MZCLD-2405

40c349f

fix: Merging from UI got me

4d75e0e

emaydeck-mozilla reviewed Mar 17, 2026

View reviewed changes

emaydeck-mozilla requested changes Mar 17, 2026

View reviewed changes

	{{- $provider := index (index .Values "cloud" \| default dict) "provider" \| default "gke" -}}
	{{- $provider := dig "cloud" "provider" "gke" .Values }}

	{{- if and .Values.enabled (not (include "mozcloud.preview.enabled" .)) (eq (index (index .Values "cloud" \| default dict) "provider" \| default "gke") "gke") }}
	{{- if and .Values.enabled (not (include "mozcloud.preview.enabled" .)) (eq (dig "cloud" "provider" "gke" .Values) "gke") }}

		@@ -1,10 +1,12 @@
		{{- $provider := index (index .Values "cloud" \| default dict) "provider" \| default "gke" }}

	# helm template my-release . -f values.yaml -f values-onprem.yaml
	# helm template my-release . -f values-onprem.yaml

Conversation

bkochendorfer commented Mar 12, 2026

Description

References

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

emaydeck-mozilla Mar 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

emaydeck-mozilla Mar 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

emaydeck-mozilla left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

emaydeck-mozilla Mar 17, 2026 •

edited

Loading

emaydeck-mozilla Mar 17, 2026 •

edited

Loading