Browse Source

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
Bryan Strassner 4 months ago
parent
commit
7a0cbb466e

+ 1
- 4
deployment_files/global/v1.0demo/profiles/genesis.yaml View File

@@ -91,11 +91,8 @@ data:
91 91
       - --service-cluster-ip-range=SERVICE_CIDR
92 92
       - --service-node-port-range=SERVICE_NODE_PORT_RANGE
93 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 95
       - --endpoint-reconciler-type=lease
96
-      # NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
97
-      - --repair-malformed-updates=false
98
-
99 96
   armada:
100 97
     target_manifest: cluster-bootstrap
101 98
   labels:

+ 0
- 3
deployment_files/global/v1.0demo/software/charts/kubernetes/core/apiserver.yaml View File

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

+ 11
- 20
deployment_files/global/v1.0demo/software/config/versions.yaml View File

@@ -35,7 +35,7 @@ data:
35 35
           type: git
36 36
         etcd:
37 37
           location: https://git.openstack.org/openstack/airship-promenade
38
-          reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
38
+          reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
39 39
           subpath: charts/etcd
40 40
           type: git
41 41
         etcd-htk:
@@ -45,7 +45,7 @@ data:
45 45
           type: git
46 46
       controller-manager:
47 47
         location: https://git.openstack.org/openstack/airship-promenade
48
-        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
48
+        reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
49 49
         subpath: charts/controller_manager
50 50
         type: git
51 51
       controller-manager-htk:
@@ -55,7 +55,7 @@ data:
55 55
         type: git
56 56
       coredns:
57 57
         location: https://git.openstack.org/openstack/airship-promenade
58
-        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
58
+        reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
59 59
         subpath: charts/coredns
60 60
         type: git
61 61
       coredns-htk:
@@ -65,7 +65,7 @@ data:
65 65
         type: git
66 66
       etcd:
67 67
         location: https://git.openstack.org/openstack/airship-promenade
68
-        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
68
+        reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
69 69
         subpath: charts/etcd
70 70
         type: git
71 71
       etcd-htk:
@@ -75,7 +75,7 @@ data:
75 75
         type: git
76 76
       haproxy:
77 77
         location: https://git.openstack.org/openstack/airship-promenade
78
-        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
78
+        reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
79 79
         subpath: charts/haproxy
80 80
         type: git
81 81
       haproxy-htk:
@@ -95,7 +95,7 @@ data:
95 95
         type: git
96 96
       proxy:
97 97
         location: https://git.openstack.org/openstack/airship-promenade
98
-        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
98
+        reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
99 99
         subpath: charts/proxy
100 100
         type: git
101 101
       proxy-htk:
@@ -105,7 +105,7 @@ data:
105 105
         type: git
106 106
       scheduler:
107 107
         location: https://git.openstack.org/openstack/airship-promenade
108
-        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
108
+        reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
109 109
         subpath: charts/scheduler
110 110
         type: git
111 111
       scheduler-htk:
@@ -126,7 +126,7 @@ data:
126 126
         reference: 5d356f9265b337b75f605dee839faa8cd0ed3ab2
127 127
       armada:
128 128
         location: https://git.openstack.org/openstack/airship-armada
129
-        reference: 32baf9851e9cd29f4b8670e73a9409a0e7a59e35
129
+        reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
130 130
         subpath: charts/armada
131 131
         type: git
132 132
       armada-htk:
@@ -277,7 +277,7 @@ data:
277 277
         type: git
278 278
       tiller:
279 279
         location: https://git.openstack.org/openstack/airship-armada
280
-        reference: 32baf9851e9cd29f4b8670e73a9409a0e7a59e35
280
+        reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
281 281
         subpath: charts/tiller
282 282
         type: git
283 283
       tiller-htk:
@@ -442,22 +442,13 @@ data:
442 442
   images:
443 443
     ucp:
444 444
       armada:
445
-        api: quay.io/airshipit/armada:32baf9851e9cd29f4b8670e73a9409a0e7a59e35
445
+        api: quay.io/airshipit/armada:709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
446 446
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
447 447
         ks_endpoints: docker.io/openstackhelm/heat:ocata
448 448
         ks_service: docker.io/openstackhelm/heat:ocata
449 449
         ks_user: docker.io/openstackhelm/heat:ocata
450 450
         helm: lachlanevenson/k8s-helm:v2.10.0
451 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 452
       deckhand:
462 453
         db_init: docker.io/postgres:9.5
463 454
         db_sync: quay.io/airshipit/deckhand:464d2c0ea5ebb50bee615a0e0f2624c3aa40d9bd
@@ -576,7 +567,7 @@ data:
576 567
         etcd: quay.io/coreos/etcd:v3.2.14
577 568
         etcdctl: quay.io/coreos/etcd:v3.2.14
578 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 571
       scheduler:
581 572
         anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
582 573
         scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2

+ 1
- 4
deployment_files/global/v1.0dev/profiles/genesis.yaml View File

@@ -91,11 +91,8 @@ data:
91 91
       - --service-cluster-ip-range=SERVICE_CIDR
92 92
       - --service-node-port-range=SERVICE_NODE_PORT_RANGE
