From 751dff849dfcd9d68ba065571dc8251dbfc16cb2 Mon Sep 17 00:00:00 2001 From: Daniel Safta Date: Wed, 2 Feb 2022 12:07:18 +0000 Subject: [PATCH 1/2] Update apiVersion to networking.k8s.io/v1 These are the changes needed to upgrade the apiVersion in the resources used by armada. This is a subset of the upstream commit: https://github.com/openstack/openstack-helm-infra/commit/f4972121bcb41c8d74748917804d2b239ab757f9 Signed-off-by: Daniel Safta --- helm-toolkit/templates/manifests/_ingress.tpl | 75 +++++++++++++------ ingress/templates/ingress.yaml | 14 +++- 2 files changed, 62 insertions(+), 27 deletions(-) diff --git a/helm-toolkit/templates/manifests/_ingress.tpl b/helm-toolkit/templates/manifests/_ingress.tpl index f0c37fd..5c54c34 100644 --- a/helm-toolkit/templates/manifests/_ingress.tpl +++ b/helm-toolkit/templates/manifests/_ingress.tpl @@ -64,7 +64,7 @@ examples: {{- include "helm-toolkit.manifests.ingress" ( dict "envAll" . "backendServiceType" "key-manager" "backendPort" "b-api" "endpoint" "public" ) -}} return: | --- - apiVersion: extensions/v1beta1 + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: barbican @@ -78,25 +78,34 @@ examples: http: paths: - path: / + pathType: ImplementationSpecific backend: - serviceName: barbican-api - servicePort: b-api + service: + name: barbican-api + port: + name: b-api - host: barbican.default http: paths: - path: / + pathType: ImplementationSpecific backend: - serviceName: barbican-api - servicePort: b-api + service: + name: barbican-api + port: + name: b-api - host: barbican.default.svc.cluster.local http: paths: - path: / + pathType: ImplementationSpecific backend: - serviceName: barbican-api - servicePort: b-api + service: + name: barbican-api + port: + name: b-api --- - apiVersion: extensions/v1beta1 + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: barbican-namespace-fqdn @@ -114,11 +123,14 @@ examples: http: paths: - path: / + pathType: ImplementationSpecific backend: - serviceName: barbican-api - servicePort: b-api + service: + name: barbican-api + port: + name: b-api --- - apiVersion: extensions/v1beta1 + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: barbican-cluster-fqdn @@ -136,9 +148,12 @@ examples: http: paths: - path: / + pathType: ImplementationSpecific backend: - serviceName: barbican-api - servicePort: b-api + service: + name: barbican-api + port: + name: b-api - values: | network: api: @@ -184,7 +199,7 @@ examples: {{- include "helm-toolkit.manifests.ingress" ( dict "envAll" . "backendServiceType" "key-manager" "backendPort" "b-api" "endpoint" "public" ) -}} return: | --- - apiVersion: extensions/v1beta1 + apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: barbican @@ -204,23 +219,32 @@ examples: http: paths: - path: / + pathType: ImplementationSpecific backend: - serviceName: barbican-api - servicePort: b-api + service: + name: barbican-api + port: + name: b-api - host: barbican.default http: paths: - path: / + pathType: ImplementationSpecific backend: - serviceName: barbican-api - servicePort: b-api + service: + name: barbican-api + port: + name: b-api - host: barbican.default.svc.cluster.local http: paths: - path: / + pathType: ImplementationSpecific backend: - serviceName: barbican-api - servicePort: b-api + service: + name: barbican-api + port: + name: b-api */}} {{- define "helm-toolkit.manifests.ingress._host_rules" -}} @@ -231,9 +255,12 @@ examples: http: paths: - path: / + pathType: ImplementationSpecific backend: - serviceName: {{ $backendName }} - servicePort: {{ $backendPort }} + service: + name: {{ $backendName }} + port: + name: {{ $backendPort }} {{- end }} {{- define "helm-toolkit.manifests.ingress" -}} @@ -247,7 +274,7 @@ examples: {{- $hostName := tuple $backendServiceType $endpoint $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }} {{- $hostNameFull := tuple $backendServiceType $endpoint $envAll | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }} --- -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ $ingressName }} @@ -282,7 +309,7 @@ spec: {{- range $key2, $ingressController := tuple "namespace" "cluster" }} {{- $hostNameFullRules := dict "vHost" $hostNameFull "backendName" $backendName "backendPort" $backendPort }} --- -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ printf "%s-%s-%s" $ingressName $ingressController "fqdn" }} diff --git a/ingress/templates/ingress.yaml b/ingress/templates/ingress.yaml index 16ebaab..10ffac7 100644 --- a/ingress/templates/ingress.yaml +++ b/ingress/templates/ingress.yaml @@ -21,7 +21,7 @@ limitations under the License. {{- $_ := set .Values.network.ingress.annotations "kubernetes.io/ingress.class" .Values.deployment.cluster.class -}} {{- end -}} --- -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ .Release.Namespace }}-{{ .Release.Name }} @@ -33,8 +33,16 @@ spec: http: paths: - path: / + pathType: ImplementationSpecific backend: - serviceName: {{ tuple "ingress" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }} - servicePort: {{ tuple "ingress" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + service: + name: {{ $serviceName }} + port: +{{- if or (kindIs "int" $servicePort) (regexMatch "^[0-9]{1,5}$" $servicePort) }} + number: {{ $servicePort | int }} +{{- else }} + name: {{ $servicePort | quote }} +{{- end }} + {{- end }} {{- end }} -- 2.31.1