From 563c6438138e709c6c4962eb42c90373fe634886 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 8 May 2025 12:17:41 +0200 Subject: [PATCH] [kubernetes] refactor gatewayAPI option Signed-off-by: Andrei Kvapil --- packages/apps/kubernetes/Chart.yaml | 2 +- packages/apps/kubernetes/README.md | 1 + .../apps/kubernetes/templates/helmreleases/cilium.yaml | 2 +- .../apps/kubernetes/templates/helmreleases/delete.yaml | 1 + .../{gateway-api.yaml => gateway-api-crds.yaml} | 6 +++--- packages/apps/kubernetes/values.schema.json | 10 ++++++++++ packages/apps/kubernetes/values.yaml | 6 ++++++ .../{gateway-api => gateway-api-crds}/Chart.yaml | 2 +- .../system/{gateway-api => gateway-api-crds}/Makefile | 3 +-- .../templates/crds-experimental.yaml | 0 10 files changed, 25 insertions(+), 8 deletions(-) rename packages/apps/kubernetes/templates/helmreleases/{gateway-api.yaml => gateway-api-crds.yaml} (88%) rename packages/system/{gateway-api => gateway-api-crds}/Chart.yaml (80%) rename packages/system/{gateway-api => gateway-api-crds}/Makefile (89%) rename packages/system/{gateway-api => gateway-api-crds}/templates/crds-experimental.yaml (100%) diff --git a/packages/apps/kubernetes/Chart.yaml b/packages/apps/kubernetes/Chart.yaml index 7daa8598..a74f0945 100644 --- a/packages/apps/kubernetes/Chart.yaml +++ b/packages/apps/kubernetes/Chart.yaml @@ -22,4 +22,4 @@ version: 0.20.0 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "1.30.1" +appVersion: 1.31.0 diff --git a/packages/apps/kubernetes/README.md b/packages/apps/kubernetes/README.md index 79c01191..71cee152 100644 --- a/packages/apps/kubernetes/README.md +++ b/packages/apps/kubernetes/README.md @@ -45,6 +45,7 @@ kubectl get secret -n kubernetes--admin-kubeconfig -o g | `addons.certManager.enabled` | Enables the cert-manager | `false` | | `addons.certManager.valuesOverride` | Custom values to override | `{}` | | `addons.cilium.valuesOverride` | Custom values to override | `{}` | +| `addons.gatewayAPI.enabled` | Enables the Gateway API | `false` | | `addons.ingressNginx.enabled` | Enable Ingress-NGINX controller (expect nodes with 'ingress-nginx' role) | `false` | | `addons.ingressNginx.valuesOverride` | Custom values to override | `{}` | | `addons.ingressNginx.hosts` | List of domain names that should be passed through to the cluster by upper cluster | `[]` | diff --git a/packages/apps/kubernetes/templates/helmreleases/cilium.yaml b/packages/apps/kubernetes/templates/helmreleases/cilium.yaml index ee31d30e..7e8c7480 100644 --- a/packages/apps/kubernetes/templates/helmreleases/cilium.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/cilium.yaml @@ -53,6 +53,6 @@ spec: namespace: {{ .Release.Namespace }} {{- end }} {{- if $.Values.addons.gatewayAPI.enabled }} - - name: {{ .Release.Name }}-gateway-api + - name: {{ .Release.Name }}-gateway-api-crds namespace: {{ .Release.Namespace }} {{- end }} diff --git a/packages/apps/kubernetes/templates/helmreleases/delete.yaml b/packages/apps/kubernetes/templates/helmreleases/delete.yaml index 6402617c..5b32588e 100644 --- a/packages/apps/kubernetes/templates/helmreleases/delete.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/delete.yaml @@ -30,6 +30,7 @@ spec: patch helmrelease {{ .Release.Name }}-cilium + {{ .Release.Name }}-gateway-api-crds {{ .Release.Name }}-csi {{ .Release.Name }}-cert-manager {{ .Release.Name }}-cert-manager-crds diff --git a/packages/apps/kubernetes/templates/helmreleases/gateway-api.yaml b/packages/apps/kubernetes/templates/helmreleases/gateway-api-crds.yaml similarity index 88% rename from packages/apps/kubernetes/templates/helmreleases/gateway-api.yaml rename to packages/apps/kubernetes/templates/helmreleases/gateway-api-crds.yaml index c7e3ad7a..1cac6dd9 100644 --- a/packages/apps/kubernetes/templates/helmreleases/gateway-api.yaml +++ b/packages/apps/kubernetes/templates/helmreleases/gateway-api-crds.yaml @@ -2,16 +2,16 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: {{ .Release.Name }}-gateway-api + name: {{ .Release.Name }}-gateway-api-crds labels: cozystack.io/repository: system cozystack.io/target-cluster-name: {{ .Release.Name }} spec: interval: 5m - releaseName: gateway-api + releaseName: gateway-api-crds chart: spec: - chart: cozy-gateway-api + chart: cozy-gateway-api-crds reconcileStrategy: Revision sourceRef: kind: HelmRepository diff --git a/packages/apps/kubernetes/values.schema.json b/packages/apps/kubernetes/values.schema.json index 7a2ac3d1..adb29dbd 100644 --- a/packages/apps/kubernetes/values.schema.json +++ b/packages/apps/kubernetes/values.schema.json @@ -155,6 +155,16 @@ } } }, + "gatewayAPI": { + "type": "object", + "properties": { + "enabled": { + "type": "boolean", + "description": "Enables the Gateway API", + "default": false + } + } + }, "ingressNginx": { "type": "object", "properties": { diff --git a/packages/apps/kubernetes/values.yaml b/packages/apps/kubernetes/values.yaml index 805d5bec..d1330b5c 100644 --- a/packages/apps/kubernetes/values.yaml +++ b/packages/apps/kubernetes/values.yaml @@ -48,6 +48,12 @@ addons: ## @param addons.cilium.valuesOverride Custom values to override valuesOverride: {} + ## Gateway API + ## + gatewayAPI: + ## @param addons.gatewayAPI.enabled Enables the Gateway API + enabled: false + ## Ingress-NGINX Controller ## ingressNginx: diff --git a/packages/system/gateway-api/Chart.yaml b/packages/system/gateway-api-crds/Chart.yaml similarity index 80% rename from packages/system/gateway-api/Chart.yaml rename to packages/system/gateway-api-crds/Chart.yaml index 1063b9f2..a6c8d105 100644 --- a/packages/system/gateway-api/Chart.yaml +++ b/packages/system/gateway-api-crds/Chart.yaml @@ -1,3 +1,3 @@ apiVersion: v2 -name: cozy-gateway-api +name: cozy-gateway-api-crds version: 0.0.0 # Placeholder, the actual version will be automatically set during the build process diff --git a/packages/system/gateway-api/Makefile b/packages/system/gateway-api-crds/Makefile similarity index 89% rename from packages/system/gateway-api/Makefile rename to packages/system/gateway-api-crds/Makefile index e6191a71..c4311662 100644 --- a/packages/system/gateway-api/Makefile +++ b/packages/system/gateway-api-crds/Makefile @@ -1,4 +1,4 @@ -export NAME=gateway-api +export NAME=gateway-api-crds export NAMESPACE=cozy-$(NAME) include ../../../scripts/package.mk @@ -7,4 +7,3 @@ update: rm -rf templates mkdir templates kubectl kustomize "github.com/kubernetes-sigs/gateway-api/config/crd/experimental?ref=v1.2.0" > templates/crds-experimental.yaml - diff --git a/packages/system/gateway-api/templates/crds-experimental.yaml b/packages/system/gateway-api-crds/templates/crds-experimental.yaml similarity index 100% rename from packages/system/gateway-api/templates/crds-experimental.yaml rename to packages/system/gateway-api-crds/templates/crds-experimental.yaml