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: I392b9ebaebc696ae07a97b0a5d34c1a433b442ae
Signed-off-by: Anselme, Schubert (sa246v) <sa246v@att.com>

.zuul.yaml

@@ -72,7 +72,7 @@
     run: tools/gate/playbooks/build-charts.yaml
     nodeset: airship-shipyard-single-node-focal
     vars:
-      HTK_COMMIT: a7cd689280cdbc0acd04a7a1b745941260e8700b
+      HTK_COMMIT: 51c70e48dff173281a77d374d87af2c49caa6348
 
 - job:
     name: airship-shipyard-chart-build-latest-htk
@@ -132,8 +132,8 @@
       - airship/treasuremap
     vars:
       CLONE_SHIPYARD: false
-      HTK_COMMIT: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
       SHIPYARD_IMAGE_DISTRO: ubuntu_focal
+      HTK_COMMIT: 51c70e48dff173281a77d374d87af2c49caa6348
     irrelevant-files: *irrelevant-files
 
 

tools/gate/playbooks/airskiff-deploy.yaml

@@ -13,7 +13,6 @@
 # limitations under the License.
 
 - hosts: primary
-
   roles:
     - clear-firewall
     - bindep
@@ -22,17 +21,8 @@
     - ensure-pip
     - ensure-docker
 
-
   tasks:
 
-    - name: Install Packaging python module for tools/airship
-      block:
-        - pip:
-            name: packaging
-            version: 23.1
-            executable: pip3
-      become: True
-
     - name: Clone Required Repositories
       shell: |
         export CLONE_SHIPYARD={{ CLONE_SHIPYARD }}
@@ -49,27 +39,18 @@
 
     - name: Deploy Kubernetes with Minikube
       shell: |
-        set -ex
-        sudo fdisk --list
-        df -h
-        sudo mkdir -p /opt/ext_vol
-        BIG_VOLUME=$(sudo fdisk -l 2>&1 | grep  -E 80G | grep Linux | awk '{print $1}')
-        if ! mount | grep "${BIG_VOLUME}"
-        then
-          sudo mkfs.ext4 "${BIG_VOLUME}"
-          sudo mount "${BIG_VOLUME}" /opt/ext_vol
-          df -h
-        fi
         ./tools/deployment/airskiff/developer/010-deploy-k8s.sh
       args:
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
 
-    - name: Setup OpenStack Client
+    - name: Build Shipyard and Airflow with submitted changes
       shell: |
-        set -ex
-        ./tools/deployment/airskiff/developer/020-setup-client.sh
+        make
+        docker pull quay.io/airshipit/shipyard:latest-ubuntu_bionic
+        docker rm quay.io/airshipit/shipyard:latest-ubuntu_bionic
+        docker tag quay.io/airshipit/shipyard:latest-ubuntu_focal quay.io/airshipit/shipyard:latest-ubuntu_bionic
       args:
-        chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
+        chdir: "{{ zuul.project.src_dir }}"
       become: yes
 
     - name: Build all charts locally
@@ -80,47 +61,8 @@
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
       become: yes
 
-    - name: Build Shipyard and Airflow with submitted changes
-      shell: |
-        set -ex
-        export DISTRO={{ SHIPYARD_IMAGE_DISTRO }}
-        make images
-      args:
-        chdir: "{{ zuul.project.src_dir }}"
-      become: yes
-
-
-    - name: Use locally built images in manifests
-      shell: |
-        set -ex
-        docker rm registry --force || true
-        docker run -d -p 5000:5000 --restart=always --name registry registry:2
-        docker tag quay.io/airshipit/airflow:latest-ubuntu_focal localhost:5000/airflow:latest-ubuntu_focal
-        docker tag quay.io/airshipit/shipyard:latest-ubuntu_focal localhost:5000/shipyard:latest-ubuntu_focal
-        docker push localhost:5000/airflow:latest-ubuntu_focal
-        docker push localhost:5000/shipyard:latest-ubuntu_focal
-        sed -i "s#quay.io/airshipit/airflow:latest-ubuntu_focal#localhost:5000/airflow:latest-ubuntu_focal#g" ./site/airskiff/software/config/versions.yaml
-        sed -i "s#quay.io/airshipit/shipyard:latest-ubuntu_focal#localhost:5000/shipyard:latest-ubuntu_focal#g" ./site/airskiff/software/config/versions.yaml
-      args:
-        chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
-      become: yes
-
-    - name: Start artifactory
-      shell: |
-        set -ex
-        # start http server with artifacts
-        docker rm artifacts --force || true
-        docker run --name artifacts -p 8282:80 -v $(pwd)/../artifacts:/usr/share/nginx/html -d nginx
-        sleep 10
-        curl --verbose -I http://control-plane.minikube.internal:8282/memcached.tgz
-      args:
-        chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
-      become: yes
-
-
     - name: Deploy Airship components using Armada
       shell: |
-        set -ex
         mkdir -p ~/.kube
         cp -rp /home/zuul/.kube/config ~/.kube/config
         ./tools/deployment/airskiff/developer/030-armada-bootstrap.sh
@@ -141,12 +83,3 @@
       args:
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
       become: yes
-
-    - name: Stop artifactory
-      shell: |
-        set -ex
-        # terminate artifactory
-        docker rm artifacts --force || true
-      args:
-        chdir: "{{ zuul.project.src_dir }}"
-      become: yes

tools/helm_tk.sh

@@ -17,7 +17,7 @@
 set -eux
 
 HTK_REPO=${HTK_REPO:-"https://opendev.org/openstack/openstack-helm-infra.git"}
-HTK_STABLE_COMMIT=${HTK_COMMIT:-"a7cd689280cdbc0acd04a7a1b745941260e8700b"}
+HTK_STABLE_COMMIT=${HTK_COMMIT:-"51c70e48dff173281a77d374d87af2c49caa6348"}