Update helm to 3.12.2
Also this PS updates airskiff deployment playbook based on the latest treasuremap changes and makes sure the airskiff deployment uses freshly built armada image. Change-Id: I913f93d695e4068199e193a5839bf27e257a535e
This commit is contained in:
parent
812546c875
commit
4f43e2cc55
|
@ -118,7 +118,7 @@
|
||||||
- airship/treasuremap
|
- airship/treasuremap
|
||||||
vars:
|
vars:
|
||||||
CLONE_ARMADA: false
|
CLONE_ARMADA: false
|
||||||
OSH_INFRA_COMMIT: 8e96a91ffae745b952c053923aa177e615b49b74
|
OSH_INFRA_COMMIT: 97ce6d7d8e9a090c748800d69a57bbd9af698b60
|
||||||
ARMADA_IMAGE_DISTRO: ubuntu_focal
|
ARMADA_IMAGE_DISTRO: ubuntu_focal
|
||||||
irrelevant-files:
|
irrelevant-files:
|
||||||
- ^.*\.rst$
|
- ^.*\.rst$
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -33,7 +33,7 @@ IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TA
|
||||||
UBUNTU_BASE_IMAGE ?=
|
UBUNTU_BASE_IMAGE ?=
|
||||||
|
|
||||||
# Helm binary download url
|
# Helm binary download url
|
||||||
HELM_ARTIFACT_URL ?= https://get.helm.sh/helm-v3.11.1-linux-amd64.tar.gz
|
HELM_ARTIFACT_URL ?= https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz
|
||||||
|
|
||||||
# VERSION INFO
|
# VERSION INFO
|
||||||
GIT_COMMIT = $(shell git rev-parse HEAD)
|
GIT_COMMIT = $(shell git rev-parse HEAD)
|
||||||
|
|
|
@ -43,20 +43,48 @@
|
||||||
args:
|
args:
|
||||||
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
|
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
|
||||||
|
|
||||||
|
- name: Setup openstack client
|
||||||
|
shell: |
|
||||||
|
./tools/deployment/airskiff/developer/020-setup-client.sh
|
||||||
|
args:
|
||||||
|
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
|
||||||
|
become: yes
|
||||||
|
|
||||||
- name: Build Armada with submitted changes
|
- name: Build Armada with submitted changes
|
||||||
shell: |
|
shell: |
|
||||||
set -ex
|
set -ex
|
||||||
export DISTRO={{ ARMADA_IMAGE_DISTRO }}
|
export DISTRO={{ ARMADA_IMAGE_DISTRO }}
|
||||||
make images
|
make images
|
||||||
if test "${DISTRO}" = 'ubuntu_bionic'
|
docker system prune --force
|
||||||
then
|
|
||||||
# this trick is needed to use bionic image instead of focal in airskiff deployment test
|
|
||||||
docker tag quay.io/airshipit/armada:latest-ubuntu_bionic quay.io/airshipit/armada:latest-ubuntu_focal
|
|
||||||
fi
|
|
||||||
args:
|
args:
|
||||||
chdir: "{{ zuul.project.src_dir }}"
|
chdir: "{{ zuul.project.src_dir }}"
|
||||||
become: yes
|
become: yes
|
||||||
|
|
||||||
|
|
||||||
|
- name: Use locally built images in manifests
|
||||||
|
shell: |
|
||||||
|
set -ex
|
||||||
|
export DISTRO={{ ARMADA_IMAGE_DISTRO }}
|
||||||
|
docker rm registry --force || true
|
||||||
|
docker run -d -p 5000:5000 --restart=always --name registry registry:2
|
||||||
|
if test "${DISTRO}" = 'ubuntu_bionic'
|
||||||
|
then
|
||||||
|
docker tag quay.io/airshipit/armada:latest-ubuntu_bionic localhost:5000/armada:latest-ubuntu_bionic
|
||||||
|
docker push localhost:5000/armada:latest-ubuntu_bionic
|
||||||
|
sed -i "s#quay.io/airshipit/armada:latest-ubuntu_focal#localhost:5000/armada:latest-ubuntu_bionic#g" ./site/airskiff/software/config/versions.yaml
|
||||||
|
sed -i "s#quay.io/airshipit/armada:latest-ubuntu_focal#localhost:5000/armada:latest-ubuntu_bionic#g" ./tools/deployment/airskiff/developer/030-armada-bootstrap.sh
|
||||||
|
sed -i "s#quay.io/airshipit/armada:latest-ubuntu_focal#localhost:5000/armada:latest-ubuntu_bionic#g" ./global/software/config/versions.yaml
|
||||||
|
else
|
||||||
|
docker tag quay.io/airshipit/armada:latest-ubuntu_focal localhost:5000/armada:latest-ubuntu_focal
|
||||||
|
docker push localhost:5000/armada:latest-ubuntu_focal
|
||||||
|
sed -i "s#quay.io/airshipit/armada:latest-ubuntu_focal#localhost:5000/armada:latest-ubuntu_focal#g" ./site/airskiff/software/config/versions.yaml
|
||||||
|
sed -i "s#quay.io/airshipit/armada:latest-ubuntu_focal#localhost:5000/armada:latest-ubuntu_focal#g" ./tools/deployment/airskiff/developer/030-armada-bootstrap.sh
|
||||||
|
sed -i "s#quay.io/airshipit/armada:latest-ubuntu_focal#localhost:5000/armada:latest-ubuntu_focal#g" ./global/software/config/versions.yaml
|
||||||
|
fi
|
||||||
|
args:
|
||||||
|
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
|
||||||
|
become: yes
|
||||||
|
|
||||||
- name: Build all charts locally
|
- name: Build all charts locally
|
||||||
shell: |
|
shell: |
|
||||||
set -ex
|
set -ex
|
||||||
|
@ -65,10 +93,27 @@
|
||||||
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
|
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
|
||||||
become: yes
|
become: yes
|
||||||
|
|
||||||
|
|
||||||
|
- name: Start artifactory
|
||||||
|
shell: |
|
||||||
|
set -ex
|
||||||
|
# start http server with artifacts
|
||||||
|
docker rm artifacts --force || true
|
||||||
|
docker run --name artifacts -p 8282:80 -v $(pwd)/../artifacts:/usr/share/nginx/html -d nginx
|
||||||
|
sleep 10
|
||||||
|
curl --verbose -I http://control-plane.minikube.internal:8282/memcached.tgz
|
||||||
|
args:
|
||||||
|
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
|
||||||
|
become: yes
|
||||||
|
|
||||||
- name: Deploy Airship components using Armada
|
- name: Deploy Airship components using Armada
|
||||||
shell: |
|
shell: |
|
||||||
|
set -x
|
||||||
mkdir -p ~/.kube
|
mkdir -p ~/.kube
|
||||||
cp -rp /home/zuul/.kube/config ~/.kube/config
|
cp -rp /home/zuul/.kube/config ~/.kube/config
|
||||||
|
|
||||||
|
pip3 install packaging
|
||||||
|
|
||||||
./tools/deployment/airskiff/developer/030-armada-bootstrap.sh
|
./tools/deployment/airskiff/developer/030-armada-bootstrap.sh
|
||||||
args:
|
args:
|
||||||
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
|
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
|
||||||
|
@ -76,14 +121,14 @@
|
||||||
|
|
||||||
- name: Deploy Memcached using Airship
|
- name: Deploy Memcached using Airship
|
||||||
shell: |
|
shell: |
|
||||||
./tools/deployment/airskiff/developer/100-deploy-osh.sh
|
./tools/deployment/airskiff/developer/100-deploy-osh.sh
|
||||||
args:
|
args:
|
||||||
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
|
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
|
||||||
become: yes
|
become: yes
|
||||||
|
|
||||||
- name: Wait for deployment completion
|
- name: Wait for deployment completion
|
||||||
shell: |
|
shell: |
|
||||||
./tools/gate/wait-for-shipyard.sh
|
./tools/gate/wait-for-shipyard.sh
|
||||||
args:
|
args:
|
||||||
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
|
chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}"
|
||||||
become: yes
|
become: yes
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
HELM=$1
|
HELM=$1
|
||||||
HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.11.1-linux-amd64.tar.gz"}
|
HELM_ARTIFACT_URL=${HELM_ARTIFACT_URL:-"https://get.helm.sh/helm-v3.12.2-linux-amd64.tar.gz"}
|
||||||
|
|
||||||
|
|
||||||
function install_helm_binary {
|
function install_helm_binary {
|
||||||
|
|
Loading…
Reference in New Issue