summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Eagan <sean.eagan@att.com>2019-01-31 13:00:47 -0600
committerKaspars Skels <kaspars.skels@gmail.com>2019-02-05 13:53:44 +0000
commit26cf5a0fc675f92d1af0cd2477ad2df09030f24a (patch)
tree1cc8ad5cef6ee7bcf628751735221de1c462e9f9
parent43ca2a088da40a927e37cf79e8e988a782e64285 (diff)
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
Notes
Notes (review): Code-Review+1: Alexander Hughes <Alexander.Hughes@pm.me> Code-Review+2: Kaspars Skels <kaspars.skels@gmail.com> Code-Review+2: Scott Hussey <sthussey@att.com> Workflow+1: Scott Hussey <sthussey@att.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 05 Feb 2019 19:57:44 +0000 Reviewed-on: https://review.openstack.org/634296 Project: openstack/airship-treasuremap Branch: refs/heads/master
-rw-r--r--global/software/charts/ucp/armada/tiller.yaml5
-rw-r--r--global/software/config/versions.yaml36
2 files changed, 23 insertions, 18 deletions
diff --git a/global/software/charts/ucp/armada/tiller.yaml b/global/software/charts/ucp/armada/tiller.yaml
index cf02539..9866095 100644
--- a/global/software/charts/ucp/armada/tiller.yaml
+++ b/global/software/charts/ucp/armada/tiller.yaml
@@ -34,6 +34,11 @@ data:
34 timeout: 100 34 timeout: 100
35 labels: 35 labels:
36 release_group: airship-ucp-tiller 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 install: 42 install:
38 no_hooks: false 43 no_hooks: false
39 upgrade: 44 upgrade:
diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml
index 626a2b4..555dd75 100644
--- a/global/software/config/versions.yaml
+++ b/global/software/config/versions.yaml
@@ -248,7 +248,7 @@ data:
248 ucp: 248 ucp:
249 armada: 249 armada:
250 location: https://git.openstack.org/openstack/airship-armada 250 location: https://git.openstack.org/openstack/airship-armada
251 reference: 709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4 251 reference: 03dd1f27c1b0827c4a8d309a3b592acef5fde5aa
252 subpath: charts/armada 252 subpath: charts/armada
253 type: git 253 type: git
254 armada-htk: 254 armada-htk:
@@ -448,7 +448,7 @@ data:
448 type: git 448 type: git
449 tiller: 449 tiller:
450 location: https://git.openstack.org/openstack/airship-armada 450 location: https://git.openstack.org/openstack/airship-armada
451 reference: 091dbd283dbd6e7d547af5f2a81a555c39d89167 451 reference: 03dd1f27c1b0827c4a8d309a3b592acef5fde5aa
452 subpath: charts/tiller 452 subpath: charts/tiller
453 type: git 453 type: git
454 tiller-htk: 454 tiller-htk:
@@ -457,7 +457,7 @@ data:
457 subpath: helm-toolkit 457 subpath: helm-toolkit
458 type: git 458 type: git
459 files: 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 images: 461 images:
462 calico: 462 calico:
463 calico: {} 463 calico: {}
@@ -475,27 +475,27 @@ data:
475 tenant-ceph-rgw: {} 475 tenant-ceph-rgw: {}
476 kubernetes: 476 kubernetes:
477 apiserver: 477 apiserver:
478 anchor: 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.10.11 479 apiserver: gcr.io/google-containers/hyperkube-amd64:v1.11.6
480 controller-manager: 480 controller-manager:
481 anchor: 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.10.11 482 controller_manager: gcr.io/google-containers/hyperkube-amd64:v1.11.6
483 coredns: 483 coredns:
484 coredns: docker.io/coredns/coredns:1.1.2 484 coredns: docker.io/coredns/coredns:1.1.3
485 etcd: 485 etcd:
486 etcd: quay.io/coreos/etcd:v3.2.14 486 etcd: quay.io/coreos/etcd:v3.2.18
487 etcdctl: quay.io/coreos/etcd:v3.2.14 487 etcdctl: quay.io/coreos/etcd:v3.2.18
488 haproxy: 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 haproxy: docker.io/haproxy:1.8.3 490 haproxy: docker.io/haproxy:1.8.3
491 ingress: {} 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 pause: gcr.io/google-containers/pause-amd64:3.1 493 pause: gcr.io/google-containers/pause-amd64:3.1
494 proxy: 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 scheduler: 496 scheduler:
497 anchor: 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.10.11 498 scheduler: gcr.io/google-containers/hyperkube-amd64:v1.11.6
499 osh: 499 osh:
500 barbican: {} 500 barbican: {}
501 cinder: {} 501 cinder: {}
@@ -525,9 +525,9 @@ data:
525 prometheus_process_exporter: {} 525 prometheus_process_exporter: {}
526 ucp: 526 ucp:
527 armada: 527 armada:
528 api: quay.io/airshipit/armada:709eb9ec9b78b76fd18b817ae6c7a32221e9d0c4 528 api: quay.io/airshipit/armada:03dd1f27c1b0827c4a8d309a3b592acef5fde5aa
529 helm: docker.io/lachlanevenson/k8s-helm:v2.10.0 529 helm: docker.io/lachlanevenson/k8s-helm:v2.12.1
530 tiller: gcr.io/kubernetes-helm/tiller:v2.10.0 530 tiller: gcr.io/kubernetes-helm/tiller:v2.12.1
531 barbican: {} 531 barbican: {}
532 deckhand: 532 deckhand:
533 db_sync: quay.io/airshipit/deckhand:0aae9dc1776bd97ab8f4152a51baedb24eb61396 533 db_sync: quay.io/airshipit/deckhand:0aae9dc1776bd97ab8f4152a51baedb24eb61396