Browse Source

Uplift armada, tiller, kubernetes, etcd, coredns

This change updates the following components:

Kubernetes 1.10.11 -> 1.11.6
CoreDNS 1.1.2 -> 1.1.3 (per k8s 1.11 recommendations)
Etcd 3.2.14 -> 3.2.18 (per k8s 1.11 recommendations)
Tiller 2.10.0 -> 2.12.1 (adds support for k8s 1.11, thread safety fix)
Armada as of 2019-02-4 (adds support for Tiller 2.12.1)

Also fixes tiller upgradability.

Change-Id: I2375b0ae167593815c56470ba6a6c7b529375302
Sean Eagan 2 months ago
parent
commit
26cf5a0fc6
2 changed files with 23 additions and 18 deletions
  1. 5
    0
      global/software/charts/ucp/armada/tiller.yaml
  2. 18
    18
      global/software/config/versions.yaml

+ 5
- 0
global/software/charts/ucp/armada/tiller.yaml View File

@@ -34,6 +34,11 @@ data:
34 34
     timeout: 100
35 35
     labels:
36 36
       release_group: airship-ucp-tiller
37
+    native:
38
+      # Allows tiller to update its own release's status to DEPLOYED before it
39
+      # goes away during an upgrade, otherwise it can get stuck in
40
+      # PENDING_UPGRADE status.
41
+      enabled: false
37 42
   install:
38 43
     no_hooks: false
39 44
   upgrade:

+ 18
- 18
global/software/config/versions.yaml View File

@@ -248,7 +248,7 @@ data:
248 248
     ucp:
249 249
       armada:
250 250
         location: https://git.openstack.org/openstack/airship-armada
251
-        reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
251
+        reference: 03dd1f27c1b0827c4a8d309a3b592acef5fde5aa
252 252
         subpath: charts/armada
253 253
         type: git
254 254
       armada-htk:
@@ -448,7 +448,7 @@ data:
448 448
         type: git
449 449
       tiller:
450 450
         location: https://git.openstack.org/openstack/airship-armada
451
-        reference: 091dbd283dbd6e7d547af5f2a81a555c39d89167
451
+        reference: 03dd1f27c1b0827c4a8d309a3b592acef5fde5aa
452 452
         subpath: charts/tiller
453 453
         type: git
454 454
       tiller-htk:
@@ -457,7 +457,7 @@ data:
457 457
         subpath: helm-toolkit
458 458
         type: git
459 459
   files:
460
-    kubelet: https://dl.k8s.io/v1.10.11/kubernetes-node-linux-amd64.tar.gz
460
+    kubelet: https://dl.k8s.io/v1.11.6/kubernetes-node-linux-amd64.tar.gz
461 461
   images:
462 462
     calico:
463 463
       calico: {}
@@ -475,27 +475,27 @@ data:
475 475
       tenant-ceph-rgw: {}
476 476
     kubernetes:
477 477
       apiserver:
478
-        anchor: gcr.io/google-containers/hyperkube-amd64:v1.10.11
479
-        apiserver: gcr.io/google-containers/hyperkube-amd64:v1.10.11
478
+        anchor: gcr.io/google-containers/hyperkube-amd64:v1.11.6
479
+        apiserver: gcr.io/google-containers/hyperkube-amd64:v1.11.6
480 480
       controller-manager:
481
-        anchor: gcr.io/google-containers/hyperkube-amd64:v1.10.11
482
-        controller_manager: gcr.io/google-containers/hyperkube-amd64:v1.10.11
481
+        anchor: gcr.io/google-containers/hyperkube-amd64:v1.11.6
482
+        controller_manager: gcr.io/google-containers/hyperkube-amd64:v1.11.6
483 483
       coredns:
484
-        coredns: docker.io/coredns/coredns:1.1.2
484
+        coredns: docker.io/coredns/coredns:1.1.3
485 485
       etcd:
486
-        etcd: quay.io/coreos/etcd:v3.2.14
487
-        etcdctl: quay.io/coreos/etcd:v3.2.14
486
+        etcd: quay.io/coreos/etcd:v3.2.18
487
+        etcdctl: quay.io/coreos/etcd:v3.2.18
488 488
       haproxy:
489
-        anchor: gcr.io/google_containers/hyperkube-amd64:v1.10.11
489
+        anchor: gcr.io/google_containers/hyperkube-amd64:v1.11.6
490 490
         haproxy: docker.io/haproxy:1.8.3
491 491
       ingress: {}
492
-      kubectl: gcr.io/google-containers/hyperkube-amd64:v1.10.11
492
+      kubectl: gcr.io/google-containers/hyperkube-amd64:v1.11.6
493 493
       pause: gcr.io/google-containers/pause-amd64:3.1
494 494
       proxy:
495
-        proxy: gcr.io/google-containers/hyperkube-amd64:v1.10.11
495
+        proxy: gcr.io/google-containers/hyperkube-amd64:v1.11.6
496 496
       scheduler:
497
-        anchor: gcr.io/google-containers/hyperkube-amd64:v1.10.11
498
-        scheduler: gcr.io/google-containers/hyperkube-amd64:v1.10.11
497
+        anchor: gcr.io/google-containers/hyperkube-amd64:v1.11.6
498
+        scheduler: gcr.io/google-containers/hyperkube-amd64:v1.11.6
499 499
     osh:
500 500
       barbican: {}
501 501
       cinder: {}
@@ -525,9 +525,9 @@ data:
525 525
       prometheus_process_exporter: {}
526 526
     ucp:
527 527
       armada:
528
-        api: quay.io/airshipit/armada:709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4
529
-        helm: docker.io/lachlanevenson/k8s-helm:v2.10.0
530
-        tiller: gcr.io/kubernetes-helm/tiller:v2.10.0
528
+        api: quay.io/airshipit/armada:03dd1f27c1b0827c4a8d309a3b592acef5fde5aa
529
+        helm: docker.io/lachlanevenson/k8s-helm:v2.12.1
530
+        tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
531 531
       barbican: {}
532 532
       deckhand:
533 533
         db_sync: quay.io/airshipit/deckhand:0aae9dc1776bd97ab8f4152a51baedb24eb61396

Loading…
Cancel
Save