93 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 95
       - --endpoint-reconciler-type=lease
96
-      # NOTE(mark-burnett): This flag is removed in Kubernetes 1.11
97
-      - --repair-malformed-updates=false
98
-
99 96
   armada:
100 97
     target_manifest: cluster-bootstrap
101 98
   labels:

+ 0
- 3
deployment_files/global/v1.0dev/software/charts/kubernetes/core/apiserver.yaml View File

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

+ 14
- 14
deployment_files/global/v1.0dev/software/config/versions.yaml View File

@@ -17,7 +17,7 @@ data:
17 17
           type: git
18 18
           location: https://git.openstack.org/openstack/airship-promenade
19 19
           subpath: charts/etcd
20
-          reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
20
+          reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
21 21
         etcd-htk:
22 22
           type: git
23 23
           location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -37,7 +37,7 @@ data:
37 37
         type: git
38 38
         location: https://git.openstack.org/openstack/airship-promenade
39 39
         subpath: charts/apiserver
40
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
40
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
41 41
       apiserver-htk:
42 42
         type: git
43 43
         location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -47,7 +47,7 @@ data:
47 47
         type: git
48 48
         location: https://git.openstack.org/openstack/airship-promenade
49 49
         subpath: charts/controller_manager
50
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
50
+        reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
51 51
       controller-manager-htk:
52 52
         type: git
53 53
         location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -57,7 +57,7 @@ data:
57 57
         type: git
58 58
         location: https://git.openstack.org/openstack/airship-promenade
59 59
         subpath: charts/coredns
60
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
60
+        reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
61 61
       coredns-htk:
62 62
         type: git
63 63
         location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -67,7 +67,7 @@ data:
67 67
         type: git
68 68
         location: https://git.openstack.org/openstack/airship-promenade
69 69
         subpath: charts/haproxy
70
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
70
+        reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
71 71
       haproxy-htk:
72 72
         type: git
73 73
         location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -77,7 +77,7 @@ data:
77 77
         type: git
78 78
         location: https://git.openstack.org/openstack/airship-promenade
79 79
         subpath: charts/etcd
80
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
80
+        reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
81 81
       etcd-htk:
82 82
         type: git
83 83
         location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -97,7 +97,7 @@ data:
97 97
         type: git
98 98
         location: https://git.openstack.org/openstack/airship-promenade
99 99
         subpath: charts/proxy
100
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
100
+        reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
101 101
       proxy-htk:
102 102
         type: git
103 103
         location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -107,7 +107,7 @@ data:
107 107
         type: git
108 108
         location: https://git.openstack.org/openstack/airship-promenade
109 109
         subpath: charts/scheduler
110
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
110
+        reference: 425d8bdff8b5fb9aadd22bfbf6de727986e7abe0
111 111
       scheduler-htk:
112 112
         type: git
113 113
         location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -128,7 +128,7 @@ data:
128 128
         type: git
129 129
         location: https://git.openstack.org/openstack/airship-armada
130 130
         subpath: charts/armada
131
-        reference: 9c3ebe68c76c62244d52a7f5ceffc2e955970290
131
+        reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
132 132
       armada-htk:
133 133
         type: git
134 134
         location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -210,7 +210,7 @@ data:
210 210
         type: git
211 211
         location: https://git.openstack.org/openstack/airship-promenade
212 212
         subpath: charts/promenade
213
-        reference: 88c786b8e92d053fd0cba7237df68cc087b81f26
213
+        reference: cfb8aa498c294c2adbc369ba5aaee19b49550d22
214 214
       promenade-htk:
215 215
         type: git
216 216
         location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -280,7 +280,7 @@ data:
280 280
         type: git
281 281
         location: https://git.openstack.org/openstack/airship-armada
282 282
         subpath: charts/tiller
283
-        reference: 9c3ebe68c76c62244d52a7f5ceffc2e955970290
283
+        reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
284 284
       tiller-htk:
285 285
         type: git
286 286
         location: https://git.openstack.org/openstack/openstack-helm-infra
@@ -292,7 +292,7 @@ data:
292 292
   images:
293 293
     ucp:
294 294
       armada:
295
-        api: quay.io/airshipit/armada:9c3ebe68c76c62244d52a7f5ceffc2e955970290
295
+        api: quay.io/airshipit/armada:709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
296 296
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
297 297
         ks_endpoints: docker.io/openstackhelm/heat:ocata
298 298
         ks_service: docker.io/openstackhelm/heat:ocata
@@ -301,7 +301,7 @@ data:
301 301
         tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
302 302
       promenade:
303 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 305
         ks_user: docker.io/openstackhelm/heat:ocata
306 306
         ks_service: docker.io/openstackhelm/heat:ocata
307 307
         ks_endpoints: docker.io/openstackhelm/heat:ocata
@@ -416,7 +416,7 @@ data:
416 416
         etcd: quay.io/coreos/etcd:v3.2.14
417 417
         etcdctl: quay.io/coreos/etcd:v3.2.14
418 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 420
       scheduler:
421 421
         anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.2
422 422
         scheduler: gcr.io/google_containers/hyperkube-amd64:v1.10.2

Loading…
Cancel
Save