From 29f621e1c8b9a004c64acd9d099787d9ca6949f5 Mon Sep 17 00:00:00 2001 From: Yusuke Kuoka Date: Sun, 17 Jul 2022 19:42:35 +0900 Subject: [PATCH] chart: Remove support for extensions/v1beta1 and networking.k8s.io/v1beta1 (#1632) * chart: Remove support for extensions/v1beta1 and networking.k8s.io/v1beta1 `networking.k8s.io/v1` has been available since v1.19. As of today, AWS EKS supports v1.19+ and Oracle Cloud supports v1.20+. GKE and AKS supports v1.21+. The upstream Kubernetes project maintains v1.22+. So it should be safe to remove it now. * fixup! chart: Remove support for extensions/v1beta1 and networking.k8s.io/v1beta1 --- .../templates/githubwebhook.ingress.yaml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/charts/actions-runner-controller/templates/githubwebhook.ingress.yaml b/charts/actions-runner-controller/templates/githubwebhook.ingress.yaml index 922267c5..48baa763 100644 --- a/charts/actions-runner-controller/templates/githubwebhook.ingress.yaml +++ b/charts/actions-runner-controller/templates/githubwebhook.ingress.yaml @@ -1,13 +1,7 @@ {{- if .Values.githubWebhookServer.ingress.enabled -}} {{- $fullName := include "actions-runner-controller-github-webhook-server.fullname" . -}} {{- $svcPort := (index .Values.githubWebhookServer.service.ports 0).port -}} -{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} apiVersion: networking.k8s.io/v1 -{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress" }} -apiVersion: networking.k8s.io/v1beta1 -{{- else if .Capabilities.APIVersions.Has "extensions/v1beta1/Ingress" }} -apiVersion: extensions/v1beta1 -{{- end }} kind: Ingress metadata: name: {{ $fullName }} @@ -42,19 +36,12 @@ spec: {{- end }} {{- range .paths }} - path: {{ .path }} - {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} pathType: {{ .pathType }} - {{- end }} backend: - {{- if $.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} service: name: {{ $fullName }} port: number: {{ $svcPort }} - {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} - {{- end }} {{- end }} {{- end }} {{- end }}