From eb13fe8e46aa9a32150e0410973cf57ab867e8f7 Mon Sep 17 00:00:00 2001 From: Mark Burnett Date: Mon, 25 Jun 2018 10:37:13 -0500 Subject: [PATCH] Update examples to use new image/repo locations Change-Id: I284369af2f822c559afbd9ffaf0b1df537baa533 --- examples/basic/Genesis.yaml | 2 +- examples/basic/armada-resources.yaml | 4 ++-- examples/complete/Genesis.yaml | 2 +- examples/complete/armada-resources.yaml | 32 ++++++++++++------------- tools/dev-build.sh | 2 +- tools/dev/server.sh | 4 ++-- tools/g2/lib/config.sh | 2 +- tools/gate/default-config-env | 2 +- tools/registry/IMAGES | 2 +- tools/simple-deployment.sh | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml index 0047bd44..0fb31da9 100644 --- a/examples/basic/Genesis.yaml +++ b/examples/basic/Genesis.yaml @@ -29,7 +29,7 @@ data: - promenade-genesis=enabled - ucp-control-plane=enabled images: - armada: quay.io/attcomdev/armada:latest + armada: quay.io/airshipit/armada:master helm: tiller: gcr.io/kubernetes-helm/tiller:v2.7.2 kubernetes: diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml index 17c0d49d..84f57a40 100644 --- a/examples/basic/armada-resources.yaml +++ b/examples/basic/armada-resources.yaml @@ -1155,7 +1155,7 @@ data: node_selector_value: enabled source: type: git - location: https://github.com/att-comdev/armada + location: https://github.com/openstack/airship-armada subpath: charts/tiller reference: 8d1521e96c6b3163f7f6598ef15a11af0052cf04 dependencies: @@ -1192,7 +1192,7 @@ data: images: tags: dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 - promenade: quay.io/attcomdev/promenade:latest + promenade: quay.io/airshipit/promenade:master manifests: job_ks_endpoints: false job_ks_service: false diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml index 4928b219..ed6f4b81 100644 --- a/examples/complete/Genesis.yaml +++ b/examples/complete/Genesis.yaml @@ -28,7 +28,7 @@ data: - promenade-genesis=enabled - ucp-control-plane=enabled images: - armada: quay.io/attcomdev/armada:latest + armada: quay.io/airshipit/armada:master helm: tiller: gcr.io/kubernetes-helm/tiller:v2.7.2 kubernetes: diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index ae114a5b..837edad3 100644 --- a/examples/complete/armada-resources.yaml +++ b/examples/complete/armada-resources.yaml @@ -1508,7 +1508,7 @@ data: export_api_key: sthussey/maas-region-controller:2.3_patchv4 maas_rack: sthussey/maas-rack-controller:2.3 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: rack: node_selector_key: ucp-control-plane @@ -1547,7 +1547,7 @@ data: value: 3858a12230ac3c915f300c664f12063f source: type: git - location: https://github.com/att-comdev/maas + location: https://github.com/openstack/airship-maas subpath: charts/maas reference: master dependencies: @@ -1691,7 +1691,7 @@ data: node_selector_value: enabled source: type: git - location: https://github.com/att-comdev/armada + location: https://github.com/openstack/airship-armada subpath: charts/tiller reference: master dependencies: @@ -1718,7 +1718,7 @@ data: password: sergtsop images: tags: - deckhand: quay.io/attcomdev/deckhand:latest + deckhand: quay.io/airshipit/deckhand:master dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 db_init: docker.io/postgres:9.5 db_sync: docker.io/postgres:9.5 @@ -1738,7 +1738,7 @@ data: memcache_security_strategy: None source: type: git - location: https://github.com/att-comdev/deckhand + location: https://github.com/openstack/airship-deckhand subpath: charts/deckhand reference: master dependencies: @@ -1760,9 +1760,9 @@ data: images: tags: 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_sync: quay.io/attcomdev/drydock:latest + drydock_db_sync: quay.io/airshipit/drydock:master ks_endpoints: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton ks_user: docker.io/openstackhelm/heat:newton @@ -1792,7 +1792,7 @@ data: ingester: drydock_provisioner.ingester.plugins.yaml.YamlIngester source: type: git - location: https://github.com/att-comdev/drydock + location: https://github.com/openstack/airship-drydock subpath: charts/drydock reference: master dependencies: @@ -1826,7 +1826,7 @@ data: ks_endpoints: docker.io/openstackhelm/heat:newton ks_service: 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: no_hooks: true source: @@ -1858,7 +1858,7 @@ data: tiller_namespace: kube-system images: tags: - api: quay.io/attcomdev/armada:latest + api: quay.io/airshipit/armada:master dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 ks_endpoints: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton @@ -1873,7 +1873,7 @@ data: port: 31903 source: type: git - location: https://github.com/att-comdev/armada + location: https://github.com/openstack/airship-armada subpath: charts/armada reference: master dependencies: @@ -1906,13 +1906,13 @@ data: prod_environment: true images: tags: - airflow: quay.io/attcomdev/airflow:latest - shipyard: quay.io/attcomdev/shipyard:latest + airflow: quay.io/airshipit/airflow:master + shipyard: quay.io/airshipit/shipyard:master dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 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_sync: quay.io/attcomdev/airflow:latest + airflow_db_sync: quay.io/airshipit/airflow:master ks_user: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton ks_endpoints: docker.io/openstackhelm/heat:newton @@ -1933,7 +1933,7 @@ data: memcache_security_strategy: None source: type: git - location: https://github.com/att-comdev/shipyard + location: https://github.com/openstack/airship-shipyard subpath: charts/shipyard reference: master dependencies: diff --git a/tools/dev-build.sh b/tools/dev-build.sh index 1f253a73..8aaac666 100755 --- a/tools/dev-build.sh +++ b/tools/dev-build.sh @@ -6,7 +6,7 @@ SCRIPT_DIR=$(realpath $(dirname $0)) SOURCE_DIR=$(realpath $SCRIPT_DIR/..) 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} diff --git a/tools/dev/server.sh b/tools/dev/server.sh index 79dab91b..484da24a 100755 --- a/tools/dev/server.sh +++ b/tools/dev/server.sh @@ -6,7 +6,7 @@ SCRIPT_DIR=$(realpath $(dirname $0)) SOURCE_DIR=$(realpath $SCRIPT_DIR/../..) 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} @@ -15,5 +15,5 @@ exec docker run \ --publish 9000:9000 \ --env PROMENADE_DEBUG=${PROMENADE_DEBUG} \ --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 diff --git a/tools/g2/lib/config.sh b/tools/g2/lib/config.sh index 1baed6c0..d5013b9b 100644 --- a/tools/g2/lib/config.sh +++ b/tools/g2/lib/config.sh @@ -1,7 +1,7 @@ export TEMP_DIR=${TEMP_DIR:-$(mktemp -d)} 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 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_URL="http://192.168.77.1:7777" export PROMENADE_BASE_URL="http://promenade-api.ucp.svc.cluster.local" diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env index e2792040..a63eddc9 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -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_CTL=quay.io/calico/ctl:v1.6.3 IMAGE_CALICO_KUBE_CONTROLLERS=quay.io/calico/kube-controllers:v1.0.2 diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES index ff95911a..3e11e01d 100644 --- a/tools/registry/IMAGES +++ b/tools/registry/IMAGES @@ -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/kubernetes-helm/tiller,v2.7.2,tiller 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/ctl,v1.6.1,calico-ctl quay.io/calico/kube-controllers,v1.0.0,calico-kube-controllers diff --git a/tools/simple-deployment.sh b/tools/simple-deployment.sh index f8d8daa4..d885d6ad 100755 --- a/tools/simple-deployment.sh +++ b/tools/simple-deployment.sh @@ -2,7 +2,7 @@ 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} SCRIPT_DIR=$(realpath $(dirname $0))