Browse Source

Merge "Update examples to use new image/repo locations"

Zuul 9 months ago
parent
commit
9a4882ec4e

+ 1
- 1
examples/basic/Genesis.yaml View File

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

+ 2
- 2
examples/basic/armada-resources.yaml View File

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

+ 1
- 1
examples/complete/Genesis.yaml View File

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

+ 16
- 16
examples/complete/armada-resources.yaml View File

@@ -1508,7 +1508,7 @@ data:
1508 1508
         export_api_key: sthussey/maas-region-controller:2.3_patchv4
1509 1509
         maas_rack: sthussey/maas-rack-controller:2.3
1510 1510
         maas_region: sthussey/maas-region-controller:2.3_patchv4
1511
-        maas_cache: quay.io/attcomdev/sstream-cache:latest
1511
+        maas_cache: quay.io/airshipit/sstream-cache:master
1512 1512
     labels:
1513 1513
       rack:
1514 1514
         node_selector_key: ucp-control-plane
@@ -1547,7 +1547,7 @@ data:
1547 1547
         value: 3858a12230ac3c915f300c664f12063f
1548 1548
   source:
1549 1549
     type: git
1550
-    location: https://github.com/att-comdev/maas
1550
+    location: https://github.com/openstack/airship-maas
1551 1551
     subpath: charts/maas
1552 1552
     reference: master
1553 1553
   dependencies:
@@ -1691,7 +1691,7 @@ data:
1691 1691
       node_selector_value: enabled
1692 1692
   source:
1693 1693
     type: git
1694
-    location: https://github.com/att-comdev/armada
1694
+    location: https://github.com/openstack/airship-armada
1695 1695
     subpath: charts/tiller
1696 1696
     reference: master
1697 1697
   dependencies:
@@ -1718,7 +1718,7 @@ data:
1718 1718
             password: sergtsop
1719 1719
     images:
1720 1720
       tags:
1721
-        deckhand: quay.io/attcomdev/deckhand:latest
1721
+        deckhand: quay.io/airshipit/deckhand:master
1722 1722
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
1723 1723
         db_init: docker.io/postgres:9.5
1724 1724
         db_sync: docker.io/postgres:9.5
@@ -1738,7 +1738,7 @@ data:
1738 1738
           memcache_security_strategy: None
1739 1739
   source:
1740 1740
     type: git
1741
-    location: https://github.com/att-comdev/deckhand
1741
+    location: https://github.com/openstack/airship-deckhand
1742 1742
     subpath: charts/deckhand
1743 1743
     reference: master
1744 1744
   dependencies:
@@ -1760,9 +1760,9 @@ data:
1760 1760
     images:
1761 1761
       tags:
1762 1762
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
1763
-        drydock: quay.io/attcomdev/drydock:latest
1763
+        drydock: quay.io/airshipit/drydock:master
1764 1764
         drydock_db_init: docker.io/postgres:9.5
1765
-        drydock_db_sync: quay.io/attcomdev/drydock:latest
1765
+        drydock_db_sync: quay.io/airshipit/drydock:master
1766 1766
         ks_endpoints: docker.io/openstackhelm/heat:newton
1767 1767
         ks_service: docker.io/openstackhelm/heat:newton
1768 1768
         ks_user: docker.io/openstackhelm/heat:newton
@@ -1792,7 +1792,7 @@ data:
1792 1792
           ingester: drydock_provisioner.ingester.plugins.yaml.YamlIngester
1793 1793
   source:
1794 1794
     type: git
1795
-    location: https://github.com/att-comdev/drydock
1795
+    location: https://github.com/openstack/airship-drydock
1796 1796
     subpath: charts/drydock
1797 1797
     reference: master
1798 1798
   dependencies:
@@ -1826,7 +1826,7 @@ data:
1826 1826
         ks_endpoints: docker.io/openstackhelm/heat:newton
1827 1827
         ks_service: docker.io/openstackhelm/heat:newton
1828 1828
         ks_user: docker.io/openstackhelm/heat:newton
1829
-        promenade: quay.io/attcomdev/promenade:latest
1829
+        promenade: quay.io/airshipit/promenade:master
1830 1830
   upgrade:
1831 1831
     no_hooks: true
1832 1832
   source:
@@ -1858,7 +1858,7 @@ data:
1858 1858
           tiller_namespace: kube-system
1859 1859
     images:
1860 1860
       tags:
1861
-        api: quay.io/attcomdev/armada:latest
1861
+        api: quay.io/airshipit/armada:master
1862 1862
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
1863 1863
         ks_endpoints: docker.io/openstackhelm/heat:newton
1864 1864
         ks_service: docker.io/openstackhelm/heat:newton
@@ -1873,7 +1873,7 @@ data:
1873 1873
           port: 31903
1874 1874
   source:
1875 1875
     type: git
1876
-    location: https://github.com/att-comdev/armada
1876
+    location: https://github.com/openstack/airship-armada
1877 1877
     subpath: charts/armada
1878 1878
     reference: master
1879 1879
   dependencies:
@@ -1906,13 +1906,13 @@ data:
1906 1906
     prod_environment: true
1907 1907
     images:
1908 1908
       tags:
1909
-        airflow: quay.io/attcomdev/airflow:latest
1910
-        shipyard: quay.io/attcomdev/shipyard:latest
1909
+        airflow: quay.io/airshipit/airflow:master
1910
+        shipyard: quay.io/airshipit/shipyard:master
1911 1911
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
1912 1912
         shipyard_db_init: docker.io/postgres:9.5
1913
-        shipyard_db_sync: quay.io/attcomdev/shipyard:latest
1913
+        shipyard_db_sync: quay.io/airshipit/shipyard:master
1914 1914
         airflow_db_init: docker.io/postgres:9.5
1915
-        airflow_db_sync: quay.io/attcomdev/airflow:latest
1915
+        airflow_db_sync: quay.io/airshipit/airflow:master
1916 1916
         ks_user: docker.io/openstackhelm/heat:newton
1917 1917
         ks_service: docker.io/openstackhelm/heat:newton
1918 1918
         ks_endpoints: docker.io/openstackhelm/heat:newton
@@ -1933,7 +1933,7 @@ data:
1933 1933
           memcache_security_strategy: None
1934 1934
   source:
1935 1935
     type: git
1936
-    location: https://github.com/att-comdev/shipyard
1936
+    location: https://github.com/openstack/airship-shipyard
1937 1937
     subpath: charts/shipyard
1938 1938
     reference: master
1939 1939
   dependencies:

+ 1
- 1
tools/dev-build.sh View File

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

+ 2
- 2
tools/dev/server.sh View File

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

+ 1
- 1
tools/g2/lib/config.sh View File

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

+ 1
- 1
tools/gate/default-config-env View File

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

+ 1
- 1
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
6 6
 gcr.io/google_containers/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64
7 7
 gcr.io/kubernetes-helm/tiller,v2.7.2,tiller
8 8
 lachlanevenson/k8s-helm,v2.7.2,helm
9
-quay.io/attcomdev/armada,latest,armada
9
+quay.io/airshipit/armada,master,armada
10 10
 quay.io/calico/cni,v1.11.0,calico-cni
11 11
 quay.io/calico/ctl,v1.6.1,calico-ctl
12 12
 quay.io/calico/kube-controllers,v1.0.0,calico-kube-controllers

+ 1
- 1
tools/simple-deployment.sh View File

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

Loading…
Cancel
Save