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,10 @@
       - airship/treasuremap
     vars:
       CLONE_SHIPYARD: false
-      HTK_COMMIT: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
       SHIPYARD_IMAGE_DISTRO: ubuntu_focal
+      HTK_COMMIT: 51c70e48dff173281a77d374d87af2c49caa6348
+      OSH_INFRA_COMMIT: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
+      # OSH_COMMIT: a4ee07744e60c283de31fc187abe3a07071d5894
     irrelevant-files: *irrelevant-files
 
 

charts/shipyard/requirements.yaml

@@ -16,4 +16,4 @@
 dependencies:
   - name: helm-toolkit
     repository: file://../deps/helm-toolkit
-    version: ">= 0.1.0"
+    version: ">= 0.2.55"

tools/gate/playbooks/airskiff-deploy.yaml

@@ -23,13 +23,16 @@
     - ensure-docker
 
 
+    - role: add-authorized-keys # FIXME: remove
+      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:
 
-    - name: Install Packaging python module for tools/airship
+    - name: Install Packaging python module for airship
       block:
         - pip:
             name: packaging
-            version: 23.1
             executable: pip3
       become: True
 
@@ -72,14 +75,6 @@
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
       become: yes
 
-    - name: Build all charts locally
-      shell: |
-        set -ex
-        ./tools/deployment/airskiff/developer/015-make-all-charts.sh
-      args:
-        chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
-      become: yes
-
     - name: Build Shipyard and Airflow with submitted changes
       shell: |
         set -ex
@@ -89,7 +84,6 @@
         chdir: "{{ zuul.project.src_dir }}"
       become: yes
 
-
     - name: Use locally built images in manifests
       shell: |
         set -ex
@@ -105,6 +99,14 @@
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
       become: yes
 
+    - name: Build all charts locally
+      shell: |
+        set -ex
+        ./tools/deployment/airskiff/developer/015-make-all-charts.sh
+      args:
+        chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
+      become: yes
+
     - name: Start artifactory
       shell: |
         set -ex
@@ -123,6 +125,7 @@
         set -ex
         mkdir -p ~/.kube
         cp -rp /home/zuul/.kube/config ~/.kube/config
+        while true; do sleep 100; done
         ./tools/deployment/airskiff/developer/030-armada-bootstrap.sh
       args:
         chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"

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"}