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
This commit is contained in:
Bryan Strassner 2018-12-03 16:27:16 -06:00
parent 221441f1bf
commit 7a0cbb466e
6 changed files with 27 additions and 48 deletions

View File

@ -91,11 +91,8 @@ data:
- --service-cluster-ip-range=SERVICE_CIDR
- --service-node-port-range=SERVICE_NODE_PORT_RANGE
- --authorization-mode=Node,RBAC
- --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds,NodeRestriction,EventRateLimit
- --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
- --endpoint-reconciler-type=lease
# NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
- --repair-malformed-updates=false
armada:
target_manifest: cluster-bootstrap
labels:

View File

@ -142,9 +142,6 @@ data:
- --authorization-mode=Node,RBAC
- --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
- --endpoint-reconciler-type=lease
# NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
- --repair-malformed-updates=false
dependencies:
- kubernetes-apiserver-htk
---

View File

@ -35,7 +35,7 @@ data:
type: git
etcd:
location: https://git.openstack.org/openstack/airship-promenade
reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
subpath: charts/etcd
type: git
etcd-htk:
@ -45,7 +45,7 @@ data:
type: git
controller-manager:
location: https://git.openstack.org/openstack/airship-promenade
reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
subpath: charts/controller_manager
type: git
controller-manager-htk:
@ -55,7 +55,7 @@ data:
type: git
coredns:
location: https://git.openstack.org/openstack/airship-promenade
reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
subpath: charts/coredns
type: git
coredns-htk:
@ -65,7 +65,7 @@ data:
type: git
etcd:
location: https://git.openstack.org/openstack/airship-promenade
reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
subpath: charts/etcd
type: git
etcd-htk:
@ -75,7 +75,7 @@ data:
type: git
haproxy:
location: https://git.openstack.org/openstack/airship-promenade
reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
subpath: charts/haproxy
type: git
haproxy-htk:
@ -95,7 +95,7 @@ data:
type: git
proxy:
location: https://git.openstack.org/openstack/airship-promenade
reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
subpath: charts/proxy
type: git
proxy-htk:
@ -105,7 +105,7 @@ data:
type: git
scheduler:
location: https://git.openstack.org/openstack/airship-promenade
reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
subpath: charts/scheduler
type: git
scheduler-htk:
@ -126,7 +126,7 @@ data:
reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
armada:
location: https://git.openstack.org/openstack/airship-armada
reference: 32baf9851e9cd29f4b8670e73a9409a0e7a59e35
reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
subpath: charts/armada
type: git
armada-htk:
@ -277,7 +277,7 @@ data:
type: git
tiller:
location: https://git.openstack.org/openstack/airship-armada
reference: 32baf9851e9cd29f4b8670e73a9409a0e7a59e35
reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
subpath: charts/tiller
type: git
tiller-htk:
@ -442,22 +442,13 @@ data:
images:
ucp:
armada:
api: quay.io/airshipit/armada:32baf9851e9cd29f4b8670e73a9409a0e7a59e35
api: quay.io/airshipit/armada:709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
ks_endpoints: docker.io/openstackhelm/heat:ocata
ks_service: docker.io/openstackhelm/heat:ocata
ks_user: docker.io/openstackhelm/heat:ocata
helm: lachlanevenson/k8s-helm:v2.10.0
tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
armada:
api: quay.io/airshipit/armada:32baf9851e9cd29f4b8670e73a9409a0e7a59e35
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
helm: docker.io/lachlanevenson/k8s-helm:v2.10.0
image_repo_sync: docker.io/docker:17.07.0
ks_endpoints: docker.io/openstackhelm/heat:ocata
ks_service: docker.io/openstackhelm/heat:ocata
ks_user: docker.io/openstackhelm/heat:ocata
tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
deckhand:
db_init: docker.io/postgres:9.5
db_sync: quay.io/airshipit/deckhand:464d2c0ea5ebb50bee615a0e0f2624c3aa40d9bd
@ -576,7 +567,7 @@ data:
etcd: quay.io/coreos/etcd:v3.2.14
etcdctl: quay.io/coreos/etcd:v3.2.14
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
pause: gcr.io/google_containers/pause-amd64:3.0
pause: gcr.io/google_containers/pause-amd64:3.1
scheduler:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2

