volker.raschek/reposilite-charts
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(gatewayAPI): adapt backendTLSPolicy

Browse Source
This commit is contained in:
Markus Pesch
2026-05-29 23:51:18 +02:00
parent 6ed2f64dc0
commit d461f5e0bc
4 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/_backendTLSConfig.tpl
+8 -8
View File
@@ -2,18 +2,18 @@
{{/* annotations */}} {{/* annotations */}}
{{- define "reposilite.backendTLSConfig.annotations" -}} {{- define "reposilite.backendTLSPolicy.annotations" -}}
{{ include "reposilite.annotations" . }} {{ include "reposilite.annotations" . }}
{{- if .Values.gatewayAPI.core.backendTLSConfig.annotations }} {{- if .Values.gatewayAPI.core.backendTLSPolicy.annotations }}
{{ toYaml .Values.gatewayAPI.core.backendTLSConfig.annotations }} {{ toYaml .Values.gatewayAPI.core.backendTLSPolicy.annotations }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{/* enabled */}} {{/* enabled */}}
{{- define "reposilite.backendTLSConfig.enabled" -}} {{- define "reposilite.backendTLSPolicy.enabled" -}}
{{- if and .Values.gatewayAPI.enabled {{- if and .Values.gatewayAPI.enabled
.Values.gatewayAPI.core.backendTLSConfig.enabled .Values.gatewayAPI.core.backendTLSPolicy.enabled
.Values.service.enabled .Values.service.enabled
-}} -}}
true true
@@ -24,9 +24,9 @@ false
{{/* labels */}} {{/* labels */}}
{{- define "reposilite.backendTLSConfig.labels" -}} {{- define "reposilite.backendTLSPolicy.labels" -}}
{{ include "reposilite.labels" . }} {{ include "reposilite.labels" . }}
{{- if .Values.gatewayAPI.core.backendTLSConfig.labels }} {{- if .Values.gatewayAPI.core.backendTLSPolicy.labels }}
{{ toYaml .Values.gatewayAPI.core.backendTLSConfig.labels }} {{ toYaml .Values.gatewayAPI.core.backendTLSPolicy.labels }}
{{- end }} {{- end }}
{{- end }} {{- end }}
templates/backendTLSConfig.yaml
+4 -4
View File
@@ -1,13 +1,13 @@
{{- if eq (include "reposilite.backendTLSConfig.enabled" $) "true" }} {{- if eq (include "reposilite.backendTLSPolicy.enabled" $) "true" }}
--- ---
apiVersion: gateway.networking.k8s.io/v1 apiVersion: gateway.networking.k8s.io/v1
kind: BackendTLSPolicy kind: BackendTLSPolicy
metadata: metadata:
{{- with (include "reposilite.backendTLSConfig.annotations" . | fromYaml) }} {{- with (include "reposilite.backendTLSPolicy.annotations" . | fromYaml) }}
annotations: annotations:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
{{- with (include "reposilite.backendTLSConfig.labels" . | fromYaml) }} {{- with (include "reposilite.backendTLSPolicy.labels" . | fromYaml) }}
labels: labels:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
@@ -18,7 +18,7 @@ spec:
- group: "" - group: ""
kind: Service kind: Service
name: {{ include "reposilite.service.name" . }} name: {{ include "reposilite.service.name" . }}
{{- with .Values.gatewayAPI.core.backendTLSConfig.validation }} {{- with .Values.gatewayAPI.core.backendTLSPolicy.validation }}
validation: validation:
{{- toYaml . | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }} {{- end }}
unittests/backendTLSConfig/backendTLSConfig.yaml
+12 -12
View File
@@ -1,17 +1,17 @@
chart: chart:
appVersion: 0.1.0 appVersion: 0.1.0
version: 0.1.0 version: 0.1.0
suite: BackendTLSConfig template suite: backendTLSPolicy template
release: release:
name: reposilite-unittest name: reposilite-unittest
namespace: testing namespace: testing
templates: templates:
- templates/backendTLSConfig.yaml - templates/backendTLSPolicy.yaml
tests: tests:
- it: Skip rendering when disabled 1/6 - it: Skip rendering when disabled 1/6
set: set:
gatewayAPI.enabled: false gatewayAPI.enabled: false
gatewayAPI.core.backendTLSConfig.enabled: false gatewayAPI.core.backendTLSPolicy.enabled: false
service.enabled: false service.enabled: false
asserts: asserts:
- hasDocuments: - hasDocuments:
@@ -20,7 +20,7 @@ tests:
- it: Skip rendering when disabled 2/6 - it: Skip rendering when disabled 2/6
set: set:
gatewayAPI.enabled: true gatewayAPI.enabled: true
gatewayAPI.core.backendTLSConfig.enabled: false gatewayAPI.core.backendTLSPolicy.enabled: false
service.enabled: false service.enabled: false
asserts: asserts:
- hasDocuments: - hasDocuments:
@@ -29,7 +29,7 @@ tests:
- it: Skip rendering when disabled 3/6 - it: Skip rendering when disabled 3/6
set: set:
gatewayAPI.enabled: false gatewayAPI.enabled: false
gatewayAPI.core.backendTLSConfig.enabled: true gatewayAPI.core.backendTLSPolicy.enabled: true
service.enabled: false service.enabled: false
asserts: asserts:
- hasDocuments: - hasDocuments:
@@ -38,7 +38,7 @@ tests:
- it: Skip rendering when disabled 4/6 - it: Skip rendering when disabled 4/6
set: set:
gatewayAPI.enabled: false gatewayAPI.enabled: false
gatewayAPI.core.backendTLSConfig.enabled: false gatewayAPI.core.backendTLSPolicy.enabled: false
service.enabled: true service.enabled: true
asserts: asserts:
- hasDocuments: - hasDocuments:
@@ -47,7 +47,7 @@ tests:
- it: Skip rendering when disabled 5/6 - it: Skip rendering when disabled 5/6
set: set:
gatewayAPI.enabled: true gatewayAPI.enabled: true
gatewayAPI.core.backendTLSConfig.enabled: false gatewayAPI.core.backendTLSPolicy.enabled: false
service.enabled: true service.enabled: true
asserts: asserts:
- hasDocuments: - hasDocuments:
@@ -56,7 +56,7 @@ tests:
- it: Skip rendering when disabled 6/6 - it: Skip rendering when disabled 6/6
set: set:
gatewayAPI.enabled: true gatewayAPI.enabled: true
gatewayAPI.core.backendTLSConfig.enabled: true gatewayAPI.core.backendTLSPolicy.enabled: true
service.enabled: false service.enabled: false
asserts: asserts:
- hasDocuments: - hasDocuments:
@@ -65,7 +65,7 @@ tests:
- it: Render default values - it: Render default values
set: set:
gatewayAPI.enabled: true gatewayAPI.enabled: true
gatewayAPI.core.backendTLSConfig.enabled: true gatewayAPI.core.backendTLSPolicy.enabled: true
service.enabled: true service.enabled: true
asserts: asserts:
- hasDocuments: - hasDocuments:
@@ -87,7 +87,7 @@ tests:
- it: Render with custom annotations and labels - it: Render with custom annotations and labels
set: set:
gatewayAPI.enabled: true gatewayAPI.enabled: true
gatewayAPI.core.backendTLSConfig: gatewayAPI.core.backendTLSPolicy:
enabled: true enabled: true
annotations: annotations:
foo: bar foo: bar
@@ -112,8 +112,8 @@ tests:
- it: Render with custom validation - it: Render with custom validation
set: set:
gatewayAPI.enabled: true gatewayAPI.enabled: true
gatewayAPI.core.backendTLSConfig.enabled: true gatewayAPI.core.backendTLSPolicy.enabled: true
gatewayAPI.core.backendTLSConfig.validation: gatewayAPI.core.backendTLSPolicy.validation:
caCertificateRefs: caCertificateRefs:
- group: "" - group: ""
kind: Secret kind: Secret
values.yaml
+2 -1
View File
@@ -247,7 +247,8 @@ gatewayAPI:
# caCertificateRefs: # caCertificateRefs:
# - group: "" # - group: ""
# kind: Secret # 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.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. ## @param gatewayAPI.core.httpRoute.annotations Additional annotations for the HTTPRoute.