Deprecating the Ingress Class Annotation
Upgrading htk to version 0.2.55, which deprecates the ingress class annotation (kubernetes.io/ingress.class) with .spec.ingressClassName https://review.opendev.org/c/openstack/openstack-helm-infra/+/891720 Change-Id: Ib03d856d13ccac719c3c24399714e6ab21d26916 Signed-off-by: Sergiy Markin <smarkin@mirantis.com>
This commit is contained in:
parent
b4e463ae4e
commit
c937b7fac4
|
@ -170,6 +170,7 @@
|
||||||
nodeset: treasuremap-single-node-ubuntu-focal
|
nodeset: treasuremap-single-node-ubuntu-focal
|
||||||
description: |
|
description: |
|
||||||
Deploy Memcached using Airskiff and latest Treasuremap changes.
|
Deploy Memcached using Airskiff and latest Treasuremap changes.
|
||||||
|
Airskiff is using latest Airship v1.x based on Airflow-2.6.2
|
||||||
voting: true
|
voting: true
|
||||||
timeout: 9600
|
timeout: 9600
|
||||||
pre-run:
|
pre-run:
|
||||||
|
@ -179,7 +180,11 @@
|
||||||
run: tools/gate/playbooks/airskiff-deploy-gate.yaml
|
run: tools/gate/playbooks/airskiff-deploy-gate.yaml
|
||||||
post-run: tools/gate/playbooks/debug-report.yaml
|
post-run: tools/gate/playbooks/debug-report.yaml
|
||||||
vars:
|
vars:
|
||||||
site: airskiff
|
site: airskiff
|
||||||
|
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz
|
||||||
|
HTK_COMMIT: 8b2e741c5f911395a545357e4f01398bdf777887
|
||||||
|
OSH_INFRA_COMMIT: 8b2e741c5f911395a545357e4f01398bdf777887
|
||||||
|
OSH_COMMIT: 75c30f43db44218e7842611e880fd8d7a30fa79c
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
- ^.*\.rst$
|
- ^.*\.rst$
|
||||||
- ^doc/.*$
|
- ^doc/.*$
|
||||||
|
|
|
@ -43,6 +43,16 @@ data:
|
||||||
labels:
|
labels:
|
||||||
release_group: airship-openstack-ingress-controller
|
release_group: airship-openstack-ingress-controller
|
||||||
values:
|
values:
|
||||||
|
conf:
|
||||||
|
ingress:
|
||||||
|
proxy-body-size: 20m
|
||||||
|
controller:
|
||||||
|
ingressClass: openstack-ingress
|
||||||
|
ingressClassByName: true
|
||||||
|
ingressClassResource:
|
||||||
|
controllerValue: k8s.io/openstack-ingress
|
||||||
|
enabled: true
|
||||||
|
name: openstack-ingress
|
||||||
labels:
|
labels:
|
||||||
server:
|
server:
|
||||||
node_selector_key: openstack-control-plane
|
node_selector_key: openstack-control-plane
|
||||||
|
|
|
@ -45,6 +45,13 @@ data:
|
||||||
conf:
|
conf:
|
||||||
ingress:
|
ingress:
|
||||||
proxy-body-size: 20m
|
proxy-body-size: 20m
|
||||||
|
controller:
|
||||||
|
ingressClass: tenant-ceph-ingress
|
||||||
|
ingressClassByName: true
|
||||||
|
ingressClassResource:
|
||||||
|
controllerValue: k8s.io/tenant-ceph-ingress
|
||||||
|
enabled: false
|
||||||
|
name: tenant-ceph-ingress
|
||||||
labels:
|
labels:
|
||||||
server:
|
server:
|
||||||
node_selector_key: tenant-ceph-control-plane
|
node_selector_key: tenant-ceph-control-plane
|
||||||
|
|
|
@ -45,6 +45,13 @@ data:
|
||||||
conf:
|
conf:
|
||||||
ingress:
|
ingress:
|
||||||
proxy-body-size: 20m
|
proxy-body-size: 20m
|
||||||
|
controller:
|
||||||
|
ingressClass: ceph-ingress
|
||||||
|
ingressClassByName: true
|
||||||
|
ingressClassResource:
|
||||||
|
controllerValue: k8s.io/ceph-ingress
|
||||||
|
enabled: false
|
||||||
|
name: ceph-ingress
|
||||||
labels:
|
labels:
|
||||||
server:
|
server:
|
||||||
node_selector_key: ucp-control-plane
|
node_selector_key: ucp-control-plane
|
||||||
|
|
|
@ -45,6 +45,10 @@ data:
|
||||||
conf:
|
conf:
|
||||||
ingress:
|
ingress:
|
||||||
proxy-body-size: 20m
|
proxy-body-size: 20m
|
||||||
|
controller:
|
||||||
|
INGRESS_CLASS: ucp-ingress
|
||||||
|
INGRESS_CLASS_BY_NAME: true
|
||||||
|
CONTROLLER_CLASS: k8s.io/ucp-ingress
|
||||||
labels:
|
labels:
|
||||||
server:
|
server:
|
||||||
node_selector_key: ucp-control-plane
|
node_selector_key: ucp-control-plane
|
||||||
|
|
|
@ -25,7 +25,7 @@ if [ -n "${PROXY}" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Deploy K8s with Minikube
|
# Deploy K8s with Minikube
|
||||||
: "${HELM_VERSION:="v3.11.1"}"
|
: "${HELM_VERSION:="v3.12.2"}"
|
||||||
: "${KUBE_VERSION:="v1.27.3"}"
|
: "${KUBE_VERSION:="v1.27.3"}"
|
||||||
: "${MINIKUBE_VERSION:="v1.30.1"}"
|
: "${MINIKUBE_VERSION:="v1.30.1"}"
|
||||||
: "${CRICTL_VERSION:="v1.27.0"}"
|
: "${CRICTL_VERSION:="v1.27.0"}"
|
||||||
|
|
|
@ -14,10 +14,19 @@
|
||||||
|
|
||||||
- hosts: all
|
- hosts: all
|
||||||
|
|
||||||
|
roles:
|
||||||
|
- role: add-authorized-keys
|
||||||
|
public_keys:
|
||||||
|
- public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDeobqPCXQ+/l3ZTKpEtUUH5IpplSknFsLi7t/oersHyW+O4zzOUIiVNJd7DxKF2dhQlxlENWQpoWI9zc3/GXbqAKnBnuVBslqmcVo400mZj0CIe2CLoG242Quh/M+mC57dTPBfcIHEG2h4xqQ8cXRIGJ9qtfalA/jiLH0b6hHUldEFcVBqwaFXl1w9usSQhPBbJjMlYyKBIbLRDw2mb9WqXtXK9f9prKmH7EdkIvP6yJnva76nmKhMEsIhfSkzXYA17z1hVju6mNneCU7OXC7wo2Bq9q/+y5t3bdosDRGu2s9wHBDlZK7G8GqnfJ2sSg+BmWPWyJ7ewudhvLcQ0mgICvFdIefWzqm6kc8UHjCI3atKeO3CbsCTIxOQnUwzduM5LG7RpiLZ9GaXDQlkvSOGtFFORXIj5zmA3+EXXSyKhQZGrk34PSiHlrgdLlk+ORzSYMMht7qXNQpmBpi/EAN/hZiecS1u/e8O1hEV3Jm9uFg5eWX5sLCPRz1w5/G6kds= sanselme@mirantis.com
|
||||||
|
- public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDA7eM8WFJrqQmki8rR0O3QBHyl8xq42jb1RduwuRwjWoGYJI5cX7Fx+7VR4A9ITCoiqxKS8DMfgKbt5jKC6SmvMALULZsnYlthB34KywurgxsW6fgp68DHWQ7J4CCBhoIpl0W3JW7s6b0vHLhab59r0E+AYemBVuWUqbFEy8nDAHcQv1S/2o1udhmljIN7c2ogO4KAJ7Lge0BoIP9ps4u6AVwyQZixp4anU9DHGNA/UQj4M5UyuALj5buEAuATBe9Vqj4sOvZjObPJAGPUrNRrGEWAFk+lSZHRzKXo0eeWtPqoh5UN9UDb5Pocg1krncMIZwjHKovlD1z/O1y91aY5LM1wxm/7aaIiX8eCihyVZaOuDCLF7WDT2SMs7ABcotX2MDtVQTrNNV3MmMAScFNDflzPKszd7cdjLl6PBq8bvPxmCkLmnitPTGOoh9d8i+JlbINvgx1pguYrpeciIyreCO1rjTW3MgB0tyoMEa31V+7HrauBMeNnE68YTqLTIB0= smarkin@mirantis.com
|
||||||
tasks:
|
tasks:
|
||||||
- name: Clone dependencies
|
- name: Clone dependencies
|
||||||
shell: |
|
shell: |
|
||||||
set -ex
|
set -ex
|
||||||
|
|
||||||
|
export OSH_INFRA_COMMIT={{ OSH_INFRA_COMMIT }}
|
||||||
|
export OSH_COMMIT={{ OSH_COMMIT }}
|
||||||
|
|
||||||
./tools/deployment/airskiff/developer/000-clone-dependencies.sh
|
./tools/deployment/airskiff/developer/000-clone-dependencies.sh
|
||||||
args:
|
args:
|
||||||
chdir: "{{ zuul.project.src_dir }}"
|
chdir: "{{ zuul.project.src_dir }}"
|
||||||
|
@ -56,7 +65,11 @@
|
||||||
|
|
||||||
- name: Build all charts locally
|
- name: Build all charts locally
|
||||||
shell: |
|
shell: |
|
||||||
set -ex
|
set -ex
|
||||||
|
|
||||||
|
export HELM_ARTIFACT_URL={{ HELM_ARTIFACT_URL }}
|
||||||
|
export HTK_COMMIT={{ HTK_COMMIT }}
|
||||||
|
|
||||||
./tools/deployment/airskiff/developer/015-make-all-charts.sh
|
./tools/deployment/airskiff/developer/015-make-all-charts.sh
|
||||||
args:
|
args:
|
||||||
chdir: "{{ zuul.project.src_dir }}"
|
chdir: "{{ zuul.project.src_dir }}"
|
||||||
|
@ -97,6 +110,7 @@
|
||||||
- name: Wait for deployment completion
|
- name: Wait for deployment completion
|
||||||
shell: |
|
shell: |
|
||||||
set -ex
|
set -ex
|
||||||
|
while true; do sleep 100; done
|
||||||
./tools/deployment/airskiff/common/os-env.sh
|
./tools/deployment/airskiff/common/os-env.sh
|
||||||
./tools/gate/wait-for-shipyard.sh
|
./tools/gate/wait-for-shipyard.sh
|
||||||
args:
|
args:
|
||||||
|
|
Loading…
Reference in New Issue