airship/armada
Code Issues Proposed changes

Deprecating the Ingress Class Annotation

Browse Source 
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: I304b3239f6d9f1951de03bd821c8ba4c0a5b9a60
Signed-off-by: Anselme, Schubert (sa246v) <sa246v@att.com>
This commit is contained in:
Anselme, Schubert (sa246v) 2023-09-12 09:36:48 -04:00 committed by Sergiy Markin
parent 6595dd83ea
commit 5df69442b0
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.zuul.yaml
View File

@ -61,7 +61,7 @@
run: tools/gate/playbooks/build-charts.yaml run: tools/gate/playbooks/build-charts.yaml
nodeset: armada-single-node-focal nodeset: armada-single-node-focal
vars: vars:
HTK_COMMIT: a7cd689280cdbc0acd04a7a1b745941260e8700b HTK_COMMIT: ae91cf3fc3f288b6d92ace4a3a405606a653638f
- job: - job:
@ -103,8 +103,11 @@
- airship/treasuremap - airship/treasuremap
vars: vars:
CLONE_ARMADA: false CLONE_ARMADA: false
OSH_INFRA_COMMIT: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
ARMADA_IMAGE_DISTRO: ubuntu_focal ARMADA_IMAGE_DISTRO: ubuntu_focal
HELM_ARTIFACT_URL: https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz
HTK_COMMIT: ae91cf3fc3f288b6d92ace4a3a405606a653638f
OSH_INFRA_COMMIT: db3537e56b182a54e7f6931ce57e2a190714019b
OSH_COMMIT: 75c30f43db44218e7842611e880fd8d7a30fa79c
irrelevant-files: irrelevant-files:
- ^.*\.rst$ - ^.*\.rst$
- ^doc/.*$ - ^doc/.*$

4
test-requirements.txt
View File

@ -7,11 +7,11 @@ grpcio-tools>=1.16.0
os-testr>=1.0.0 # Apache-2.0 os-testr>=1.0.0 # Apache-2.0
pyflakes==2.2.0 pyflakes==2.2.0
sphinx-rtd-theme==0.5.0 sphinx-rtd-theme==0.5.0
stestr==3.2.0 stestr==4.1.0
testrepository==0.0.20 testrepository==0.0.20
testresources==2.0.1 testresources==2.0.1
testscenarios==0.5.0 testscenarios==0.5.0
# testtools==2.5.0 # testtools==2.5.0
# tox>=3.28.0, <4.0.0 # tox>=3.28.0, <4.0.0
# typing-extensions>=3.7.2 # typing-extensions>=3.7.2
yapf==0.27.0 yapf==0.27.0

3
tools/gate/playbooks/airskiff-deploy.yaml
View File

@ -34,6 +34,7 @@
shell: | shell: |
export CLONE_ARMADA={{ CLONE_ARMADA }} export CLONE_ARMADA={{ CLONE_ARMADA }}
export OSH_INFRA_COMMIT={{ OSH_INFRA_COMMIT }} 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.projects['opendev.org/airship/treasuremap'].src_dir }}" chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
@ -106,6 +107,8 @@
- 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.projects['opendev.org/airship/treasuremap'].src_dir }}" chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"

2
tools/helm_tk.sh
View File

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