summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Wilkerson <wilkers.steve@gmail.com>2019-01-24 08:52:12 -0600
committerKaspars Skels <kaspars.skels@gmail.com>2019-02-08 23:45:56 +0000
commit21adfe01c2c8a7b3162e7309b92381c62cb874d4 (patch)
treeb72be5439185bd94b9f1bbdc55b74bfc49687233
parent4f85660f1aaba1605fccd2b6766650dab88aaa11 (diff)
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/
Notes
Notes (review): Code-Review+1: Drew Walters <drewwalters96@gmail.com> Code-Review+2: Sean Eagan <sean.eagan@att.com> Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> Workflow+1: Kaspars Skels <kaspars.skels@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Sat, 09 Feb 2019 04:13:25 +0000 Reviewed-on: https://review.openstack.org/633007 Project: openstack/airship-treasuremap Branch: refs/heads/master
-rw-r--r--.zuul.yaml2
-rwxr-xr-xtools/deployment/airskiff/developer/005-make-airship.sh5
-rwxr-xr-xtools/deployment/airskiff/developer/030-armada-bootstrap.sh3
-rw-r--r--tools/deployment/airskiff/manifests/airship.yaml3
4 files changed, 2 insertions, 11 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 87644e8..554284e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -45,8 +45,6 @@
45 post-run: tools/gate/playbooks/debug-report.yaml 45 post-run: tools/gate/playbooks/debug-report.yaml
46 required-projects: 46 required-projects:
47 - name: openstack/airship-armada 47 - name: openstack/airship-armada
48 # NOTE(drewwalters96): Temporarily pin Armada to K8s v2.11.0.
49 override-checkout: dd75474d78e69f3634eb94c8ea6730b898e83277
50 - name: openstack/airship-deckhand 48 - name: openstack/airship-deckhand
51 - name: openstack/airship-pegleg 49 - name: openstack/airship-pegleg
52 - name: openstack/airship-shipyard 50 - name: openstack/airship-shipyard
diff --git a/tools/deployment/airskiff/developer/005-make-airship.sh b/tools/deployment/airskiff/developer/005-make-airship.sh
index 9010711..e874d82 100755
--- a/tools/deployment/airskiff/developer/005-make-airship.sh
+++ b/tools/deployment/airskiff/developer/005-make-airship.sh
@@ -25,10 +25,7 @@ CURRENT_DIR="$(pwd)"
25 25
26cd ${INSTALL_PATH} 26cd ${INSTALL_PATH}
27git clone https://git.openstack.org/openstack/airship-armada.git 27git clone https://git.openstack.org/openstack/airship-armada.git
28cd airship-armada 28cd airship-armada && make images
29# NOTE(drewwalters96): Temporarily pin Armada to K8s v2.11.0.
30git checkout dd75474d78e69f3634eb94c8ea6730b898e83277
31make images IMAGE_TAG=dd75474d78e69f3634eb94c8ea6730b898e83277
32 29
33cd ${INSTALL_PATH} 30cd ${INSTALL_PATH}
34git clone https://git.openstack.org/openstack/airship-deckhand.git 31git clone https://git.openstack.org/openstack/airship-deckhand.git
diff --git a/tools/deployment/airskiff/developer/030-armada-bootstrap.sh b/tools/deployment/airskiff/developer/030-armada-bootstrap.sh
index e453ad3..8177f3e 100755
--- a/tools/deployment/airskiff/developer/030-armada-bootstrap.sh
+++ b/tools/deployment/airskiff/developer/030-armada-bootstrap.sh
@@ -20,10 +20,9 @@ set -xe
20: "${INSTALL_PATH:="$(pwd)/../"}" 20: "${INSTALL_PATH:="$(pwd)/../"}"
21 21
22# Download latest Armada image and deploy Airship components 22# Download latest Armada image and deploy Airship components
23# NOTE(drewwalters96): Temporarily pin Armada to K8s v2.11.0.
24docker run --rm --net host -p 8000:8000 --name armada \ 23docker run --rm --net host -p 8000:8000 --name armada \
25 -v ~/.kube/config:/armada/.kube/config \ 24 -v ~/.kube/config:/armada/.kube/config \
26 -v "$(pwd)"/tools/deployment/airskiff/manifests/:/manifests \ 25 -v "$(pwd)"/tools/deployment/airskiff/manifests/:/manifests \
27 -v "${INSTALL_PATH}":/airship-components \ 26 -v "${INSTALL_PATH}":/airship-components \
28 quay.io/airshipit/armada:dd75474d78e69f3634eb94c8ea6730b898e83277 \ 27 quay.io/airshipit/armada:latest \
29 apply /manifests/airship.yaml 28 apply /manifests/airship.yaml
diff --git a/tools/deployment/airskiff/manifests/airship.yaml b/tools/deployment/airskiff/manifests/airship.yaml
index be9cdc9..c10f0fe 100644
--- a/tools/deployment/airskiff/manifests/airship.yaml
+++ b/tools/deployment/airskiff/manifests/airship.yaml
@@ -239,9 +239,6 @@ data:
239 labels: 239 labels:
240 release_group: airship-armada 240 release_group: airship-armada
241 values: 241 values:
242 images:
243 tags:
244 api: 'quay.io/airshipit/armada:dd75474d78e69f3634eb94c8ea6730b898e83277'
245 conf: 242 conf:
246 armada: 243 armada:
247 keystone_authtoken: 244 keystone_authtoken: