airship/promenade
Code Issues Proposed changes

Update examples to use new image/repo locations

Browse Source 
Change-Id: I284369af2f822c559afbd9ffaf0b1df537baa533
This commit is contained in:
Mark Burnett 2018-06-25 10:37:13 -05:00
parent 0d75314699
commit eb13fe8e46
10 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/basic/Genesis.yaml
View File

@ -29,7 +29,7 @@ data:
- promenade-genesis=enabled - promenade-genesis=enabled
- ucp-control-plane=enabled - ucp-control-plane=enabled
images: images:
armada: quay.io/attcomdev/armada:latest armada: quay.io/airshipit/armada:master
helm: helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.7.2 tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
kubernetes: kubernetes:

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

@ -1155,7 +1155,7 @@ data:
node_selector_value: enabled node_selector_value: enabled
source: source:
type: git type: git
location: https://github.com/att-comdev/armada location: https://github.com/openstack/airship-armada
subpath: charts/tiller subpath: charts/tiller
reference: 8d1521e96c6b3163f7f6598ef15a11af0052cf04 reference: 8d1521e96c6b3163f7f6598ef15a11af0052cf04
dependencies: dependencies:
@ -1192,7 +1192,7 @@ data:
images: images:
tags: tags:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
promenade: quay.io/attcomdev/promenade:latest promenade: quay.io/airshipit/promenade:master
manifests: manifests:
job_ks_endpoints: false job_ks_endpoints: false
job_ks_service: false job_ks_service: false

2
examples/complete/Genesis.yaml
View File

@ -28,7 +28,7 @@ data:
- promenade-genesis=enabled - promenade-genesis=enabled
- ucp-control-plane=enabled - ucp-control-plane=enabled
images: images:
armada: quay.io/attcomdev/armada:latest armada: quay.io/airshipit/armada:master
helm: helm:
tiller: gcr.io/kubernetes-helm/tiller:v2.7.2 tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
kubernetes: kubernetes:

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

