From e5fcb16118c706eedacfe3d3fb3bbc0ef327a418 Mon Sep 17 00:00:00 2001 From: Kjeld Schouten Date: Sat, 18 Nov 2023 14:21:20 +0100 Subject: [PATCH] feat(common): remove route (http/tcp/other) from common --- library/common-test/Chart.yaml | 2 +- library/common/Chart.yaml | 2 +- library/common/templates/class/_route.tpl | 87 --------------------- library/common/templates/spawner/_route.tpl | 18 ----- 4 files changed, 2 insertions(+), 107 deletions(-) delete mode 100644 library/common/templates/class/_route.tpl delete mode 100644 library/common/templates/spawner/_route.tpl diff --git a/library/common-test/Chart.yaml b/library/common-test/Chart.yaml index 8f35abd6..34a2e909 100644 --- a/library/common-test/Chart.yaml +++ b/library/common-test/Chart.yaml @@ -3,7 +3,7 @@ appVersion: "" dependencies: - name: common repository: file://../common - version: ~15.1.0 + version: ~16.0.0 deprecated: false description: Helper chart to test different use cases of the common library home: https://github.com/truecharts/apps/tree/master/charts/library/common-test diff --git a/library/common/Chart.yaml b/library/common/Chart.yaml index 36ea0839..c49add2c 100644 --- a/library/common/Chart.yaml +++ b/library/common/Chart.yaml @@ -15,4 +15,4 @@ maintainers: name: common sources: null type: library -version: 15.1.0 +version: 16.0.0 diff --git a/library/common/templates/class/_route.tpl b/library/common/templates/class/_route.tpl deleted file mode 100644 index e9ef7e01..00000000 --- a/library/common/templates/class/_route.tpl +++ /dev/null @@ -1,87 +0,0 @@ -{{/* -This template serves as a blueprint for all Route objects that are created -within the common library. -*/}} -{{- define "tc.v1.common.class.route" -}} -{{- $values := .Values.route -}} -{{- if hasKey . "ObjectValues" -}} - {{- with .ObjectValues.route -}} - {{- $values = . -}} - {{- end -}} -{{- end -}} - - {{- $routeLabels := $values.labels -}} - {{- $routeAnnotations := $values.annotations -}} - -{{- $fullName := include "tc.v1.common.lib.chart.names.fullname" . -}} -{{- if and (hasKey $values "nameOverride") $values.nameOverride -}} - {{- $fullName = printf "%v-%v" $fullName $values.nameOverride -}} -{{- end -}} -{{- $routeKind := $values.kind | default "HTTPRoute" -}} - -{{/* Get the name of the primary service, if any */}} -{{- $primaryServiceName := (include "tc.v1.common.lib.util.service.primary" (dict "services" .Values.service "root" .)) -}} -{{/* Get service values of the primary service, if any */}} -{{- $primaryService := get .Values.service $primaryServiceName -}} -{{- $defaultServiceName := $fullName -}} - -{{- if and (hasKey $primaryService "nameOverride") $primaryService.nameOverride -}} - {{- $defaultServiceName = printf "%v-%v" $defaultServiceName $primaryService.nameOverride -}} -{{- end -}} -{{- $defaultServicePort := get $primaryService.ports (include "tc.v1.common.lib.util.service.ports.primary" (dict "svcValues" $primaryService "svcName" $primaryServiceName )) }} - ---- -apiVersion: gateway.networking.k8s.io/v1alpha2 -{{- if and (ne $routeKind "GRPCRoute") (ne $routeKind "HTTPRoute") (ne $routeKind "TCPRoute") (ne $routeKind "TLSRoute") (ne $routeKind "UDPRoute") -}} - {{- fail (printf "Not a valid route kind (%s)" $routeKind) -}} -{{- end }} -kind: {{ $routeKind }} -metadata: - name: {{ $fullName }} - namespace: {{ $.Values.namespace | default $.Values.global.namespace | default $.Release.Namespace }} - {{- $labels := (mustMerge ($routeLabels | default dict) (include "tc.v1.common.lib.metadata.allLabels" $ | fromYaml)) -}} - {{- with (include "tc.v1.common.lib.metadata.render" (dict "rootCtx" $ "labels" $labels) | trim) }} - labels: - {{- . | nindent 4 }} - {{- end -}} - {{- $annotations := (mustMerge ($routeAnnotations | default dict) (include "tc.v1.common.lib.metadata.allAnnotations" $ | fromYaml)) }} - annotations: - {{- with (include "tc.v1.common.lib.metadata.render" (dict "rootCtx" $ "annotations" $annotations) | trim) }} - {{- . | nindent 4 }} - {{- end }} -spec: - parentRefs: - {{- range $values.parentRefs }} - - group: {{ default "gateway.networking.k8s.io" .group }} - kind: {{ default "Gateway" .kind }} - name: {{ required (printf "parentRef name is required for %v %v" $routeKind $fullName) .name }} - namespace: {{ required (printf "parentRef namespace is required for %v %v" $routeKind $fullName) .namespace }} - {{- if .sectionName }} - sectionName: {{ .sectionName | quote }} - {{- end }} - {{- end }} - {{- if and (ne $routeKind "TCPRoute") (ne $routeKind "UDPRoute") $values.hostnames }} - hostnames: - {{- with $values.hostnames }} - {{- toYaml . | nindent 4 }} - {{- end }} - {{- end }} - rules: - {{- range $values.rules }} - - backendRefs: - {{- range .backendRefs }} - - group: {{ default "" .group | quote}} - kind: {{ default "Service" .kind }} - name: {{ default $defaultServiceName .name }} - namespace: {{ default $.Release.Namespace .namespace }} - port: {{ default $defaultServicePort.port .port }} - weight: {{ default 1 .weight }} - {{- end }} - {{- if (eq $routeKind "HTTPRoute") }} - {{- with .matches }} - matches: - {{- toYaml . | nindent 6 }} - {{- end }} - {{- end }} - {{- end }} -{{- end }} diff --git a/library/common/templates/spawner/_route.tpl b/library/common/templates/spawner/_route.tpl deleted file mode 100644 index 5ecf2104..00000000 --- a/library/common/templates/spawner/_route.tpl +++ /dev/null @@ -1,18 +0,0 @@ -{{/* Renders the Route objects required by the chart */}} -{{- define "tc.v1.common.spawner.routes" -}} - {{- /* Generate named routes as required */ -}} - {{- range $name, $route := .Values.route }} - {{- if $route.enabled -}} - {{- $routeValues := $route -}} - - {{/* set defaults */}} - {{- if and (not $routeValues.nameOverride) (ne $name (include "tc.v1.common.lib.util.route.primary" $)) -}} - {{- $_ := set $routeValues "nameOverride" $name -}} - {{- end -}} - - {{- $_ := set $ "ObjectValues" (dict "route" $routeValues) -}} - {{- include "tc.v1.common.class.route" $ | nindent 0 -}} - {{- $_ := unset $.ObjectValues "route" -}} - {{- end }} - {{- end }} -{{- end }}