From d461f5e0bc210dbde5853c472a500d01434b504e Mon Sep 17 00:00:00 2001 From: Markus Pesch Date: Fri, 29 May 2026 23:51:18 +0200 Subject: [PATCH] fix(gatewayAPI): adapt backendTLSPolicy --- templates/_backendTLSConfig.tpl | 16 ++++++------- templates/backendTLSConfig.yaml | 8 +++---- .../backendTLSConfig/backendTLSConfig.yaml | 24 +++++++++---------- values.yaml | 3 ++- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/templates/_backendTLSConfig.tpl b/templates/_backendTLSConfig.tpl index 08e705d..2e72ae9 100644 --- a/templates/_backendTLSConfig.tpl +++ b/templates/_backendTLSConfig.tpl @@ -2,18 +2,18 @@ {{/* annotations */}} -{{- define "reposilite.backendTLSConfig.annotations" -}} +{{- define "reposilite.backendTLSPolicy.annotations" -}} {{ include "reposilite.annotations" . }} -{{- if .Values.gatewayAPI.core.backendTLSConfig.annotations }} -{{ toYaml .Values.gatewayAPI.core.backendTLSConfig.annotations }} +{{- if .Values.gatewayAPI.core.backendTLSPolicy.annotations }} +{{ toYaml .Values.gatewayAPI.core.backendTLSPolicy.annotations }} {{- end }} {{- end }} {{/* enabled */}} -{{- define "reposilite.backendTLSConfig.enabled" -}} +{{- define "reposilite.backendTLSPolicy.enabled" -}} {{- if and .Values.gatewayAPI.enabled - .Values.gatewayAPI.core.backendTLSConfig.enabled + .Values.gatewayAPI.core.backendTLSPolicy.enabled .Values.service.enabled -}} true @@ -24,9 +24,9 @@ false {{/* labels */}} -{{- define "reposilite.backendTLSConfig.labels" -}} +{{- define "reposilite.backendTLSPolicy.labels" -}} {{ include "reposilite.labels" . }} -{{- if .Values.gatewayAPI.core.backendTLSConfig.labels }} -{{ toYaml .Values.gatewayAPI.core.backendTLSConfig.labels }} +{{- if .Values.gatewayAPI.core.backendTLSPolicy.labels }} +{{ toYaml .Values.gatewayAPI.core.backendTLSPolicy.labels }} {{- end }} {{- end }} diff --git a/templates/backendTLSConfig.yaml b/templates/backendTLSConfig.yaml index e12395f..544d55e 100644 --- a/templates/backendTLSConfig.yaml +++ b/templates/backendTLSConfig.yaml @@ -1,13 +1,13 @@ -{{- if eq (include "reposilite.backendTLSConfig.enabled" $) "true" }} +{{- if eq (include "reposilite.backendTLSPolicy.enabled" $) "true" }} --- apiVersion: gateway.networking.k8s.io/v1 kind: BackendTLSPolicy metadata: - {{- with (include "reposilite.backendTLSConfig.annotations" . | fromYaml) }} + {{- with (include "reposilite.backendTLSPolicy.annotations" . | fromYaml) }} annotations: {{- toYaml . | nindent 4 }} {{- end }} - {{- with (include "reposilite.backendTLSConfig.labels" . | fromYaml) }} + {{- with (include "reposilite.backendTLSPolicy.labels" . | fromYaml) }} labels: {{- toYaml . | nindent 4 }} {{- end }} @@ -18,7 +18,7 @@ spec: - group: "" kind: Service name: {{ include "reposilite.service.name" . }} - {{- with .Values.gatewayAPI.core.backendTLSConfig.validation }} + {{- with .Values.gatewayAPI.core.backendTLSPolicy.validation }} validation: {{- toYaml . | nindent 4 }} {{- end }} diff --git a/unittests/backendTLSConfig/backendTLSConfig.yaml b/unittests/backendTLSConfig/backendTLSConfig.yaml index 9517a92..22557bb 100644 --- a/unittests/backendTLSConfig/backendTLSConfig.yaml +++ b/unittests/backendTLSConfig/backendTLSConfig.yaml @@ -1,17 +1,17 @@ chart: appVersion: 0.1.0 version: 0.1.0 -suite: BackendTLSConfig template +suite: backendTLSPolicy template release: name: reposilite-unittest namespace: testing templates: -- templates/backendTLSConfig.yaml +- templates/backendTLSPolicy.yaml tests: - it: Skip rendering when disabled 1/6 set: gatewayAPI.enabled: false - gatewayAPI.core.backendTLSConfig.enabled: false + gatewayAPI.core.backendTLSPolicy.enabled: false service.enabled: false asserts: - hasDocuments: @@ -20,7 +20,7 @@ tests: - it: Skip rendering when disabled 2/6 set: gatewayAPI.enabled: true - gatewayAPI.core.backendTLSConfig.enabled: false + gatewayAPI.core.backendTLSPolicy.enabled: false service.enabled: false asserts: - hasDocuments: @@ -29,7 +29,7 @@ tests: - it: Skip rendering when disabled 3/6 set: gatewayAPI.enabled: false - gatewayAPI.core.backendTLSConfig.enabled: true + gatewayAPI.core.backendTLSPolicy.enabled: true service.enabled: false asserts: - hasDocuments: @@ -38,7 +38,7 @@ tests: - it: Skip rendering when disabled 4/6 set: gatewayAPI.enabled: false - gatewayAPI.core.backendTLSConfig.enabled: false + gatewayAPI.core.backendTLSPolicy.enabled: false service.enabled: true asserts: - hasDocuments: @@ -47,7 +47,7 @@ tests: - it: Skip rendering when disabled 5/6 set: gatewayAPI.enabled: true - gatewayAPI.core.backendTLSConfig.enabled: false + gatewayAPI.core.backendTLSPolicy.enabled: false service.enabled: true asserts: - hasDocuments: @@ -56,7 +56,7 @@ tests: - it: Skip rendering when disabled 6/6 set: gatewayAPI.enabled: true - gatewayAPI.core.backendTLSConfig.enabled: true + gatewayAPI.core.backendTLSPolicy.enabled: true service.enabled: false asserts: - hasDocuments: @@ -65,7 +65,7 @@ tests: - it: Render default values set: gatewayAPI.enabled: true - gatewayAPI.core.backendTLSConfig.enabled: true + gatewayAPI.core.backendTLSPolicy.enabled: true service.enabled: true asserts: - hasDocuments: @@ -87,7 +87,7 @@ tests: - it: Render with custom annotations and labels set: gatewayAPI.enabled: true - gatewayAPI.core.backendTLSConfig: + gatewayAPI.core.backendTLSPolicy: enabled: true annotations: foo: bar @@ -112,8 +112,8 @@ tests: - it: Render with custom validation set: gatewayAPI.enabled: true - gatewayAPI.core.backendTLSConfig.enabled: true - gatewayAPI.core.backendTLSConfig.validation: + gatewayAPI.core.backendTLSPolicy.enabled: true + gatewayAPI.core.backendTLSPolicy.validation: caCertificateRefs: - group: "" kind: Secret diff --git a/values.yaml b/values.yaml index 64d17f4..08abcd8 100644 --- a/values.yaml +++ b/values.yaml @@ -247,7 +247,8 @@ gatewayAPI: # caCertificateRefs: # - group: "" # kind: Secret - # name: "reposilite-tls" + # name: "reposilite-ca" + # hostname: "reposilite" ## @param gatewayAPI.core.httpRoute.enabled Enable the HTTPRoute resource. Requires also `gatewayAPI.enabled` and `service.enabled` to be `true`. ## @param gatewayAPI.core.httpRoute.annotations Additional annotations for the HTTPRoute.