Browse Source

Airskiff: Unpin Armada

This unpins Armada to references that are compatible with helm
version 2.11.0.  This is no longer required, as the helm version
used in openstack-helm-infra has been updated to 2.12.1, which
addresses the issue requiring armada needing to be pinned in the
airskiff jobs.

Change-Id: Ibef17b8b0e225b1ec04b6aaebd6f1953dd47b31c
See: https://review.openstack.org/#/c/632794/
Steve Wilkerson 2 months ago
parent
commit
21adfe01c2

+ 0
- 2
.zuul.yaml View File

@@ -45,8 +45,6 @@
45 45
     post-run: tools/gate/playbooks/debug-report.yaml
46 46
     required-projects:
47 47
       - name: openstack/airship-armada
48
-        # NOTE(drewwalters96): Temporarily pin Armada to K8s v2.11.0.
49
-        override-checkout: dd75474d78e69f3634eb94c8ea6730b898e83277
50 48
       - name: openstack/airship-deckhand
51 49
       - name: openstack/airship-pegleg
52 50
       - name: openstack/airship-shipyard

+ 1
- 4
tools/deployment/airskiff/developer/005-make-airship.sh View File

@@ -25,10 +25,7 @@ CURRENT_DIR="$(pwd)"
25 25
 
26 26
 cd ${INSTALL_PATH}
27 27
 git clone https://git.openstack.org/openstack/airship-armada.git
28
-cd airship-armada
29
-# NOTE(drewwalters96): Temporarily pin Armada to K8s v2.11.0.
30
-git checkout dd75474d78e69f3634eb94c8ea6730b898e83277
31
-make images IMAGE_TAG=dd75474d78e69f3634eb94c8ea6730b898e83277
28
+cd airship-armada && make images
32 29
 
33 30
 cd ${INSTALL_PATH}
34 31
 git clone https://git.openstack.org/openstack/airship-deckhand.git

+ 1
- 2
tools/deployment/airskiff/developer/030-armada-bootstrap.sh View File

@@ -20,10 +20,9 @@ set -xe
20 20
 : "${INSTALL_PATH:="$(pwd)/../"}"
21 21
 
22 22
 # Download latest Armada image and deploy Airship components
23
-# NOTE(drewwalters96): Temporarily pin Armada to K8s v2.11.0.
24 23
 docker run --rm --net host -p 8000:8000 --name armada \
25 24
     -v ~/.kube/config:/armada/.kube/config \
26 25
     -v "$(pwd)"/tools/deployment/airskiff/manifests/:/manifests \
27 26
     -v "${INSTALL_PATH}":/airship-components \
28
-    quay.io/airshipit/armada:dd75474d78e69f3634eb94c8ea6730b898e83277 \
27
+    quay.io/airshipit/armada:latest \
29 28
     apply /manifests/airship.yaml

+ 0
- 3
tools/deployment/airskiff/manifests/airship.yaml View File

@@ -239,9 +239,6 @@ data:
239 239
     labels:
240 240
       release_group: airship-armada
241 241
   values:
242
-    images:
243
-      tags:
244
-        api: 'quay.io/airshipit/armada:dd75474d78e69f3634eb94c8ea6730b898e83277'
245 242
     conf:
246 243
       armada:
247 244
         keystone_authtoken:

Loading…
Cancel
Save