Deprecating the Ingress Class Annotation
This PS replaces deprecated kubernetes.io/ingress.class annotation with spec.ingressClassName field that is a reference to an IngressClass resource that contains additional Ingress configuration, including the name of the Ingress controller. https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#deprecating-the-ingress-class-annotation Change-Id: I9953d966b4f9f7b1692b39f36f434f5055317025 Co-authored-by: Sergiy Markin <smarkin@mirantis.com> Co-authored-by: Leointii Istomin <listomin@mirantis.com> Signed-off-by: Anselme, Schubert (sa246v) <sa246v@att.com>
This commit is contained in:
parent
b76240f1df
commit
51c70e48df
@ -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.2.54
|
version: 0.2.55
|
||||||
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:
|
||||||
|
@ -67,10 +67,10 @@ examples:
|
|||||||
metadata:
|
metadata:
|
||||||
name: barbican
|
name: barbican
|
||||||
annotations:
|
annotations:
|
||||||
kubernetes.io/ingress.class: "nginx"
|
|
||||||
nginx.ingress.kubernetes.io/rewrite-target: /
|
nginx.ingress.kubernetes.io/rewrite-target: /
|
||||||
|
|
||||||
spec:
|
spec:
|
||||||
|
ingressClassName: "nginx"
|
||||||
rules:
|
rules:
|
||||||
- host: barbican
|
- host: barbican
|
||||||
http:
|
http:
|
||||||
@ -108,10 +108,10 @@ examples:
|
|||||||
metadata:
|
metadata:
|
||||||
name: barbican-namespace-fqdn
|
name: barbican-namespace-fqdn
|
||||||
annotations:
|
annotations:
|
||||||
kubernetes.io/ingress.class: "nginx"
|
|
||||||
nginx.ingress.kubernetes.io/rewrite-target: /
|
nginx.ingress.kubernetes.io/rewrite-target: /
|
||||||
|
|
||||||
spec:
|
spec:
|
||||||
|
ingressClassName: "nginx"
|
||||||
tls:
|
tls:
|
||||||
- secretName: barbican-tls-public
|
- secretName: barbican-tls-public
|
||||||
hosts:
|
hosts:
|
||||||
@ -133,10 +133,10 @@ examples:
|
|||||||
metadata:
|
metadata:
|
||||||
name: barbican-cluster-fqdn
|
name: barbican-cluster-fqdn
|
||||||
annotations:
|
annotations:
|
||||||
kubernetes.io/ingress.class: "nginx-cluster"
|
|
||||||
nginx.ingress.kubernetes.io/rewrite-target: /
|
nginx.ingress.kubernetes.io/rewrite-target: /
|
||||||
|
|
||||||
spec:
|
spec:
|
||||||
|
ingressClassName: "nginx-cluster"
|
||||||
tls:
|
tls:
|
||||||
- secretName: barbican-tls-public
|
- secretName: barbican-tls-public
|
||||||
hosts:
|
hosts:
|
||||||
@ -202,10 +202,10 @@ examples:
|
|||||||
metadata:
|
metadata:
|
||||||
name: barbican
|
name: barbican
|
||||||
annotations:
|
annotations:
|
||||||
kubernetes.io/ingress.class: "nginx"
|
|
||||||
nginx.ingress.kubernetes.io/rewrite-target: /
|
nginx.ingress.kubernetes.io/rewrite-target: /
|
||||||
|
|
||||||
spec:
|
spec:
|
||||||
|
ingressClassName: "nginx"
|
||||||
tls:
|
tls:
|
||||||
- secretName: barbican-tls-public
|
- secretName: barbican-tls-public
|
||||||
hosts:
|
hosts:
|
||||||
@ -302,12 +302,12 @@ examples:
|
|||||||
metadata:
|
metadata:
|
||||||
name: barbican
|
name: barbican
|
||||||
annotations:
|
annotations:
|
||||||
kubernetes.io/ingress.class: "nginx"
|
|
||||||
cert-manager.io/issuer: ca-issuer
|
cert-manager.io/issuer: ca-issuer
|
||||||
certmanager.k8s.io/issuer: ca-issuer
|
certmanager.k8s.io/issuer: ca-issuer
|
||||||
nginx.ingress.kubernetes.io/backend-protocol: https
|
nginx.ingress.kubernetes.io/backend-protocol: https
|
||||||
nginx.ingress.kubernetes.io/secure-backends: "true"
|
nginx.ingress.kubernetes.io/secure-backends: "true"
|
||||||
spec:
|
spec:
|
||||||
|
ingressClassName: "nginx"
|
||||||
tls:
|
tls:
|
||||||
- secretName: barbican-tls-public-certmanager
|
- secretName: barbican-tls-public-certmanager
|
||||||
hosts:
|
hosts:
|
||||||
@ -404,12 +404,12 @@ examples:
|
|||||||
metadata:
|
metadata:
|
||||||
name: barbican
|
name: barbican
|
||||||
annotations:
|
annotations:
|
||||||
kubernetes.io/ingress.class: "nginx"
|
|
||||||
cert-manager.io/cluster-issuer: ca-issuer
|
cert-manager.io/cluster-issuer: ca-issuer
|
||||||
certmanager.k8s.io/cluster-issuer: ca-issuer
|
certmanager.k8s.io/cluster-issuer: ca-issuer
|
||||||
nginx.ingress.kubernetes.io/backend-protocol: https
|
nginx.ingress.kubernetes.io/backend-protocol: https
|
||||||
nginx.ingress.kubernetes.io/secure-backends: "true"
|
nginx.ingress.kubernetes.io/secure-backends: "true"
|
||||||
spec:
|
spec:
|
||||||
|
ingressClassName: "nginx"
|
||||||
tls:
|
tls:
|
||||||
- secretName: barbican-tls-public-certmanager
|
- secretName: barbican-tls-public-certmanager
|
||||||
hosts:
|
hosts:
|
||||||
@ -488,10 +488,10 @@ examples:
|
|||||||
metadata:
|
metadata:
|
||||||
name: grafana
|
name: grafana
|
||||||
annotations:
|
annotations:
|
||||||
kubernetes.io/ingress.class: "nginx"
|
|
||||||
nginx.ingress.kubernetes.io/rewrite-target: /
|
nginx.ingress.kubernetes.io/rewrite-target: /
|
||||||
|
|
||||||
spec:
|
spec:
|
||||||
|
ingressClassName: "nginx"
|
||||||
rules:
|
rules:
|
||||||
- host: grafana
|
- host: grafana
|
||||||
http:
|
http:
|
||||||
@ -529,10 +529,10 @@ examples:
|
|||||||
metadata:
|
metadata:
|
||||||
name: grafana-namespace-fqdn
|
name: grafana-namespace-fqdn
|
||||||
annotations:
|
annotations:
|
||||||
kubernetes.io/ingress.class: "nginx"
|
|
||||||
nginx.ingress.kubernetes.io/rewrite-target: /
|
nginx.ingress.kubernetes.io/rewrite-target: /
|
||||||
|
|
||||||
spec:
|
spec:
|
||||||
|
ingressClassName: "nginx"
|
||||||
tls:
|
tls:
|
||||||
- secretName: grafana-tls-public
|
- secretName: grafana-tls-public
|
||||||
hosts:
|
hosts:
|
||||||
@ -565,10 +565,10 @@ examples:
|
|||||||
metadata:
|
metadata:
|
||||||
name: grafana-cluster-fqdn
|
name: grafana-cluster-fqdn
|
||||||
annotations:
|
annotations:
|
||||||
kubernetes.io/ingress.class: "nginx-cluster"
|
|
||||||
nginx.ingress.kubernetes.io/rewrite-target: /
|
nginx.ingress.kubernetes.io/rewrite-target: /
|
||||||
|
|
||||||
spec:
|
spec:
|
||||||
|
ingressClassName: "nginx-cluster"
|
||||||
tls:
|
tls:
|
||||||
- secretName: grafana-tls-public
|
- secretName: grafana-tls-public
|
||||||
hosts:
|
hosts:
|
||||||
@ -639,7 +639,6 @@ kind: Ingress
|
|||||||
metadata:
|
metadata:
|
||||||
name: {{ $ingressName }}
|
name: {{ $ingressName }}
|
||||||
annotations:
|
annotations:
|
||||||
kubernetes.io/ingress.class: {{ index $envAll.Values.network $backendService "ingress" "classes" "namespace" | quote }}
|
|
||||||
{{- if $certIssuer }}
|
{{- if $certIssuer }}
|
||||||
cert-manager.io/{{ $certIssuerType }}: {{ $certIssuer }}
|
cert-manager.io/{{ $certIssuerType }}: {{ $certIssuer }}
|
||||||
certmanager.k8s.io/{{ $certIssuerType }}: {{ $certIssuer }}
|
certmanager.k8s.io/{{ $certIssuerType }}: {{ $certIssuer }}
|
||||||
@ -650,6 +649,7 @@ metadata:
|
|||||||
{{- end }}
|
{{- end }}
|
||||||
{{ toYaml (index $envAll.Values.network $backendService "ingress" "annotations") | indent 4 }}
|
{{ toYaml (index $envAll.Values.network $backendService "ingress" "annotations") | indent 4 }}
|
||||||
spec:
|
spec:
|
||||||
|
ingressClassName: {{ index $envAll.Values.network $backendService "ingress" "classes" "namespace" | quote }}
|
||||||
{{- $host := index $envAll.Values.endpoints ( $backendServiceType | replace "-" "_" ) "hosts" }}
|
{{- $host := index $envAll.Values.endpoints ( $backendServiceType | replace "-" "_" ) "hosts" }}
|
||||||
{{- if $certIssuer }}
|
{{- if $certIssuer }}
|
||||||
{{- $secretName := index $envAll.Values.secrets "tls" ( $backendServiceType | replace "-" "_" ) $backendService $endpoint }}
|
{{- $secretName := index $envAll.Values.secrets "tls" ( $backendServiceType | replace "-" "_" ) $backendService $endpoint }}
|
||||||
@ -695,9 +695,9 @@ kind: Ingress
|
|||||||
metadata:
|
metadata:
|
||||||
name: {{ printf "%s-%s-%s" $ingressName $ingressController "fqdn" }}
|
name: {{ printf "%s-%s-%s" $ingressName $ingressController "fqdn" }}
|
||||||
annotations:
|
annotations:
|
||||||
kubernetes.io/ingress.class: {{ index $envAll.Values.network $backendService "ingress" "classes" $ingressController | quote }}
|
|
||||||
{{ toYaml (index $envAll.Values.network $backendService "ingress" "annotations") | indent 4 }}
|
{{ toYaml (index $envAll.Values.network $backendService "ingress" "annotations") | indent 4 }}
|
||||||
spec:
|
spec:
|
||||||
|
ingressClassName: {{ index $envAll.Values.network $backendService "ingress" "classes" $ingressController | quote }}
|
||||||
{{- $host := index $envAll.Values.endpoints ( $backendServiceType | replace "-" "_" ) "host_fqdn_override" }}
|
{{- $host := index $envAll.Values.endpoints ( $backendServiceType | replace "-" "_" ) "host_fqdn_override" }}
|
||||||
{{- if hasKey $host $endpoint }}
|
{{- if hasKey $host $endpoint }}
|
||||||
{{- $endpointHost := index $host $endpoint }}
|
{{- $endpointHost := index $host $endpoint }}
|
||||||
|
@ -15,7 +15,7 @@ apiVersion: v1
|
|||||||
appVersion: v0.42.0
|
appVersion: v0.42.0
|
||||||
description: OpenStack-Helm Ingress Controller
|
description: OpenStack-Helm Ingress Controller
|
||||||
name: ingress
|
name: ingress
|
||||||
version: 0.2.15
|
version: 0.2.16
|
||||||
home: https://github.com/kubernetes/ingress
|
home: https://github.com/kubernetes/ingress
|
||||||
sources:
|
sources:
|
||||||
- https://github.com/kubernetes/ingress
|
- https://github.com/kubernetes/ingress
|
||||||
|
@ -44,6 +44,7 @@ function start () {
|
|||||||
--status-port=${PORT_STATUS} \
|
--status-port=${PORT_STATUS} \
|
||||||
--default-server-port=${DEFAULT_SERVER_PORT} \
|
--default-server-port=${DEFAULT_SERVER_PORT} \
|
||||||
--election-id=${RELEASE_NAME} \
|
--election-id=${RELEASE_NAME} \
|
||||||
|
--controller-class=${CONTROLLER_CLASS} \
|
||||||
--ingress-class=${INGRESS_CLASS} \
|
--ingress-class=${INGRESS_CLASS} \
|
||||||
--default-backend-service=${POD_NAMESPACE}/${ERROR_PAGE_SERVICE} \
|
--default-backend-service=${POD_NAMESPACE}/${ERROR_PAGE_SERVICE} \
|
||||||
{{- if .Values.conf.default_ssl_certificate.enabled }}
|
{{- if .Values.conf.default_ssl_certificate.enabled }}
|
||||||
|
@ -15,13 +15,21 @@ limitations under the License.
|
|||||||
{{- if .Values.manifests.deployment_ingress }}
|
{{- if .Values.manifests.deployment_ingress }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
|
|
||||||
{{- if empty .Values.conf.controller.INGRESS_CLASS -}}
|
# Evaluate if we are deploying in cluster mode
|
||||||
{{- if eq .Values.deployment.mode "cluster" }}
|
{{- if eq .Values.deployment.mode "cluster" }}
|
||||||
|
# Check INGRESS_CLASS empty
|
||||||
|
{{- if empty .Values.conf.controller.INGRESS_CLASS -}}
|
||||||
{{- $_ := set .Values.conf.controller "INGRESS_CLASS" .Values.deployment.cluster.class -}}
|
{{- $_ := set .Values.conf.controller "INGRESS_CLASS" .Values.deployment.cluster.class -}}
|
||||||
|
{{- end }}
|
||||||
|
# Check CONTROLLER_CLASS empty
|
||||||
|
{{- if empty .Values.conf.controller.CONTROLLER_CLASS -}}
|
||||||
|
{{- $_ := set .Values.conf.controller "CONTROLLER_CLASS" .Values.deployment.cluster.controllerClass -}}
|
||||||
|
{{- end }}
|
||||||
|
# Set default values for INGRESS_CLASS & CONTROLLER_CLASS if deploying in namespace mode
|
||||||
{{- else if eq .Values.deployment.mode "namespace" }}
|
{{- else if eq .Values.deployment.mode "namespace" }}
|
||||||
{{- $_ := set .Values.conf.controller "INGRESS_CLASS" "nginx" -}}
|
{{- $_ := set .Values.conf.controller "INGRESS_CLASS" "nginx" -}}
|
||||||
|
{{- $_ := set .Values.conf.controller "CONTROLLER_CLASS" "k8s.io/nginx-ingress" -}}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end -}}
|
|
||||||
|
|
||||||
{{- $serviceAccountName := printf "%s-%s" .Release.Name "ingress" }}
|
{{- $serviceAccountName := printf "%s-%s" .Release.Name "ingress" }}
|
||||||
{{ tuple $envAll "ingress" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
{{ tuple $envAll "ingress" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
||||||
@ -68,6 +76,7 @@ rules:
|
|||||||
- "networking.k8s.io"
|
- "networking.k8s.io"
|
||||||
resources:
|
resources:
|
||||||
- ingresses
|
- ingresses
|
||||||
|
- ingressclasses
|
||||||
verbs:
|
verbs:
|
||||||
- get
|
- get
|
||||||
- list
|
- list
|
||||||
@ -77,6 +86,7 @@ rules:
|
|||||||
- "networking.k8s.io"
|
- "networking.k8s.io"
|
||||||
resources:
|
resources:
|
||||||
- ingresses/status
|
- ingresses/status
|
||||||
|
- ingressclasses/status
|
||||||
verbs:
|
verbs:
|
||||||
- update
|
- update
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
32
ingress/templates/ingress-class.yaml
Normal file
32
ingress/templates/ingress-class.yaml
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
{{/*
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/}}
|
||||||
|
|
||||||
|
{{- if .Values.manifests.ingressClass }}
|
||||||
|
{{- $envAll := . }}
|
||||||
|
{{- if empty (index .Values.network.ingress.spec "ingressClassName") }}
|
||||||
|
{{- $_ := set .Values.network.ingress.spec "ingressClassName" .Values.deployment.cluster.class -}}
|
||||||
|
{{- end }}
|
||||||
|
{{- if empty (index .Values.network.ingressClass.spec "controller") }}
|
||||||
|
{{- $_ := set .Values.network.ingressClass.spec "controller" .Values.deployment.cluster.controllerClass -}}
|
||||||
|
{{- end }}
|
||||||
|
---
|
||||||
|
apiVersion: networking.k8s.io/v1
|
||||||
|
kind: IngressClass
|
||||||
|
metadata:
|
||||||
|
labels:
|
||||||
|
app.kubernetes.io/component: controller
|
||||||
|
name: {{ index $envAll.Values.network.ingress.spec "ingressClassName" | quote }}
|
||||||
|
spec:
|
||||||
|
controller: {{ index $envAll.Values.network.ingressClass.spec "controller" | quote }}
|
||||||
|
{{- end }}
|
@ -15,8 +15,8 @@ limitations under the License.
|
|||||||
{{- if .Values.manifests.ingress }}
|
{{- if .Values.manifests.ingress }}
|
||||||
{{- $envAll := . }}
|
{{- $envAll := . }}
|
||||||
{{- if eq .Values.deployment.mode "namespace" }}
|
{{- if eq .Values.deployment.mode "namespace" }}
|
||||||
{{- if empty (index .Values.network.ingress.annotations "kubernetes.io/ingress.class") -}}
|
{{- if empty (index .Values.network.ingress.spec "ingressClassName") -}}
|
||||||
{{- $_ := set .Values.network.ingress.annotations "kubernetes.io/ingress.class" .Values.deployment.cluster.class -}}
|
{{- $_ := set .Values.network.ingress.spec "ingressClassName" .Values.deployment.cluster.class -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- $serviceName := tuple "ingress" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" -}}
|
{{- $serviceName := tuple "ingress" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" -}}
|
||||||
{{- $servicePort := tuple "ingress" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" -}}
|
{{- $servicePort := tuple "ingress" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" -}}
|
||||||
@ -25,9 +25,8 @@ apiVersion: networking.k8s.io/v1
|
|||||||
kind: Ingress
|
kind: Ingress
|
||||||
metadata:
|
metadata:
|
||||||
name: {{ .Release.Namespace }}-{{ .Release.Name }}
|
name: {{ .Release.Namespace }}-{{ .Release.Name }}
|
||||||
annotations:
|
|
||||||
{{ toYaml .Values.network.ingress.annotations | indent 4 }}
|
|
||||||
spec:
|
spec:
|
||||||
|
{{ toYaml .Values.network.ingress.spec | indent 2 }}
|
||||||
rules:
|
rules:
|
||||||
- host: {{ printf "%s.%s.svc.%s" "*" .Release.Namespace .Values.endpoints.cluster_domain_suffix | quote }}
|
- host: {{ printf "%s.%s.svc.%s" "*" .Release.Namespace .Values.endpoints.cluster_domain_suffix | quote }}
|
||||||
http:
|
http:
|
||||||
|
@ -21,6 +21,7 @@ deployment:
|
|||||||
type: Deployment
|
type: Deployment
|
||||||
cluster:
|
cluster:
|
||||||
class: "nginx-cluster"
|
class: "nginx-cluster"
|
||||||
|
controllerClass: "k8s.io/nginx-ingress"
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
@ -154,7 +155,12 @@ network:
|
|||||||
# Use .network.vip.addr as an external IP for the service
|
# Use .network.vip.addr as an external IP for the service
|
||||||
# Useful if the CNI or provider can set up routes, etc.
|
# Useful if the CNI or provider can set up routes, etc.
|
||||||
assign_as_external_ip: false
|
assign_as_external_ip: false
|
||||||
|
ingressClass:
|
||||||
|
spec:
|
||||||
|
controller: null
|
||||||
ingress:
|
ingress:
|
||||||
|
spec:
|
||||||
|
ingressClassName: null
|
||||||
node_port:
|
node_port:
|
||||||
enabled: false
|
enabled: false
|
||||||
http_port: 30080
|
http_port: 30080
|
||||||
@ -162,7 +168,6 @@ network:
|
|||||||
annotations:
|
annotations:
|
||||||
# NOTE(portdirect): if left blank this is populated from
|
# NOTE(portdirect): if left blank this is populated from
|
||||||
# .deployment.cluster.class
|
# .deployment.cluster.class
|
||||||
kubernetes.io/ingress.class: null
|
|
||||||
nginx.ingress.kubernetes.io/proxy-body-size: "0"
|
nginx.ingress.kubernetes.io/proxy-body-size: "0"
|
||||||
nginx.ingress.kubernetes.io/configuration-snippet: |
|
nginx.ingress.kubernetes.io/configuration-snippet: |
|
||||||
more_set_headers "X-Content-Type-Options: nosniff";
|
more_set_headers "X-Content-Type-Options: nosniff";
|
||||||
@ -308,6 +313,10 @@ conf:
|
|||||||
# .deployment.cluster.class in cluster mode, or set to
|
# .deployment.cluster.class in cluster mode, or set to
|
||||||
# "nginx" in namespace mode
|
# "nginx" in namespace mode
|
||||||
INGRESS_CLASS: null
|
INGRESS_CLASS: null
|
||||||
|
# NOTE(portdirect): if left blank this is populated from
|
||||||
|
# .deployment.cluster.controllerClass in cluster mode, or set to
|
||||||
|
# "k8s.io/nginx-ingress" in namespace mode
|
||||||
|
CONTROLLER_CLASS: null
|
||||||
ingress:
|
ingress:
|
||||||
enable-underscores-in-headers: "true"
|
enable-underscores-in-headers: "true"
|
||||||
# NOTE(portdirect): if left blank this is populated from
|
# NOTE(portdirect): if left blank this is populated from
|
||||||
@ -348,6 +357,7 @@ manifests:
|
|||||||
deployment_ingress: true
|
deployment_ingress: true
|
||||||
endpoints_ingress: true
|
endpoints_ingress: true
|
||||||
ingress: true
|
ingress: true
|
||||||
|
ingressClass: true
|
||||||
secret_ingress_tls: false
|
secret_ingress_tls: false
|
||||||
secret_dhparam: false
|
secret_dhparam: false
|
||||||
service_error: true
|
service_error: true
|
||||||
|
@ -61,4 +61,5 @@ helm-toolkit:
|
|||||||
- 0.2.52 Decreased random delay to up to 30 seconds and switched remote backup verification protocol to md5
|
- 0.2.52 Decreased random delay to up to 30 seconds and switched remote backup verification protocol to md5
|
||||||
- 0.2.53 Update create db user queries
|
- 0.2.53 Update create db user queries
|
||||||
- 0.2.54 Fix dependency resolver to ignore non-existing dependencyKey when dependencyMixinParam is a slice
|
- 0.2.54 Fix dependency resolver to ignore non-existing dependencyKey when dependencyMixinParam is a slice
|
||||||
|
- 0.2.55 Updated deprecated IngressClass annotation
|
||||||
...
|
...
|
||||||
|
@ -19,4 +19,5 @@ ingress:
|
|||||||
- 0.2.13 Allow setting node_port for the svc
|
- 0.2.13 Allow setting node_port for the svc
|
||||||
- 0.2.14 Replace node-role.kubernetes.io/master with control-plane
|
- 0.2.14 Replace node-role.kubernetes.io/master with control-plane
|
||||||
- 0.2.15 Update kubernetes registry to registry.k8s.io
|
- 0.2.15 Update kubernetes registry to registry.k8s.io
|
||||||
|
- 0.2.16 Updated deprecated IngressClass annotation
|
||||||
...
|
...
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
---
|
---
|
||||||
version:
|
version:
|
||||||
helm: v3.12.0
|
helm: v3.12.2
|
||||||
url:
|
url:
|
||||||
helm_repo: https://get.helm.sh
|
helm_repo: https://get.helm.sh
|
||||||
...
|
...
|
||||||
|
@ -24,8 +24,8 @@ make ingress
|
|||||||
#NOTE: Deploy command
|
#NOTE: Deploy command
|
||||||
: ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
|
: ${OSH_INFRA_EXTRA_HELM_ARGS:=""}
|
||||||
|
|
||||||
#NOTE: Deploy global ingress
|
#NOTE: Deploy global ingress with IngressClass nginx-cluster
|
||||||
tee /tmp/ingress-kube-system.yaml << EOF
|
tee /tmp/ingress-kube-system.yaml <<EOF
|
||||||
deployment:
|
deployment:
|
||||||
mode: cluster
|
mode: cluster
|
||||||
type: DaemonSet
|
type: DaemonSet
|
||||||
@ -42,16 +42,20 @@ helm upgrade --install ingress-kube-system ./ingress \
|
|||||||
./tools/deployment/common/wait-for-pods.sh kube-system
|
./tools/deployment/common/wait-for-pods.sh kube-system
|
||||||
|
|
||||||
#NOTE: Deploy namespace ingress
|
#NOTE: Deploy namespace ingress
|
||||||
|
# NOTE: In namespace osh-infra with IngressClass nginx-osh-infra
|
||||||
helm upgrade --install ingress-osh-infra ./ingress \
|
helm upgrade --install ingress-osh-infra ./ingress \
|
||||||
--namespace=osh-infra \
|
--namespace=osh-infra \
|
||||||
|
--set deployment.cluster.class=nginx-osh-infra \
|
||||||
${OSH_INFRA_EXTRA_HELM_ARGS} \
|
${OSH_INFRA_EXTRA_HELM_ARGS} \
|
||||||
${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
|
${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
|
||||||
|
|
||||||
#NOTE: Wait for deploy
|
#NOTE: Wait for deploy
|
||||||
./tools/deployment/common/wait-for-pods.sh osh-infra
|
./tools/deployment/common/wait-for-pods.sh osh-infra
|
||||||
|
|
||||||
|
# NOTE: In namespace ceph with IngressClass nginx-ceph
|
||||||
helm upgrade --install ingress-ceph ./ingress \
|
helm upgrade --install ingress-ceph ./ingress \
|
||||||
--namespace=ceph \
|
--namespace=ceph \
|
||||||
|
--set deployment.cluster.class=nginx-ceph \
|
||||||
${OSH_INFRA_EXTRA_HELM_ARGS} \
|
${OSH_INFRA_EXTRA_HELM_ARGS} \
|
||||||
${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_CEPH}
|
${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_CEPH}
|
||||||
|
|
||||||
|
@ -17,8 +17,8 @@ set -xe
|
|||||||
#NOTE: Lint and package chart
|
#NOTE: Lint and package chart
|
||||||
make ingress
|
make ingress
|
||||||
|
|
||||||
#NOTE: Deploy global ingress
|
#NOTE: Deploy global ingress with IngressClass nginx-cluster
|
||||||
tee /tmp/ingress-kube-system.yaml << EOF
|
tee /tmp/ingress-kube-system.yaml <<EOF
|
||||||
deployment:
|
deployment:
|
||||||
mode: cluster
|
mode: cluster
|
||||||
type: DaemonSet
|
type: DaemonSet
|
||||||
@ -33,8 +33,10 @@ helm upgrade --install ingress-kube-system ./ingress \
|
|||||||
./tools/deployment/common/wait-for-pods.sh kube-system
|
./tools/deployment/common/wait-for-pods.sh kube-system
|
||||||
|
|
||||||
#NOTE: Deploy namespace ingress
|
#NOTE: Deploy namespace ingress
|
||||||
|
# NOTE: In namespace osh-infra with IngressClass nginx-osh-infra
|
||||||
helm upgrade --install ingress-osh-infra ./ingress \
|
helm upgrade --install ingress-osh-infra ./ingress \
|
||||||
--namespace=osh-infra \
|
--namespace=osh-infra \
|
||||||
|
--set deployment.cluster.class=nginx-osh-infra \
|
||||||
${OSH_INFRA_EXTRA_HELM_ARGS} \
|
${OSH_INFRA_EXTRA_HELM_ARGS} \
|
||||||
${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
|
${OSH_INFRA_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
|
||||||
|
|
||||||
|
@ -17,8 +17,8 @@ set -xe
|
|||||||
#NOTE: Lint and package chart
|
#NOTE: Lint and package chart
|
||||||
make ingress
|
make ingress
|
||||||
|
|
||||||
#NOTE: Deploy global ingress
|
#NOTE: Deploy global ingress with IngressClass nginx-cluster
|
||||||
tee /tmp/ingress-kube-system.yaml << EOF
|
tee /tmp/ingress-kube-system.yaml <<EOF
|
||||||
deployment:
|
deployment:
|
||||||
mode: cluster
|
mode: cluster
|
||||||
type: DaemonSet
|
type: DaemonSet
|
||||||
@ -36,6 +36,7 @@ helm upgrade --install ingress-kube-system ./ingress \
|
|||||||
for NAMESPACE in openstack; do
|
for NAMESPACE in openstack; do
|
||||||
helm upgrade --install ingress-${NAMESPACE} ./ingress \
|
helm upgrade --install ingress-${NAMESPACE} ./ingress \
|
||||||
--namespace=${NAMESPACE} \
|
--namespace=${NAMESPACE} \
|
||||||
|
--set deployment.cluster.class=nginx-${NAMESPACE} \
|
||||||
${OSH_EXTRA_HELM_ARGS} \
|
${OSH_EXTRA_HELM_ARGS} \
|
||||||
${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
|
${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
|
||||||
|
|
||||||
|
@ -35,6 +35,7 @@ cd -
|
|||||||
helm upgrade --install keystone ${OSH_PATH}/keystone \
|
helm upgrade --install keystone ${OSH_PATH}/keystone \
|
||||||
--namespace=openstack \
|
--namespace=openstack \
|
||||||
--values=${OSH_PATH}/keystone/values_overrides/ldap.yaml \
|
--values=${OSH_PATH}/keystone/values_overrides/ldap.yaml \
|
||||||
|
--set network.api.ingress.classes.namespace=nginx-openstack \
|
||||||
${OSH_EXTRA_HELM_ARGS} \
|
${OSH_EXTRA_HELM_ARGS} \
|
||||||
${OSH_EXTRA_HELM_ARGS_KEYSTONE}
|
${OSH_EXTRA_HELM_ARGS_KEYSTONE}
|
||||||
|
|
||||||
|
@ -17,8 +17,8 @@ set -xe
|
|||||||
#NOTE: Lint and package chart
|
#NOTE: Lint and package chart
|
||||||
make ingress
|
make ingress
|
||||||
|
|
||||||
#NOTE: Deploy global ingress
|
#NOTE: Deploy global ingress with IngressClass nginx-cluster
|
||||||
tee /tmp/ingress-kube-system.yaml << EOF
|
tee /tmp/ingress-kube-system.yaml <<EOF
|
||||||
pod:
|
pod:
|
||||||
replicas:
|
replicas:
|
||||||
error_page: 2
|
error_page: 2
|
||||||
@ -40,7 +40,7 @@ helm upgrade --install ingress-kube-system ./ingress \
|
|||||||
#NOTE: Deploy namespaced ingress controllers
|
#NOTE: Deploy namespaced ingress controllers
|
||||||
for NAMESPACE in osh-infra ceph; do
|
for NAMESPACE in osh-infra ceph; do
|
||||||
#NOTE: Deploy namespace ingress
|
#NOTE: Deploy namespace ingress
|
||||||
tee /tmp/ingress-${NAMESPACE}.yaml << EOF
|
tee /tmp/ingress-${NAMESPACE}.yaml <<EOF
|
||||||
pod:
|
pod:
|
||||||
replicas:
|
replicas:
|
||||||
ingress: 2
|
ingress: 2
|
||||||
@ -48,6 +48,7 @@ pod:
|
|||||||
EOF
|
EOF
|
||||||
helm upgrade --install ingress-${NAMESPACE} ./ingress \
|
helm upgrade --install ingress-${NAMESPACE} ./ingress \
|
||||||
--namespace=${NAMESPACE} \
|
--namespace=${NAMESPACE} \
|
||||||
|
--set deployment.cluster.class=nginx-${NAMESPACE} \
|
||||||
--values=/tmp/ingress-${NAMESPACE}.yaml
|
--values=/tmp/ingress-${NAMESPACE}.yaml
|
||||||
|
|
||||||
#NOTE: Wait for deploy
|
#NOTE: Wait for deploy
|
||||||
|
@ -17,8 +17,8 @@ set -xe
|
|||||||
#NOTE: Lint and package chart
|
#NOTE: Lint and package chart
|
||||||
make ingress
|
make ingress
|
||||||
|
|
||||||
#NOTE: Deploy global ingress
|
#NOTE: Deploy global ingress with IngressClass nginx-cluster
|
||||||
tee /tmp/ingress-kube-system.yaml << EOF
|
tee /tmp/ingress-kube-system.yaml <<EOF
|
||||||
deployment:
|
deployment:
|
||||||
mode: cluster
|
mode: cluster
|
||||||
type: DaemonSet
|
type: DaemonSet
|
||||||
@ -36,6 +36,7 @@ helm upgrade --install ingress-kube-system ./ingress \
|
|||||||
for NAMESPACE in ceph openstack; do
|
for NAMESPACE in ceph openstack; do
|
||||||
helm upgrade --install ingress-${NAMESPACE} ./ingress \
|
helm upgrade --install ingress-${NAMESPACE} ./ingress \
|
||||||
--namespace=${NAMESPACE} \
|
--namespace=${NAMESPACE} \
|
||||||
|
--set deployment.cluster.class=nginx-${NAMESPACE} \
|
||||||
${OSH_EXTRA_HELM_ARGS} \
|
${OSH_EXTRA_HELM_ARGS} \
|
||||||
${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
|
${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
|
||||||
|
|
||||||
|
@ -25,6 +25,7 @@ helm upgrade --install rabbitmq ./rabbitmq \
|
|||||||
--namespace=openstack \
|
--namespace=openstack \
|
||||||
--recreate-pods \
|
--recreate-pods \
|
||||||
--force \
|
--force \
|
||||||
|
--set network.management.ingress.classes.namespace=nginx-openstack \
|
||||||
${OSH_INFRA_EXTRA_HELM_ARGS} \
|
${OSH_INFRA_EXTRA_HELM_ARGS} \
|
||||||
${OSH_INFRA_EXTRA_HELM_ARGS_RABBITMQ}
|
${OSH_INFRA_EXTRA_HELM_ARGS_RABBITMQ}
|
||||||
|
|
||||||
|
@ -31,6 +31,10 @@ endpoints:
|
|||||||
network:
|
network:
|
||||||
public: 172.17.0.1/16
|
public: 172.17.0.1/16
|
||||||
cluster: 172.17.0.1/16
|
cluster: 172.17.0.1/16
|
||||||
|
api:
|
||||||
|
ingress:
|
||||||
|
classes:
|
||||||
|
namespace: nginx-openstack
|
||||||
deployment:
|
deployment:
|
||||||
ceph: true
|
ceph: true
|
||||||
rgw_keystone_user_and_endpoints: true
|
rgw_keystone_user_and_endpoints: true
|
||||||
|
@ -46,6 +46,7 @@ EOF
|
|||||||
helm upgrade --install cinder ${OSH_PATH}/cinder \
|
helm upgrade --install cinder ${OSH_PATH}/cinder \
|
||||||
--namespace=openstack \
|
--namespace=openstack \
|
||||||
--values=/tmp/cinder.yaml \
|
--values=/tmp/cinder.yaml \
|
||||||
|
--set network.api.ingress.classes.namespace=nginx-openstack \
|
||||||
${OSH_EXTRA_HELM_ARGS} \
|
${OSH_EXTRA_HELM_ARGS} \
|
||||||
${OSH_EXTRA_HELM_ARGS_CINDER}
|
${OSH_EXTRA_HELM_ARGS_CINDER}
|
||||||
|
|
||||||
|
@ -17,8 +17,8 @@ set -xe
|
|||||||
#NOTE: Lint and package chart
|
#NOTE: Lint and package chart
|
||||||
make ingress
|
make ingress
|
||||||
|
|
||||||
#NOTE: Deploy global ingress
|
#NOTE: Deploy global ingress with IngressClass nginx-cluster
|
||||||
tee /tmp/ingress-kube-system.yaml << EOF
|
tee /tmp/ingress-kube-system.yaml <<EOF
|
||||||
deployment:
|
deployment:
|
||||||
mode: cluster
|
mode: cluster
|
||||||
type: DaemonSet
|
type: DaemonSet
|
||||||
@ -36,6 +36,7 @@ helm upgrade --install ingress-kube-system ./ingress \
|
|||||||
for NAMESPACE in osh-infra ceph; do
|
for NAMESPACE in osh-infra ceph; do
|
||||||
helm upgrade --install ingress-${NAMESPACE} ./ingress \
|
helm upgrade --install ingress-${NAMESPACE} ./ingress \
|
||||||
--namespace=${NAMESPACE} \
|
--namespace=${NAMESPACE} \
|
||||||
|
--set deployment.cluster.class=nginx-${NAMESPACE} \
|
||||||
${OSH_EXTRA_HELM_ARGS} \
|
${OSH_EXTRA_HELM_ARGS} \
|
||||||
${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
|
${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
|
||||||
|
|
||||||
|
@ -17,8 +17,8 @@ set -xe
|
|||||||
#NOTE: Lint and package chart
|
#NOTE: Lint and package chart
|
||||||
make ingress
|
make ingress
|
||||||
|
|
||||||
#NOTE: Deploy global ingress
|
#NOTE: Deploy global ingress with IngressClass nginx-cluster
|
||||||
tee /tmp/ingress-kube-system.yaml << EOF
|
tee /tmp/ingress-kube-system.yaml <<EOF
|
||||||
deployment:
|
deployment:
|
||||||
mode: cluster
|
mode: cluster
|
||||||
type: DaemonSet
|
type: DaemonSet
|
||||||
@ -36,6 +36,7 @@ helm upgrade --install ingress-kube-system ./ingress \
|
|||||||
for NAMESPACE in osh-infra ceph; do
|
for NAMESPACE in osh-infra ceph; do
|
||||||
helm upgrade --install ingress-${NAMESPACE} ./ingress \
|
helm upgrade --install ingress-${NAMESPACE} ./ingress \
|
||||||
--namespace=${NAMESPACE} \
|
--namespace=${NAMESPACE} \
|
||||||
|
--set deployment.cluster.class=nginx-${NAMESPACE} \
|
||||||
${OSH_EXTRA_HELM_ARGS} \
|
${OSH_EXTRA_HELM_ARGS} \
|
||||||
${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
|
${OSH_EXTRA_HELM_ARGS_INGRESS_OPENSTACK}
|
||||||
|
|
||||||
|
@ -27,6 +27,10 @@ endpoints:
|
|||||||
network:
|
network:
|
||||||
public: 172.17.0.1/16
|
public: 172.17.0.1/16
|
||||||
cluster: 172.17.0.1/16
|
cluster: 172.17.0.1/16
|
||||||
|
api:
|
||||||
|
ingress:
|
||||||
|
classes:
|
||||||
|
namespace: nginx-osh-infra
|
||||||
deployment:
|
deployment:
|
||||||
storage_secrets: false
|
storage_secrets: false
|
||||||
ceph: true
|
ceph: true
|
||||||
|
@ -95,7 +95,11 @@ storage:
|
|||||||
client: backup
|
client: backup
|
||||||
options: # list of extra options for s3cmd
|
options: # list of extra options for s3cmd
|
||||||
- --region="default:backup"
|
- --region="default:backup"
|
||||||
|
network:
|
||||||
|
elasticsearch:
|
||||||
|
ingress:
|
||||||
|
classes:
|
||||||
|
namespace: nginx-osh-infra
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
: ${OSH_INFRA_EXTRA_HELM_ARGS_ELASTICSEARCH:="$(./tools/deployment/common/get-values-overrides.sh elasticsearch)"}
|
: ${OSH_INFRA_EXTRA_HELM_ARGS_ELASTICSEARCH:="$(./tools/deployment/common/get-values-overrides.sh elasticsearch)"}
|
||||||
|
@ -22,6 +22,7 @@ make kibana
|
|||||||
#NOTE: Deploy command
|
#NOTE: Deploy command
|
||||||
helm upgrade --install kibana ./kibana \
|
helm upgrade --install kibana ./kibana \
|
||||||
--namespace=osh-infra \
|
--namespace=osh-infra \
|
||||||
|
--set network.kibana.ingress.classes.namespace=nginx-osh-infra \
|
||||||
${OSH_INFRA_EXTRA_HELM_ARGS} \
|
${OSH_INFRA_EXTRA_HELM_ARGS} \
|
||||||
${OSH_INFRA_EXTRA_HELM_ARGS_KIBANA}
|
${OSH_INFRA_EXTRA_HELM_ARGS_KIBANA}
|
||||||
|
|
||||||
|
@ -17,8 +17,8 @@ set -xe
|
|||||||
#NOTE: Lint and package chart
|
#NOTE: Lint and package chart
|
||||||
make ingress
|
make ingress
|
||||||
|
|
||||||
#NOTE: Deploy global ingress
|
#NOTE: Deploy global ingress with IngressClass nginx-cluster
|
||||||
tee /tmp/ingress-kube-system.yaml << EOF
|
tee /tmp/ingress-kube-system.yaml <<EOF
|
||||||
deployment:
|
deployment:
|
||||||
mode: cluster
|
mode: cluster
|
||||||
type: DaemonSet
|
type: DaemonSet
|
||||||
@ -38,7 +38,8 @@ helm upgrade --install ingress-kube-system ./ingress \
|
|||||||
for NAMESPACE in osh-infra ceph tenant-ceph; do
|
for NAMESPACE in osh-infra ceph tenant-ceph; do
|
||||||
#NOTE: Deploy namespace ingress
|
#NOTE: Deploy namespace ingress
|
||||||
helm upgrade --install ingress-${NAMESPACE} ./ingress \
|
helm upgrade --install ingress-${NAMESPACE} ./ingress \
|
||||||
--namespace=${NAMESPACE}
|
--namespace=${NAMESPACE} \
|
||||||
|
--set deployment.cluster.class=nginx-${NAMESPACE}
|
||||||
|
|
||||||
#NOTE: Wait for deploy
|
#NOTE: Wait for deploy
|
||||||
./tools/deployment/common/wait-for-pods.sh ${NAMESPACE}
|
./tools/deployment/common/wait-for-pods.sh ${NAMESPACE}
|
||||||
|
Loading…
Reference in New Issue
Block a user