airship
/
promenade
Code Issues Proposed changes

Merge "Fix armada and deckhand image tags"

This commit is contained in:
Zuul 2019-09-09 18:33:28 +00:00 committed by Gerrit Code Review
parent bffa2b0cfd 1e133b8e9f
commit 42b8febced
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/basic/Genesis.yaml
View File

@ -45,7 +45,7 @@ data:
- promenade-genesis=enabled - promenade-genesis=enabled
- ucp-control-plane=enabled - ucp-control-plane=enabled
images: images:
armada: quay.io/airshipit/armada:master armada: quay.io/airshipit/armada:master-ubuntu_xenial
helm: helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.14.0 tiller: gcr.io/kubernetes-helm/tiller:v2.14.0
kubernetes: kubernetes:

2
examples/complete/Genesis.yaml
View File

@ -31,7 +31,7 @@ data:
- promenade-genesis=enabled - promenade-genesis=enabled
- ucp-control-plane=enabled - ucp-control-plane=enabled
images: images:
armada: quay.io/airshipit/armada:master armada: quay.io/airshipit/armada:master-ubuntu_xenial
helm: helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.14.0 tiller: gcr.io/kubernetes-helm/tiller:v2.14.0
kubernetes: kubernetes:

4
examples/complete/armada-resources.yaml
View File

@ -1718,7 +1718,7 @@ data:
password: sergtsop password: sergtsop
images: images:
tags: tags:
deckhand: quay.io/airshipit/deckhand:master deckhand: quay.io/airshipit/deckhand:master-ubuntu_xenial
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
db_init: docker.io/postgres:9.5 db_init: docker.io/postgres:9.5
db_sync: docker.io/postgres:9.5 db_sync: docker.io/postgres:9.5
@ -1857,7 +1857,7 @@ data:
tiller_namespace: kube-system tiller_namespace: kube-system
images: images:
tags: tags:
api: quay.io/airshipit/armada:master api: quay.io/airshipit/armada:master-ubuntu_xenial
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
ks_endpoints: docker.io/openstackhelm/heat:newton ks_endpoints: docker.io/openstackhelm/heat:newton
ks_service: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton

2
examples/gate/Genesis.yaml
View File

@ -45,7 +45,7 @@ data:
- promenade-genesis=enabled - promenade-genesis=enabled
- ucp-control-plane=enabled - ucp-control-plane=enabled
images: images:
armada: quay.io/airshipit/armada:master armada: quay.io/airshipit/armada:master-ubuntu_xenial
helm: helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.14.0 tiller: gcr.io/kubernetes-helm/tiller:v2.14.0
kubernetes: kubernetes:

2
tests/unit/api/test_validatedesign.py
View File

@ -101,7 +101,7 @@ VALID_DOCS = [
'hostname': 'hostname':
'n0', 'n0',
'images': { 'images': {
'armada': 'quay.io/airshipit/armada:master', 'armada': 'quay.io/airshipit/armada:master-ubuntu_xenial',
'helm': { 'helm': {
'tiller': 'gcr.io/kubernetes-helm/tiller:v2.14.0' 'tiller': 'gcr.io/kubernetes-helm/tiller:v2.14.0'
}, },

2
tests/unit/builder_data/simple/Genesis.yaml
View File

@ -30,7 +30,7 @@ data:
- promenade-genesis=enabled - promenade-genesis=enabled
- ucp-control-plane=enabled - ucp-control-plane=enabled
images: images:
armada: quay.io/airshipit/armada:master armada: quay.io/airshipit/armada:master-ubuntu_xenial
helm: helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.14.0 tiller: gcr.io/kubernetes-helm/tiller:v2.14.0
kubernetes: kubernetes:

2
tools/gate/default-config-env
View File

@ -1,4 +1,4 @@
IMAGE_ARMADA=quay.io/airshipit/armada:master IMAGE_ARMADA=quay.io/airshipit/armada:master-ubuntu_xenial
IMAGE_CALICO_CNI=quay.io/calico/cni:v1.11.2 IMAGE_CALICO_CNI=quay.io/calico/cni:v1.11.2
IMAGE_CALICO_CTL=quay.io/calico/ctl:v1.6.3 IMAGE_CALICO_CTL=quay.io/calico/ctl:v1.6.3
IMAGE_CALICO_KUBE_CONTROLLERS=quay.io/calico/kube-controllers:v1.0.2 IMAGE_CALICO_KUBE_CONTROLLERS=quay.io/calico/kube-controllers:v1.0.2