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>
2023-08-31 04:55:16 +00:00 · 2023-08-31 04:55:16 +00:00 · 8d285a46a4
parent b4e463ae4e
commit 8d285a46a4
16 changed files with 139 additions and 10 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@ -170,6 +170,7 @@
    nodeset: treasuremap-single-node-ubuntu-focal
    description: |
      Deploy Memcached using Airskiff and latest Treasuremap changes.
+      Airskiff is using latest Airship v1.x based on Airflow-2.6.2
    voting: true
    timeout: 9600
    pre-run:
@ -179,7 +180,11 @@
    run: tools/gate/playbooks/airskiff-deploy-gate.yaml
    post-run: tools/gate/playbooks/debug-report.yaml
    vars:
-       site: airskiff
+      site: airskiff
+      HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz
+      HTK_COMMIT: ae91cf3fc3f288b6d92ace4a3a405606a653638f
+      OSH_INFRA_COMMIT: 56dd4fdb848adbe44f8e76c70b7593b92e933e29
+      OSH_COMMIT: 75c30f43db44218e7842611e880fd8d7a30fa79c
    irrelevant-files:
      - ^.*\.rst$
      - ^doc/.*$
--- a/global/software/charts/kubernetes/ingress/ingress.yaml
+++ b/global/software/charts/kubernetes/ingress/ingress.yaml
@ -53,11 +53,23 @@ data:
    deployment:
      mode: cluster
      type: Deployment
+      cluster:
+        class: kube-ingress
+        controllerClass: k8s.io/kube-ingress
+    conf:
+      ingress:
+        proxy-body-size: 20m
    network:
      host_namespace: true
      ingress:
        annotations:
-          nginx.ingress.kubernetes.io/proxy-read-timeout: "603"
+          nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
+        ingressClass:
+          spec:
+            controller: k8s.io/kube-ingress
+        ingress:
+          spec:
+            ingressClassName: kube-ingress
    pod:
      replicas:
        ingress: 1
--- a/global/software/charts/osh-infra/osh-infra-ingress-controller/ingress.yaml
+++ b/global/software/charts/osh-infra/osh-infra-ingress-controller/ingress.yaml
@ -41,7 +41,15 @@ data:
        - type: job
          labels:
            release_group: airship-osh-infra-ingress-controller
+
  values:
+    deployment:
+      cluster:
+        class: osh-infra-ingress
+        controllerClass: k8s.io/osh-infra-ingress
+    conf:
+      ingress:
+        proxy-body-size: 20m
    labels:
      server:
        node_selector_key: openstack-control-plane
@ -53,5 +61,16 @@ data:
      replicas:
        ingress: 2
        error_page: 2
+    network:
+      ingress:
+        annotations:
+          nginx.ingress.kubernetes.io/proxy-body-size: 20m
+          nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
+        ingressClass:
+          spec:
+            controller: k8s.io/osh-infra-ingress
+        ingress:
+          spec:
+            ingressClassName: osh-infra-ingress
  dependencies:
    - osh-helm-toolkit
--- a/global/software/charts/osh/openstack-ingress-controller/ingress.yaml
+++ b/global/software/charts/osh/openstack-ingress-controller/ingress.yaml
@ -43,6 +43,13 @@ data:
          labels:
            release_group: airship-openstack-ingress-controller
  values:
+    deployment:
+      cluster:
+        class: openstack-ingress
+        controllerClass: k8s.io/openstack-ingress
+    conf:
+      ingress:
+        proxy-body-size: 20m
    labels:
      server:
        node_selector_key: openstack-control-plane
@ -54,5 +61,16 @@ data:
      replicas:
        ingress: 2
        error_page: 2
+    network:
+      ingress:
+        annotations:
+          nginx.ingress.kubernetes.io/proxy-body-size: 20m
+          nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
+        ingressClass:
+          spec:
+            controller: k8s.io/openstack-ingress
+        ingress:
+          spec:
+            ingressClassName: openstack-ingress
 ...

--- a/global/software/charts/osh/openstack-tenant-ceph/ceph-ingress.yaml
+++ b/global/software/charts/osh/openstack-tenant-ceph/ceph-ingress.yaml
@ -42,6 +42,10 @@ data:
          labels:
            release_group: airship-tenant-ceph-ingress
  values:
+    deployment:
+      cluster:
+        class: tenant-ceph-ingress
+        controllerClass: k8s.io/tenant-ceph-ingress
    conf:
      ingress:
        proxy-body-size: 20m
@ -61,4 +65,10 @@ data:
        annotations:
          nginx.ingress.kubernetes.io/proxy-body-size: 20m
          nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
+        ingressClass:
+          spec:
+            controller: k8s.io/tenant-ceph-ingress
+        ingress:
+          spec:
+            ingressClassName: tenant-ceph-ingress
 ...
--- a/global/software/charts/ucp/armada/armada.yaml
+++ b/global/software/charts/ucp/armada/armada.yaml
@ -100,4 +100,10 @@ data:
    manifests:
      deployment_tiller: false
      service_tiller_deploy: false
