Update default Kubernetes API for use with Helm v3
Updated Kubernetes api from extensions/v1beta1 to networking.k8s.io/v1beta1 per docs[0] for kubernetes 1.16 deprecations as helm v3 linting will fail when it parses extensions/v1beta1 seen here[1] [0] https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/ [1] https://zuul.opendev.org/t/openstack/build/82f92508fb31418aa377f91d62e0d42e Change-Id: I0439272587a2afbccc4d7c49ef6ad053c8b305e7
This commit is contained in:
parent
3ded481794
commit
67618474ce
@ -15,7 +15,7 @@ apiVersion: v1
|
|||||||
appVersion: v1.0.0
|
appVersion: v1.0.0
|
||||||
description: OpenStack-Helm Helm-Toolkit
|
description: OpenStack-Helm Helm-Toolkit
|
||||||
name: helm-toolkit
|
name: helm-toolkit
|
||||||
version: 0.1.5
|
version: 0.2.0
|
||||||
home: https://docs.openstack.org/openstack-helm
|
home: https://docs.openstack.org/openstack-helm
|
||||||
icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
|
icon: https://www.openstack.org/themes/openstack/images/project-mascots/OpenStack-Helm/OpenStack_Project_OpenStackHelm_vertical.png
|
||||||
sources:
|
sources:
|
||||||
|
@ -62,7 +62,7 @@ examples:
|
|||||||
{{- include "helm-toolkit.manifests.ingress" ( dict "envAll" . "backendServiceType" "key-manager" "backendPort" "b-api" "endpoint" "public" ) -}}
|
{{- include "helm-toolkit.manifests.ingress" ( dict "envAll" . "backendServiceType" "key-manager" "backendPort" "b-api" "endpoint" "public" ) -}}
|
||||||
return: |
|
return: |
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: networking.k8s.io/v1beta1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: barbican
|
name: barbican
|
||||||
@ -94,7 +94,7 @@ examples:
|
|||||||
serviceName: barbican-api
|
serviceName: barbican-api
|
||||||
servicePort: b-api
|
servicePort: b-api
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: networking.k8s.io/v1beta1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: barbican-namespace-fqdn
|
name: barbican-namespace-fqdn
|
||||||
@ -116,7 +116,7 @@ examples:
|
|||||||
serviceName: barbican-api
|
serviceName: barbican-api
|
||||||
servicePort: b-api
|
servicePort: b-api
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: networking.k8s.io/v1beta1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: barbican-cluster-fqdn
|
name: barbican-cluster-fqdn
|
||||||
@ -182,7 +182,7 @@ examples:
|
|||||||
{{- include "helm-toolkit.manifests.ingress" ( dict "envAll" . "backendServiceType" "key-manager" "backendPort" "b-api" "endpoint" "public" ) -}}
|
{{- include "helm-toolkit.manifests.ingress" ( dict "envAll" . "backendServiceType" "key-manager" "backendPort" "b-api" "endpoint" "public" ) -}}
|
||||||
return: |
|
return: |
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: networking.k8s.io/v1beta1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: barbican
|
name: barbican
|
||||||
@ -272,7 +272,7 @@ examples:
|
|||||||
{{- include "helm-toolkit.manifests.ingress" ( dict "envAll" . "backendServiceType" "key-manager" "backendPort" "b-api" "endpoint" "public" "certIssuer" "ca-issuer" ) -}}
|
{{- include "helm-toolkit.manifests.ingress" ( dict "envAll" . "backendServiceType" "key-manager" "backendPort" "b-api" "endpoint" "public" "certIssuer" "ca-issuer" ) -}}
|
||||||
return: |
|
return: |
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: networking.k8s.io/v1beta1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: barbican
|
name: barbican
|
||||||
@ -365,7 +365,7 @@ examples:
|
|||||||
{{- include "helm-toolkit.manifests.ingress" ( dict "envAll" . "backendServiceType" "key-manager" "backendPort" "b-api" "endpoint" "public" "certIssuer" "ca-issuer" "certIssuer" "cluster-issuer") -}}
|
{{- include "helm-toolkit.manifests.ingress" ( dict "envAll" . "backendServiceType" "key-manager" "backendPort" "b-api" "endpoint" "public" "certIssuer" "ca-issuer" "certIssuer" "cluster-issuer") -}}
|
||||||
return: |
|
return: |
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: networking.k8s.io/v1beta1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: barbican
|
name: barbican
|
||||||
@ -440,7 +440,7 @@ examples:
|
|||||||
{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
|
{{ $ingressOpts | include "helm-toolkit.manifests.ingress" }}
|
||||||
return: |
|
return: |
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: networking.k8s.io/v1beta1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: grafana
|
name: grafana
|
||||||
@ -472,7 +472,7 @@ examples:
|
|||||||
serviceName: grafana-dashboard
|
serviceName: grafana-dashboard
|
||||||
servicePort: dashboard
|
servicePort: dashboard
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: networking.k8s.io/v1beta1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: grafana-namespace-fqdn
|
name: grafana-namespace-fqdn
|
||||||
@ -502,7 +502,7 @@ examples:
|
|||||||
serviceName: grafana-dashboard
|
serviceName: grafana-dashboard
|
||||||
servicePort: dashboard
|
servicePort: dashboard
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: networking.k8s.io/v1beta1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: grafana-cluster-fqdn
|
name: grafana-cluster-fqdn
|
||||||
@ -563,7 +563,7 @@ examples:
|
|||||||
{{- $hostName := tuple $backendServiceType $endpoint $envAll | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}
|
{{- $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" }}
|
{{- $hostNameFull := tuple $backendServiceType $endpoint $envAll | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: networking.k8s.io/v1beta1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ $ingressName }}
|
name: {{ $ingressName }}
|
||||||
@ -613,7 +613,7 @@ spec:
|
|||||||
{{- range $key2, $ingressController := tuple "namespace" "cluster" }}
|
{{- range $key2, $ingressController := tuple "namespace" "cluster" }}
|
||||||
{{- $vHosts := list $hostNameFull }}
|
{{- $vHosts := list $hostNameFull }}
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: networking.k8s.io/v1beta1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-%s-%s" $ingressName $ingressController "fqdn" }}
|
name: {{ printf "%s-%s-%s" $ingressName $ingressController "fqdn" }}
|
||||||
|
@ -15,7 +15,7 @@ apiVersion: v1
|
|||||||
appVersion: v0.32.0
|
appVersion: v0.32.0
|
||||||
description: OpenStack-Helm Ingress Controller
|
description: OpenStack-Helm Ingress Controller
|
||||||
name: ingress
|
name: ingress
|
||||||
version: 0.1.2
|
version: 0.2.0
|
||||||
home: https://github.com/kubernetes/ingress
|
home: https://github.com/kubernetes/ingress
|
||||||
sources:
|
sources:
|
||||||
- https://github.com/kubernetes/ingress
|
- https://github.com/kubernetes/ingress
|
||||||
|
@ -19,7 +19,7 @@ limitations under the License.
|
|||||||
{{- $_ := set .Values.network.ingress.annotations "kubernetes.io/ingress.class" .Values.deployment.cluster.class -}}
|
{{- $_ := set .Values.network.ingress.annotations "kubernetes.io/ingress.class" .Values.deployment.cluster.class -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: networking.k8s.io/v1beta1
|
||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ .Release.Namespace }}-{{ .Release.Name }}
|
name: {{ .Release.Namespace }}-{{ .Release.Name }}
|
||||||
|
Loading…
Reference in New Issue
Block a user