diff --git a/helm-toolkit/templates/manifests/_ingress.tpl b/helm-toolkit/templates/manifests/_ingress.tpl index 0c0d395cd1..f0c37fd196 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: networking.k8s.io/v1beta1 + apiVersion: extensions/v1beta1 kind: Ingress metadata: name: barbican @@ -96,7 +96,7 @@ examples: serviceName: barbican-api servicePort: b-api --- - apiVersion: networking.k8s.io/v1beta1 + apiVersion: extensions/v1beta1 kind: Ingress metadata: name: barbican-namespace-fqdn @@ -118,7 +118,7 @@ examples: serviceName: barbican-api servicePort: b-api --- - apiVersion: networking.k8s.io/v1beta1 + apiVersion: extensions/v1beta1 kind: Ingress metadata: name: barbican-cluster-fqdn @@ -184,7 +184,7 @@ examples: {{- include "helm-toolkit.manifests.ingress" ( dict "envAll" . "backendServiceType" "key-manager" "backendPort" "b-api" "endpoint" "public" ) -}} return: | --- - apiVersion: networking.k8s.io/v1beta1 + apiVersion: extensions/v1beta1 kind: Ingress metadata: name: barbican @@ -247,7 +247,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: networking.k8s.io/v1beta1 +apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ $ingressName }} @@ -282,7 +282,7 @@ spec: {{- range $key2, $ingressController := tuple "namespace" "cluster" }} {{- $hostNameFullRules := dict "vHost" $hostNameFull "backendName" $backendName "backendPort" $backendPort }} --- -apiVersion: networking.k8s.io/v1beta1 +apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ printf "%s-%s-%s" $ingressName $ingressController "fqdn" }} diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml index 8ff7ccc3c2..c9977e14f3 100644 --- a/ingress/templates/deployment-ingress.yaml +++ b/ingress/templates/deployment-ingress.yaml @@ -60,7 +60,6 @@ rules: - watch - apiGroups: - "extensions" - - "networking.k8s.io" resources: - ingresses verbs: diff --git a/ingress/templates/ingress.yaml b/ingress/templates/ingress.yaml index 16e62ac6ab..16ebaab3d5 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: networking.k8s.io/v1beta1 +apiVersion: extensions/v1beta1 kind: Ingress metadata: name: {{ .Release.Namespace }}-{{ .Release.Name }}