+    network:
+      api:
+        ingress:
+          classes:
+            namespace: "ucp-ingress"
+            cluster: "ucp-ingress"
 ...
--- a/global/software/charts/ucp/ceph/ceph-ingress.yaml
+++ b/global/software/charts/ucp/ceph/ceph-ingress.yaml
@ -45,6 +45,13 @@ data:
    conf:
      ingress:
        proxy-body-size: 20m
+    controller:
+      ingressClass: ceph-ingress
+      ingressClassByName: true
+      ingressClassResource:
+        controllerValue: k8s.io/ceph-ingress
+        enabled: false
+        name: ceph-ingress
    labels:
      server:
        node_selector_key: ucp-control-plane
--- a/global/software/charts/ucp/core/ingress.yaml
+++ b/global/software/charts/ucp/core/ingress.yaml
@ -42,6 +42,10 @@ data:
          labels:
            release_group: airship-ingress
  values:
+    deployment:
+      cluster:
+        class: ucp-ingress
+        controllerClass: k8s.io/ucp-ingress
    conf:
      ingress:
        proxy-body-size: 20m
@ -61,4 +65,10 @@ data:
        annotations:
          nginx.ingress.kubernetes.io/proxy-body-size: 20m
          nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
+        ingressClass:
+          spec:
+            controller: k8s.io/ucp-ingress
+        ingress:
+          spec:
+            ingressClassName: ucp-ingress
 ...
--- a/global/software/charts/ucp/deckhand/barbican.yaml
+++ b/global/software/charts/ucp/deckhand/barbican.yaml
@ -234,4 +234,10 @@ data:
    pod:
      replicas:
        api: 2
+    network:
+      api:
+        ingress:
+          classes:
+            namespace: "ucp-ingress"
+            cluster: "ucp-ingress"
 ...
--- a/global/software/charts/ucp/deckhand/deckhand.yaml
+++ b/global/software/charts/ucp/deckhand/deckhand.yaml
@ -147,4 +147,10 @@ data:
          use_syslog: true
        keystone_authtoken:
          memcache_security_strategy: None
+    network:
+      api:
+        ingress:
+          classes:
+            namespace: "ucp-ingress"
+            cluster: "ucp-ingress"
 ...
--- a/global/software/charts/ucp/keystone/keystone.yaml
+++ b/global/software/charts/ucp/keystone/keystone.yaml
@ -215,6 +215,11 @@ data:
      job:
        node_selector_key: ucp-control-plane
        node_selector_value: enabled
-
+    network:
+      api:
+        ingress:
+          classes:
+            namespace: "ucp-ingress"
+            cluster: "ucp-ingress"

 ...
--- a/global/software/charts/ucp/shipyard/shipyard.yaml
+++ b/global/software/charts/ucp/shipyard/shipyard.yaml
@ -278,4 +278,15 @@ data:
          memcache_security_strategy: None
    logrotate:
      percent_max_log_fs_usage: 90
+    network:
+      airflow_webserver_ui:
+        ingress:
+          classes:
+            namespace: "ucp-ingress"
+            cluster: "ucp-ingress"
+      shipyard:
+        ingress:
+          classes:
+            namespace: "ucp-ingress"
+            cluster: "ucp-ingress"
 ...
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@ -522,7 +522,7 @@ data:
        dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
        entrypoint: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
        error_pages: gcr.io/google_containers/defaultbackend:1.0
-        ingress: registry.k8s.io/ingress-nginx/controller:v1.5.1
+        ingress: registry.k8s.io/ingress-nginx/controller:v1.8.2
        ingress_module_init: docker.io/openstackhelm/neutron:xena-ubuntu_focal
        ingress_routed_vip: docker.io/openstackhelm/neutron:xena-ubuntu_focal
        keepalived: docker.io/osixia/keepalived:1.4.5
@ -609,7 +609,7 @@ data:
        test: docker.io/openstackhelm/osh-selenium:latest-ubuntu_bionic
      ingress:
        entrypoint: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-        ingress: registry.k8s.io/ingress-nginx/controller:v1.5.1
+        ingress: registry.k8s.io/ingress-nginx/controller:v1.8.2
        ingress_module_init: docker.io/openstackhelm/neutron:xena-ubuntu_focal
        ingress_routed_vip: docker.io/openstackhelm/neutron:xena-ubuntu_focal
        error_pages: registry.k8s.io/defaultbackend:1.4
@ -638,7 +638,7 @@ data:
        libvirt: docker.io/openstackhelm/libvirt:ubuntu_xenial-20190903
      mariadb:
        mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal
-        ingress: registry.k8s.io/ingress-nginx/controller:v1.5.1
+        ingress: registry.k8s.io/ingress-nginx/controller:v1.8.2
        error_pages: registry.k8s.io/defaultbackend:1.4
        prometheus_create_mysql_user: docker.io/library/mariadb:10.6.14-focal
        prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.12.1
@ -839,7 +839,7 @@ data:
        drydock_db_sync: quay.io/airshipit/drydock:master
      ingress:
        entrypoint: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-        ingress: registry.k8s.io/ingress-nginx/controller:v1.5.1