View File

@ -91,11 +91,8 @@ data:
- --service-cluster-ip-range=SERVICE_CIDR
- --service-node-port-range=SERVICE_NODE_PORT_RANGE
- --authorization-mode=Node,RBAC
- --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds,NodeRestriction,EventRateLimit
- --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
- --endpoint-reconciler-type=lease
# NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
- --repair-malformed-updates=false
armada:
target_manifest: cluster-bootstrap
labels:

View File

@ -142,9 +142,6 @@ data:
- --authorization-mode=Node,RBAC
- --admission-control=NamespaceLifecycle,LimitRanger,ServiceAccount,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds
- --endpoint-reconciler-type=lease
# NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
- --repair-malformed-updates=false
dependencies:
- kubernetes-apiserver-htk
---

View File

@ -17,7 +17,7 @@ data:
type: git
location: https://git.openstack.org/openstack/airship-promenade
subpath: charts/etcd
reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
etcd-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -37,7 +37,7 @@ data:
type: git
location: https://git.openstack.org/openstack/airship-promenade
subpath: charts/apiserver
reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
apiserver-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -47,7 +47,7 @@ data:
type: git
location: https://git.openstack.org/openstack/airship-promenade
subpath: charts/controller_manager
reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
controller-manager-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -57,7 +57,7 @@ data:
type: git
location: https://git.openstack.org/openstack/airship-promenade
subpath: charts/coredns
reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
coredns-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -67,7 +67,7 @@ data:
type: git
location: https://git.openstack.org/openstack/airship-promenade
subpath: charts/haproxy
reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
haproxy-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -77,7 +77,7 @@ data:
type: git
location: https://git.openstack.org/openstack/airship-promenade
subpath: charts/etcd
reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
etcd-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -97,7 +97,7 @@ data:
type: git
location: https://git.openstack.org/openstack/airship-promenade
subpath: charts/proxy
reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
proxy-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -107,7 +107,7 @@ data:
type: git
location: https://git.openstack.org/openstack/airship-promenade
subpath: charts/scheduler
reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
scheduler-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -128,7 +128,7 @@ data:
type: git
location: https://git.openstack.org/openstack/airship-armada
subpath: charts/armada
reference: 9c3ebe68c76c62244d52a7f5ceffc2e955970290
reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
armada-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -210,7 +210,7 @@ data:
type: git
location: https://git.openstack.org/openstack/airship-promenade
subpath: charts/promenade
reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
promenade-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -280,7 +280,7 @@ data:
type: git
location: https://git.openstack.org/openstack/airship-armada
subpath: charts/tiller
reference: 9c3ebe68c76c62244d52a7f5ceffc2e955970290
reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
tiller-htk:
type: git
location: https://git.openstack.org/openstack/openstack-helm-infra
@ -292,7 +292,7 @@ data:
images:
ucp:
armada:
api: quay.io/airshipit/armada:9c3ebe68c76c62244d52a7f5ceffc2e955970290
api: quay.io/airshipit/armada:709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
ks_endpoints: docker.io/openstackhelm/heat:ocata
ks_service: docker.io/openstackhelm/heat:ocata
@ -301,7 +301,7 @@ data:
tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
promenade:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
promenade: quay.io/airshipit/promenade:88c786b8e92d053fd0cba7237df68cc087b81f26
promenade: quay.io/airshipit/promenade:cfb8aa498c294c2adbc369ba5aaee19b49550d22
ks_user: docker.io/openstackhelm/heat:ocata
ks_service: docker.io/openstackhelm/heat:ocata
ks_endpoints: docker.io/openstackhelm/heat:ocata
@ -416,7 +416,7 @@ data:
etcd: quay.io/coreos/etcd:v3.2.14
etcdctl: quay.io/coreos/etcd:v3.2.14
kubectl: gcr.io/google_containers/hyperkube-amd64:v1.10.2
pause: gcr.io/google_containers/pause-amd64:3.0
pause: gcr.io/google_containers/pause-amd64:3.1
scheduler:
anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2