@ -1508,7 +1508,7 @@ data:
export_api_key: sthussey/maas-region-controller:2.3_patchv4 export_api_key: sthussey/maas-region-controller:2.3_patchv4
maas_rack: sthussey/maas-rack-controller:2.3 maas_rack: sthussey/maas-rack-controller:2.3
maas_region: sthussey/maas-region-controller:2.3_patchv4 maas_region: sthussey/maas-region-controller:2.3_patchv4
maas_cache: quay.io/attcomdev/sstream-cache:latest maas_cache: quay.io/airshipit/sstream-cache:master
labels: labels:
rack: rack:
node_selector_key: ucp-control-plane node_selector_key: ucp-control-plane
@ -1547,7 +1547,7 @@ data:
value: 3858a12230ac3c915f300c664f12063f value: 3858a12230ac3c915f300c664f12063f
source: source:
type: git type: git
location: https://github.com/att-comdev/maas location: https://github.com/openstack/airship-maas
subpath: charts/maas subpath: charts/maas
reference: master reference: master
dependencies: dependencies:
@ -1691,7 +1691,7 @@ data:
node_selector_value: enabled node_selector_value: enabled
source: source:
type: git type: git
location: https://github.com/att-comdev/armada location: https://github.com/openstack/airship-armada
subpath: charts/tiller subpath: charts/tiller
reference: master reference: master
dependencies: dependencies:
@ -1718,7 +1718,7 @@ data:
password: sergtsop password: sergtsop
images: images:
tags: tags:
deckhand: quay.io/attcomdev/deckhand:latest deckhand: quay.io/airshipit/deckhand:master
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.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
@ -1738,7 +1738,7 @@ data:
memcache_security_strategy: None memcache_security_strategy: None
source: source:
type: git type: git
location: https://github.com/att-comdev/deckhand location: https://github.com/openstack/airship-deckhand
subpath: charts/deckhand subpath: charts/deckhand
reference: master reference: master
dependencies: dependencies:
@ -1760,9 +1760,9 @@ data:
images: images:
tags: tags:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
drydock: quay.io/attcomdev/drydock:latest drydock: quay.io/airshipit/drydock:master
drydock_db_init: docker.io/postgres:9.5 drydock_db_init: docker.io/postgres:9.5
drydock_db_sync: quay.io/attcomdev/drydock:latest drydock_db_sync: quay.io/airshipit/drydock:master
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
ks_user: docker.io/openstackhelm/heat:newton ks_user: docker.io/openstackhelm/heat:newton
@ -1792,7 +1792,7 @@ data:
ingester: drydock_provisioner.ingester.plugins.yaml.YamlIngester ingester: drydock_provisioner.ingester.plugins.yaml.YamlIngester
source: source:
type: git type: git
location: https://github.com/att-comdev/drydock location: https://github.com/openstack/airship-drydock
subpath: charts/drydock subpath: charts/drydock
reference: master reference: master
dependencies: dependencies:
@ -1826,7 +1826,7 @@ data:
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
ks_user: docker.io/openstackhelm/heat:newton ks_user: docker.io/openstackhelm/heat:newton
promenade: quay.io/attcomdev/promenade:latest promenade: quay.io/airshipit/promenade:master
upgrade: upgrade:
no_hooks: true no_hooks: true
source: source:
@ -1858,7 +1858,7 @@ data:
tiller_namespace: kube-system tiller_namespace: kube-system
images: images:
tags: tags:
api: quay.io/attcomdev/armada:latest api: quay.io/airshipit/armada:master
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.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
@ -1873,7 +1873,7 @@ data:
port: 31903 port: 31903
source: source:
type: git type: git
location: https://github.com/att-comdev/armada location: https://github.com/openstack/airship-armada
subpath: charts/armada subpath: charts/armada
reference: master reference: master
dependencies: dependencies:
@ -1906,13 +1906,13 @@ data:
prod_environment: true prod_environment: true
images: images:
tags: tags:
airflow: quay.io/attcomdev/airflow:latest airflow: quay.io/airshipit/airflow:master
shipyard: quay.io/attcomdev/shipyard:latest shipyard: quay.io/airshipit/shipyard:master
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
shipyard_db_init: docker.io/postgres:9.5 shipyard_db_init: docker.io/postgres:9.5
shipyard_db_sync: quay.io/attcomdev/shipyard:latest shipyard_db_sync: quay.io/airshipit/shipyard:master
airflow_db_init: docker.io/postgres:9.5 airflow_db_init: docker.io/postgres:9.5
airflow_db_sync: quay.io/attcomdev/airflow:latest airflow_db_sync: quay.io/airshipit/airflow:master
ks_user: docker.io/openstackhelm/heat:newton ks_user: docker.io/openstackhelm/heat:newton
ks_service: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton
ks_endpoints: docker.io/openstackhelm/heat:newton ks_endpoints: docker.io/openstackhelm/heat:newton
@ -1933,7 +1933,7 @@ data:
memcache_security_strategy: None memcache_security_strategy: None
source: source:
type: git type: git
location: https://github.com/att-comdev/shipyard location: https://github.com/openstack/airship-shipyard
subpath: charts/shipyard subpath: charts/shipyard
reference: master reference: master
dependencies: dependencies:

2
tools/dev-build.sh
View File

@ -6,7 +6,7 @@ SCRIPT_DIR=$(realpath $(dirname $0))
SOURCE_DIR=$(realpath $SCRIPT_DIR/..) SOURCE_DIR=$(realpath $SCRIPT_DIR/..)
echo === Building image === echo === Building image ===
docker build -t quay.io/attcomdev/promenade:latest ${SOURCE_DIR} docker build -t quay.io/airshipit/promenade:master ${SOURCE_DIR}
export PROMENADE_DEBUG=${PROMENADE_DEBUG:-1} export PROMENADE_DEBUG=${PROMENADE_DEBUG:-1}

4
tools/dev/server.sh
View File