+        ingress: registry.k8s.io/ingress-nginx/controller:v1.8.2
        ingress_module_init: docker.io/openstackhelm/neutron:xena-ubuntu_focal
        ingress_routed_vip: docker.io/openstackhelm/neutron:xena-ubuntu_focal
        error_pages: registry.k8s.io/defaultbackend:1.4
@ -878,7 +878,7 @@ data:
        maas_syslog: quay.io/airshipit/maas-region-controller:latest
      mariadb:
        mariadb: docker.io/openstackhelm/mariadb:latest-ubuntu_focal
-        ingress: registry.k8s.io/ingress-nginx/controller:v1.5.1
+        ingress: registry.k8s.io/ingress-nginx/controller:v1.8.2
        error_pages: registry.k8s.io/defaultbackend:1.4
        prometheus_create_mysql_user: docker.io/library/mariadb:10.6.14-focal
        prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.12.1
--- a/tools/deployment/airskiff/developer/010-deploy-k8s.sh
+++ b/tools/deployment/airskiff/developer/010-deploy-k8s.sh
@ -25,7 +25,7 @@ if [ -n "${PROXY}" ]; then
 fi

 # Deploy K8s with Minikube
-: "${HELM_VERSION:="v3.11.1"}"
+: "${HELM_VERSION:="v3.12.2"}"
 : "${KUBE_VERSION:="v1.27.3"}"
 : "${MINIKUBE_VERSION:="v1.30.1"}"
 : "${CRICTL_VERSION:="v1.27.0"}"
@ -267,7 +267,7 @@ git clone https://github.com/containernetworking/plugins.git
 pushd plugins
 git checkout v0.8.5
 popd
-for t in 1 2 3 4
+for t in 10 20 30 40
 do
  sleep $t
  if docker pull golang:1.13.8
--- a/tools/deployment/airskiff/developer/015-make-all-charts.sh
+++ b/tools/deployment/airskiff/developer/015-make-all-charts.sh
@ -64,6 +64,9 @@ if [[ ${MAKE_CHARTS_SHIPYARD} = true ]] ; then
 fi
 if [[ ${MAKE_CHARTS_OSH_INFRA} = true ]] ; then
    pushd openstack-helm-infra
+    # REMOVE ME!!!!!
+    git fetch https://review.opendev.org/openstack/openstack-helm-infra refs/changes/55/896955/9 && git checkout FETCH_HEAD
+    #
    make all
    for i in $(find  . -maxdepth 1  -name "*.tgz"  -print | sed -e 's/\-[0-9.]*\.tgz//'| cut -d / -f 2 | sort)
    do
--- a/tools/gate/playbooks/airskiff-deploy-gate.yaml
+++ b/tools/gate/playbooks/airskiff-deploy-gate.yaml
@ -14,10 +14,17 @@

 - hosts: all

+  roles:
+    - role: add-authorized-keys
+      public_keys:
+        - public_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDA7eM8WFJrqQmki8rR0O3QBHyl8xq42jb1RduwuRwjWoGYJI5cX7Fx+7VR4A9ITCoiqxKS8DMfgKbt5jKC6SmvMALULZsnYlthB34KywurgxsW6fgp68DHWQ7J4CCBhoIpl0W3JW7s6b0vHLhab59r0E+AYemBVuWUqbFEy8nDAHcQv1S/2o1udhmljIN7c2ogO4KAJ7Lge0BoIP9ps4u6AVwyQZixp4anU9DHGNA/UQj4M5UyuALj5buEAuATBe9Vqj4sOvZjObPJAGPUrNRrGEWAFk+lSZHRzKXo0eeWtPqoh5UN9UDb5Pocg1krncMIZwjHKovlD1z/O1y91aY5LM1wxm/7aaIiX8eCihyVZaOuDCLF7WDT2SMs7ABcotX2MDtVQTrNNV3MmMAScFNDflzPKszd7cdjLl6PBq8bvPxmCkLmnitPTGOoh9d8i+JlbINvgx1pguYrpeciIyreCO1rjTW3MgB0tyoMEa31V+7HrauBMeNnE68YTqLTIB0= smarkin@mirantis.com
  tasks:
    - name: Clone dependencies
      shell: |
        set -ex
+        export OSH_INFRA_COMMIT={{ OSH_INFRA_COMMIT }}
+        export OSH_COMMIT={{ OSH_COMMIT }}
+
        ./tools/deployment/airskiff/developer/000-clone-dependencies.sh
      args:
        chdir: "{{ zuul.project.src_dir }}"
@ -57,6 +64,10 @@
    - name: Build all charts locally
      shell: |
        set -ex
+
+        export HELM_ARTIFACT_URL={{ HELM_ARTIFACT_URL }}
+        export HTK_COMMIT={{ HTK_COMMIT }}
+
        ./tools/deployment/airskiff/developer/015-make-all-charts.sh
      args:
        chdir: "{{ zuul.project.src_dir }}"