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/
This commit is contained in:
Steve Wilkerson 2019-01-24 08:52:12 -06:00 committed by Kaspars Skels
parent 4f85660f1a
commit 21adfe01c2
4 changed files with 2 additions and 11 deletions

View File

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

View File

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

View File

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

View File

@ -239,9 +239,6 @@ data:
labels:
release_group: airship-armada
values:
images:
tags:
api: 'quay.io/airshipit/armada:dd75474d78e69f3634eb94c8ea6730b898e83277'
conf:
armada:
keystone_authtoken: