summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Strassner <strassner.bryan@gmail.com>2018-12-03 16:27:16 -0600
committerBryan Strassner <strassner.bryan@gmail.com>2018-12-03 18:48:46 -0600
commit7a0cbb466eaf9572698cad2efe5b67d50f1654ff (patch)
tree3735953b3291f35af201c898c86ab465ef9d4f1f
parent221441f1bff351ab366b02d6fd7856b70b06108f (diff)
Revert apiserver and promenade updates
Moves the apiserver and Promenade related items back to a better-working state, in closer alignment with airship-treasuremap Change-Id: I4094932a3ef1b574bdd784db3e5feeaa5ce02a00
Notes
Notes (review): Code-Review+2: Aaron Sheffield <ajs@sheffieldfamily.net> Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> Workflow+1: Kaspars Skels <kaspars.skels@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 11 Dec 2018 22:31:36 +0000 Reviewed-on: https://review.openstack.org/621717 Project: openstack/airship-in-a-bottle Branch: refs/heads/master
-rw-r--r--deployment_files/global/v1.0demo/profiles/genesis.yaml5
-rw-r--r--deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml3
-rw-r--r--deployment_files/global/v1.0demo/software/config/versions.yaml31
-rw-r--r--deployment_files/global/v1.0dev/profiles/genesis.yaml5
-rw-r--r--deployment_files/global/v1.0dev/software/charts/kubernetes/core/apiserver.yaml3
-rw-r--r--deployment_files/global/v1.0dev/software/config/versions.yaml28
6 files changed, 27 insertions, 48 deletions
diff --git a/deployment_files/global/v1.0demo/profiles/genesis.yaml b/deployment_files/global/v1.0demo/profiles/genesis.yaml
index 29857a6..7420a83 100644
--- a/deployment_files/global/v1.0demo/profiles/genesis.yaml
+++ b/deployment_files/global/v1.0demo/profiles/genesis.yaml
@@ -91,11 +91,8 @@ data:
91 - --service-cluster-ip-range=SERVICE_CIDR 91 - --service-cluster-ip-range=SERVICE_CIDR
92 - --service-node-port-range=SERVICE_NODE_PORT_RANGE 92 - --service-node-port-range=SERVICE_NODE_PORT_RANGE
93 - --authorization-mode=Node,RBAC 93 - --authorization-mode=Node,RBAC
94 - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds,NodeRestriction,EventRateLimit 94 - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
95 - --endpoint-reconciler-type=lease 95 - --endpoint-reconciler-type=lease
96 # NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
97 - --repair-malformed-updates=false
98
99 armada: 96 armada:
100 target_manifest: cluster-bootstrap 97 target_manifest: cluster-bootstrap
101 labels: 98 labels:
diff --git a/deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml b/deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml
index 45f3f61..89b3fd1 100644
--- a/deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml
@@ -142,9 +142,6 @@ data:
142 - --authorization-mode=Node,RBAC 142 - --authorization-mode=Node,RBAC
143 - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds 143 - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
144 - --endpoint-reconciler-type=lease 144 - --endpoint-reconciler-type=lease
145 # NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
146 - --repair-malformed-updates=false
147
148 dependencies: 145 dependencies:
149 - kubernetes-apiserver-htk 146 - kubernetes-apiserver-htk
150--- 147---
diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index 77ad0e1..ff108dc 100644
--- a/deployment_files/global/v1.0demo/software/config/versions.yaml
+++ b/deployment_files/global/v1.0demo/software/config/versions.yaml
@@ -35,7 +35,7 @@ data:
35 type: git 35 type: git
36 etcd: 36 etcd:
37 location: https://git.openstack.org/openstack/airship-promenade 37 location: https://git.openstack.org/openstack/airship-promenade
38 reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22 38 reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
39 subpath: charts/etcd 39 subpath: charts/etcd
40 type: git 40 type: git
41 etcd-htk: 41 etcd-htk:
@@ -45,7 +45,7 @@ data:
45 type: git 45 type: git
46 controller-manager: 46 controller-manager:
47 location: https://git.openstack.org/openstack/airship-promenade 47 location: https://git.openstack.org/openstack/airship-promenade
48 reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22 48 reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
49 subpath: charts/controller_manager 49 subpath: charts/controller_manager
50 type: git 50 type: git
51 controller-manager-htk: 51 controller-manager-htk:
@@ -55,7 +55,7 @@ data:
55 type: git 55 type: git
56 coredns: 56 coredns:
57 location: https://git.openstack.org/openstack/airship-promenade 57 location: https://git.openstack.org/openstack/airship-promenade
58 reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22 58 reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
59 subpath: charts/coredns 59 subpath: charts/coredns
60 type: git 60 type: git
61 coredns-htk: 61 coredns-htk:
@@ -65,7 +65,7 @@ data:
65 type: git 65 type: git
66 etcd: 66 etcd:
67 location: https://git.openstack.org/openstack/airship-promenade 67 location: https://git.openstack.org/openstack/airship-promenade
68 reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22 68 reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
69 subpath: charts/etcd 69 subpath: charts/etcd
70 type: git 70 type: git
71 etcd-htk: 71 etcd-htk:
@@ -75,7 +75,7 @@ data:
75 type: git 75 type: git
76 haproxy: 76 haproxy:
77 location: https://git.openstack.org/openstack/airship-promenade 77 location: https://git.openstack.org/openstack/airship-promenade
78 reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22 78 reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
79 subpath: charts/haproxy 79 subpath: charts/haproxy
80 type: git 80 type: git
81 haproxy-htk: 81 haproxy-htk:
@@ -95,7 +95,7 @@ data:
95 type: git 95 type: git
96 proxy: 96 proxy:
97 location: https://git.openstack.org/openstack/airship-promenade 97 location: https://git.openstack.org/openstack/airship-promenade
98 reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22 98 reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
99 subpath: charts/proxy 99 subpath: charts/proxy
100 type: git 100 type: git
101 proxy-htk: 101 proxy-htk:
@@ -105,7 +105,7 @@ data:
105 type: git 105 type: git
106 scheduler: 106 scheduler:
107 location: https://git.openstack.org/openstack/airship-promenade 107 location: https://git.openstack.org/openstack/airship-promenade
108 reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22 108 reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
109 subpath: charts/scheduler 109 subpath: charts/scheduler
110 type: git 110 type: git
111 scheduler-htk: 111 scheduler-htk:
@@ -126,7 +126,7 @@ data:
126 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2 126 reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
127 armada: 127 armada:
128 location: https://git.openstack.org/openstack/airship-armada 128 location: https://git.openstack.org/openstack/airship-armada
129 reference: 32baf9851e9cd29f4b8670e73a9409a0e7a59e35 129 reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
130 subpath: charts/armada 130 subpath: charts/armada
131 type: git 131 type: git
132 armada-htk: 132 armada-htk:
@@ -277,7 +277,7 @@ data:
277 type: git 277 type: git
278 tiller: 278 tiller:
279 location: https://git.openstack.org/openstack/airship-armada 279 location: https://git.openstack.org/openstack/airship-armada
280 reference: 32baf9851e9cd29f4b8670e73a9409a0e7a59e35 280 reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
281 subpath: charts/tiller 281 subpath: charts/tiller
282 type: git 282 type: git
283 tiller-htk: 283 tiller-htk:
@@ -442,22 +442,13 @@ data:
442 images: 442 images:
443 ucp: 443 ucp:
444 armada: 444 armada:
445 api: quay.io/airshipit/armada:32baf9851e9cd29f4b8670e73a9409a0e7a59e35 445 api: quay.io/airshipit/armada:709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
446 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 446 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
447 ks_endpoints: docker.io/openstackhelm/heat:ocata 447 ks_endpoints: docker.io/openstackhelm/heat:ocata
448 ks_service: docker.io/openstackhelm/heat:ocata 448 ks_service: docker.io/openstackhelm/heat:ocata
449 ks_user: docker.io/openstackhelm/heat:ocata 449 ks_user: docker.io/openstackhelm/heat:ocata
450 helm: lachlanevenson/k8s-helm:v2.10.0 450 helm: lachlanevenson/k8s-helm:v2.10.0
451 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 451 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
452 armada:
453 api: quay.io/airshipit/armada:32baf9851e9cd29f4b8670e73a9409a0e7a59e35
454 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
455 helm: docker.io/lachlanevenson/k8s-helm:v2.10.0
456 image_repo_sync: docker.io/docker:17.07.0
457 ks_endpoints: docker.io/openstackhelm/heat:ocata
458 ks_service: docker.io/openstackhelm/heat:ocata
459 ks_user: docker.io/openstackhelm/heat:ocata
460 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
461 deckhand: 452 deckhand:
462 db_init: docker.io/postgres:9.5 453 db_init: docker.io/postgres:9.5
463 db_sync: quay.io/airshipit/deckhand:464d2c0ea5ebb50bee615a0e0f2624c3aa40d9bd 454 db_sync: quay.io/airshipit/deckhand:464d2c0ea5ebb50bee615a0e0f2624c3aa40d9bd
@@ -576,7 +567,7 @@ data:
576 etcd: quay.io/coreos/etcd:v3.2.14 567 etcd: quay.io/coreos/etcd:v3.2.14
577 etcdctl: quay.io/coreos/etcd:v3.2.14 568 etcdctl: quay.io/coreos/etcd:v3.2.14
578 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2 569 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
579 pause: gcr.io/google_containers/pause-amd64:3.0 570 pause: gcr.io/google_containers/pause-amd64:3.1
580 scheduler: 571 scheduler:
581 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 572 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
582 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2 573 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2
diff --git a/deployment_files/global/v1.0dev/profiles/genesis.yaml b/deployment_files/global/v1.0dev/profiles/genesis.yaml
index 29857a6..7420a83 100644
--- a/deployment_files/global/v1.0dev/profiles/genesis.yaml
+++ b/deployment_files/global/v1.0dev/profiles/genesis.yaml
@@ -91,11 +91,8 @@ data:
91 - --service-cluster-ip-range=SERVICE_CIDR 91 - --service-cluster-ip-range=SERVICE_CIDR
92 - --service-node-port-range=SERVICE_NODE_PORT_RANGE 92 - --service-node-port-range=SERVICE_NODE_PORT_RANGE
93 - --authorization-mode=Node,RBAC 93 - --authorization-mode=Node,RBAC
94 - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds,NodeRestriction,EventRateLimit 94 - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
95 - --endpoint-reconciler-type=lease 95 - --endpoint-reconciler-type=lease
96 # NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
97 - --repair-malformed-updates=false
98
99 armada: 96 armada:
100 target_manifest: cluster-bootstrap 97 target_manifest: cluster-bootstrap
101 labels: 98 labels:
diff --git a/deployment_files/global/v1.0dev/software/charts/kubernetes/core/apiserver.yaml b/deployment_files/global/v1.0dev/software/charts/kubernetes/core/apiserver.yaml
index 45f3f61..89b3fd1 100644
--- a/deployment_files/global/v1.0dev/software/charts/kubernetes/core/apiserver.yaml
+++ b/deployment_files/global/v1.0dev/software/charts/kubernetes/core/apiserver.yaml
@@ -142,9 +142,6 @@ data:
142 - --authorization-mode=Node,RBAC 142 - --authorization-mode=Node,RBAC
143 - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds 143 - --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
144 - --endpoint-reconciler-type=lease 144 - --endpoint-reconciler-type=lease
145 # NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
146 - --repair-malformed-updates=false
147
148 dependencies: 145 dependencies:
149 - kubernetes-apiserver-htk 146 - kubernetes-apiserver-htk
150--- 147---
diff --git a/deployment_files/global/v1.0dev/software/config/versions.yaml b/deployment_files/global/v1.0dev/software/config/versions.yaml
index 07db537..501bc17 100644
--- a/deployment_files/global/v1.0dev/software/config/versions.yaml
+++ b/deployment_files/global/v1.0dev/software/config/versions.yaml
@@ -17,7 +17,7 @@ data:
17 type: git 17 type: git
18 location: https://git.openstack.org/openstack/airship-promenade 18 location: https://git.openstack.org/openstack/airship-promenade
19 subpath: charts/etcd 19 subpath: charts/etcd
20 reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 20 reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
21 etcd-htk: 21 etcd-htk:
22 type: git 22 type: git
23 location: https://git.openstack.org/openstack/openstack-helm-infra 23 location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -37,7 +37,7 @@ data:
37 type: git 37 type: git
38 location: https://git.openstack.org/openstack/airship-promenade 38 location: https://git.openstack.org/openstack/airship-promenade
39 subpath: charts/apiserver 39 subpath: charts/apiserver
40 reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 40 reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
41 apiserver-htk: 41 apiserver-htk:
42 type: git 42 type: git
43 location: https://git.openstack.org/openstack/openstack-helm-infra 43 location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -47,7 +47,7 @@ data:
47 type: git 47 type: git
48 location: https://git.openstack.org/openstack/airship-promenade 48 location: https://git.openstack.org/openstack/airship-promenade
49 subpath: charts/controller_manager 49 subpath: charts/controller_manager
50 reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 50 reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
51 controller-manager-htk: 51 controller-manager-htk:
52 type: git 52 type: git
53 location: https://git.openstack.org/openstack/openstack-helm-infra 53 location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -57,7 +57,7 @@ data:
57 type: git 57 type: git
58 location: https://git.openstack.org/openstack/airship-promenade 58 location: https://git.openstack.org/openstack/airship-promenade
59 subpath: charts/coredns 59 subpath: charts/coredns
60 reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 60 reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
61 coredns-htk: 61 coredns-htk:
62 type: git 62 type: git
63 location: https://git.openstack.org/openstack/openstack-helm-infra 63 location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -67,7 +67,7 @@ data:
67 type: git 67 type: git
68 location: https://git.openstack.org/openstack/airship-promenade 68 location: https://git.openstack.org/openstack/airship-promenade
69 subpath: charts/haproxy 69 subpath: charts/haproxy
70 reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 70 reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
71 haproxy-htk: 71 haproxy-htk:
72 type: git 72 type: git
73 location: https://git.openstack.org/openstack/openstack-helm-infra 73 location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -77,7 +77,7 @@ data:
77 type: git 77 type: git
78 location: https://git.openstack.org/openstack/airship-promenade 78 location: https://git.openstack.org/openstack/airship-promenade
79 subpath: charts/etcd 79 subpath: charts/etcd
80 reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 80 reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
81 etcd-htk: 81 etcd-htk:
82 type: git 82 type: git
83 location: https://git.openstack.org/openstack/openstack-helm-infra 83 location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -97,7 +97,7 @@ data:
97 type: git 97 type: git
98 location: https://git.openstack.org/openstack/airship-promenade 98 location: https://git.openstack.org/openstack/airship-promenade
99 subpath: charts/proxy 99 subpath: charts/proxy
100 reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 100 reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
101 proxy-htk: 101 proxy-htk:
102 type: git 102 type: git
103 location: https://git.openstack.org/openstack/openstack-helm-infra 103 location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -107,7 +107,7 @@ data:
107 type: git 107 type: git
108 location: https://git.openstack.org/openstack/airship-promenade 108 location: https://git.openstack.org/openstack/airship-promenade
109 subpath: charts/scheduler 109 subpath: charts/scheduler
110 reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 110 reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
111 scheduler-htk: 111 scheduler-htk:
112 type: git 112 type: git
113 location: https://git.openstack.org/openstack/openstack-helm-infra 113 location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -128,7 +128,7 @@ data:
128 type: git 128 type: git
129 location: https://git.openstack.org/openstack/airship-armada 129 location: https://git.openstack.org/openstack/airship-armada
130 subpath: charts/armada 130 subpath: charts/armada
131 reference: 9c3ebe68c76c62244d52a7f5ceffc2e955970290 131 reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
132 armada-htk: 132 armada-htk:
133 type: git 133 type: git
134 location: https://git.openstack.org/openstack/openstack-helm-infra 134 location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -210,7 +210,7 @@ data:
210 type: git 210 type: git
211 location: https://git.openstack.org/openstack/airship-promenade 211 location: https://git.openstack.org/openstack/airship-promenade
212 subpath: charts/promenade 212 subpath: charts/promenade
213 reference: 88c786b8e92d053fd0cba7237df68cc087b81f26 213 reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
214 promenade-htk: 214 promenade-htk:
215 type: git 215 type: git
216 location: https://git.openstack.org/openstack/openstack-helm-infra 216 location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -280,7 +280,7 @@ data:
280 type: git 280 type: git
281 location: https://git.openstack.org/openstack/airship-armada 281 location: https://git.openstack.org/openstack/airship-armada
282 subpath: charts/tiller 282 subpath: charts/tiller
283 reference: 9c3ebe68c76c62244d52a7f5ceffc2e955970290 283 reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
284 tiller-htk: 284 tiller-htk:
285 type: git 285 type: git
286 location: https://git.openstack.org/openstack/openstack-helm-infra 286 location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -292,7 +292,7 @@ data:
292 images: 292 images:
293 ucp: 293 ucp:
294 armada: 294 armada:
295 api: quay.io/airshipit/armada:9c3ebe68c76c62244d52a7f5ceffc2e955970290 295 api: quay.io/airshipit/armada:709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
296 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 296 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
297 ks_endpoints: docker.io/openstackhelm/heat:ocata 297 ks_endpoints: docker.io/openstackhelm/heat:ocata
298 ks_service: docker.io/openstackhelm/heat:ocata 298 ks_service: docker.io/openstackhelm/heat:ocata
@@ -301,7 +301,7 @@ data:
301 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 301 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
302 promenade: 302 promenade:
303 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 303 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
304 promenade: quay.io/airshipit/promenade:88c786b8e92d053fd0cba7237df68cc087b81f26 304 promenade: quay.io/airshipit/promenade:cfb8aa498c294c2adbc369ba5aaee19b49550d22
305 ks_user: docker.io/openstackhelm/heat:ocata 305 ks_user: docker.io/openstackhelm/heat:ocata
306 ks_service: docker.io/openstackhelm/heat:ocata 306 ks_service: docker.io/openstackhelm/heat:ocata
307 ks_endpoints: docker.io/openstackhelm/heat:ocata 307 ks_endpoints: docker.io/openstackhelm/heat:ocata
@@ -416,7 +416,7 @@ data:
416 etcd: quay.io/coreos/etcd:v3.2.14 416 etcd: quay.io/coreos/etcd:v3.2.14
417 etcdctl: quay.io/coreos/etcd:v3.2.14 417 etcdctl: quay.io/coreos/etcd:v3.2.14
418 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2 418 kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
419 pause: gcr.io/google_containers/pause-amd64:3.0 419 pause: gcr.io/google_containers/pause-amd64:3.1
420 scheduler: 420 scheduler:
421 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2 421 anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
422 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2 422 scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2