@ -6,7 +6,7 @@ SCRIPT_DIR=$(realpath $(dirname $0))
SOURCE_DIR=$(realpath $SCRIPT_DIR/../..) SOURCE_DIR=$(realpath $SCRIPT_DIR/../..)
echo === Building image === echo === Building image ===
docker build -t quay.io/attcomdev/promenade:latest ${SOURCE_DIR} docker build -t quay.io/airshipit/promenade:master ${SOURCE_DIR}
export PROMENADE_DEBUG=${PROMENADE_DEBUG:-1} export PROMENADE_DEBUG=${PROMENADE_DEBUG:-1}
@ -15,5 +15,5 @@ exec docker run \
--publish 9000:9000 \ --publish 9000:9000 \
--env PROMENADE_DEBUG=${PROMENADE_DEBUG} \ --env PROMENADE_DEBUG=${PROMENADE_DEBUG} \
--volume "${SOURCE_DIR}/etc/promenade/noauth-api-paste.ini":/etc/promenade/api-paste.ini:ro \ --volume "${SOURCE_DIR}/etc/promenade/noauth-api-paste.ini":/etc/promenade/api-paste.ini:ro \
quay.io/attcomdev/promenade:latest \ quay.io/airshipit/promenade:master \
server server

2
tools/g2/lib/config.sh
View File

@ -1,7 +1,7 @@
export TEMP_DIR=${TEMP_DIR:-$(mktemp -d)} export TEMP_DIR=${TEMP_DIR:-$(mktemp -d)}
export BASE_IMAGE_SIZE=${BASE_IMAGE_SIZE:-68719476736} export BASE_IMAGE_SIZE=${BASE_IMAGE_SIZE:-68719476736}
export BASE_IMAGE_URL=${BASE_IMAGE_URL:-https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img} export BASE_IMAGE_URL=${BASE_IMAGE_URL:-https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img}
export IMAGE_PROMENADE=${IMAGE_PROMENADE:-quay.io/attcomdev/promenade:latest} export IMAGE_PROMENADE=${IMAGE_PROMENADE:-quay.io/airshipit/promenade:master}
export NGINX_DIR="${TEMP_DIR}/nginx" export NGINX_DIR="${TEMP_DIR}/nginx"
export NGINX_URL="http://192.168.77.1:7777" export NGINX_URL="http://192.168.77.1:7777"
export PROMENADE_BASE_URL="http://promenade-api.ucp.svc.cluster.local" export PROMENADE_BASE_URL="http://promenade-api.ucp.svc.cluster.local"

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

@ -1,4 +1,4 @@
IMAGE_ARMADA=quay.io/attcomdev/armada:latest IMAGE_ARMADA=quay.io/airshipit/armada:master
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

2
tools/registry/IMAGES
View File

@ -6,7 +6,7 @@ gcr.io/google_containers/k8s-dns-kube-dns-amd64,1.14.4,k8s-dns-kube-dns-amd64
gcr.io/google_containers/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64 gcr.io/google_containers/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64
gcr.io/kubernetes-helm/tiller,v2.7.2,tiller gcr.io/kubernetes-helm/tiller,v2.7.2,tiller
lachlanevenson/k8s-helm,v2.7.2,helm lachlanevenson/k8s-helm,v2.7.2,helm
quay.io/attcomdev/armada,latest,armada quay.io/airshipit/armada,master,armada
quay.io/calico/cni,v1.11.0,calico-cni quay.io/calico/cni,v1.11.0,calico-cni
quay.io/calico/ctl,v1.6.1,calico-ctl quay.io/calico/ctl,v1.6.1,calico-ctl
quay.io/calico/kube-controllers,v1.0.0,calico-kube-controllers quay.io/calico/kube-controllers,v1.0.0,calico-kube-controllers

2
tools/simple-deployment.sh
View File

@ -2,7 +2,7 @@
set -eux set -eux
IMAGE_PROMENADE=${IMAGE_PROMENADE:-quay.io/attcomdev/promenade:latest} IMAGE_PROMENADE=${IMAGE_PROMENADE:-quay.io/airshipit/promenade:master}
PROMENADE_DEBUG=${PROMENADE_DEBUG:-0} PROMENADE_DEBUG=${PROMENADE_DEBUG:-0}
SCRIPT_DIR=$(realpath $(dirname $0)) SCRIPT_DIR=$(realpath $(dirname $0))