From fd6e6415f63125a6a7a5c6e08ff212476589f68d Mon Sep 17 00:00:00 2001 From: Arijit Bose Date: Thu, 10 Sep 2020 03:23:42 +0000 Subject: [PATCH] Revert "Uplift etcd to 3.4.3" This reverts commit 45603038b9f1db6b1cf3f9478c8961f1f945a32a. Change-Id: Iee9de83fd499a3db1a3baa43a3b4c9c61c11f2a7 --- global/software/config/versions.yaml | 58 ++++++++++++++-------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml index 66d5dbdd9..c8bb588be 100644 --- a/global/software/config/versions.yaml +++ b/global/software/config/versions.yaml @@ -4,7 +4,7 @@ data: kubernetes: apiserver: location: https://opendev.org/airship/promenade - reference: 97427904bc69387d365834f73a377a48fa06e813 + reference: 64807416b71958e31156ef7a50e169813acc4e15 subpath: charts/apiserver type: git apiserver-htk: @@ -25,7 +25,7 @@ data: type: git etcd: location: https://opendev.org/airship/promenade - reference: 97427904bc69387d365834f73a377a48fa06e813 + reference: 64807416b71958e31156ef7a50e169813acc4e15 subpath: charts/etcd type: git etcd-htk: @@ -35,7 +35,7 @@ data: type: git controller-manager: location: https://opendev.org/airship/promenade - reference: 97427904bc69387d365834f73a377a48fa06e813 + reference: 64807416b71958e31156ef7a50e169813acc4e15 subpath: charts/controller_manager type: git controller-manager-htk: @@ -45,7 +45,7 @@ data: type: git coredns: location: https://opendev.org/airship/promenade - reference: 97427904bc69387d365834f73a377a48fa06e813 + reference: 64807416b71958e31156ef7a50e169813acc4e15 subpath: charts/coredns type: git coredns-htk: @@ -55,7 +55,7 @@ data: type: git etcd: location: https://opendev.org/airship/promenade - reference: 97427904bc69387d365834f73a377a48fa06e813 + reference: 64807416b71958e31156ef7a50e169813acc4e15 subpath: charts/etcd type: git etcd-htk: @@ -65,7 +65,7 @@ data: type: git haproxy: location: https://opendev.org/airship/promenade - reference: 97427904bc69387d365834f73a377a48fa06e813 + reference: 64807416b71958e31156ef7a50e169813acc4e15 subpath: charts/haproxy type: git haproxy-htk: @@ -85,7 +85,7 @@ data: type: git proxy: location: https://opendev.org/airship/promenade - reference: 97427904bc69387d365834f73a377a48fa06e813 + reference: 64807416b71958e31156ef7a50e169813acc4e15 subpath: charts/proxy type: git proxy-htk: @@ -95,7 +95,7 @@ data: type: git scheduler: location: https://opendev.org/airship/promenade - reference: 97427904bc69387d365834f73a377a48fa06e813 + reference: 64807416b71958e31156ef7a50e169813acc4e15 subpath: charts/scheduler type: git scheduler-htk: @@ -614,21 +614,21 @@ data: type: git files: - kubernetes: https://dl.k8s.io/v1.18.6/kubernetes-node-linux-amd64.tar.gz + kubernetes: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz images: calico: calico: calico_cni: quay.io/calico/cni:v3.4.0 calico_ctl: docker.io/calico/ctl:v3.4.0 - calico_etcd: quay.io/coreos/etcd:v3.4.3 + calico_etcd: quay.io/coreos/etcd:v3.4.2 calico_kube_controllers: quay.io/calico/kube-controllers:v3.4.0 calico_node: quay.io/calico/node:v3.4.0 calico_settings: docker.io/calico/ctl:v3.4.0 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 etcd: - etcd: quay.io/coreos/etcd:v3.4.3 - etcdctl: quay.io/coreos/etcd:v3.4.3 + etcd: quay.io/coreos/etcd:v3.4.2 + etcdctl: quay.io/coreos/etcd:v3.4.2 ceph: ceph-client: ceph_bootstrap: docker.io/openstackhelm/ceph-daemon:ubuntu_xenial-20191119 @@ -700,24 +700,24 @@ data: rgw_s3_admin: docker.io/openstackhelm/ceph-config-helper:ubuntu_xenial-20191119 kubernetes: apiserver: - anchor: &hyperkube gcr.io/google-containers/hyperkube-amd64:v1.18.6 - apiserver: *hyperkube + anchor: gcr.io/google-containers/hyperkube-amd64:v1.17.3 + apiserver: gcr.io/google-containers/hyperkube-amd64:v1.17.3 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - key_rotate: *hyperkube + key_rotate: gcr.io/google-containers/hyperkube-amd64:v1.17.3 controller-manager: - anchor: *hyperkube - controller_manager: *hyperkube + anchor: gcr.io/google-containers/hyperkube-amd64:v1.17.3 + controller_manager: gcr.io/google-containers/hyperkube-amd64:v1.17.3 coredns: coredns: docker.io/coredns/coredns:1.6.2 test: quay.io/airshipit/promenade:64807416b71958e31156ef7a50e169813acc4e15 etcd: - etcd: quay.io/coreos/etcd:v3.4.3 - etcdctl: quay.io/coreos/etcd:v3.4.3 + etcd: quay.io/coreos/etcd:v3.4.2 + etcdctl: quay.io/coreos/etcd:v3.4.2 haproxy: - anchor: *hyperkube + anchor: gcr.io/google-containers/hyperkube-amd64:v1.17.3 haproxy: docker.io/library/haproxy:1.8.19 test: docker.io/library/python:3.6 - hyperkube: *hyperkube + hyperkube: gcr.io/google-containers/hyperkube-amd64:v1.17.3 ingress: dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 @@ -728,10 +728,10 @@ data: keepalived: docker.io/osixia/keepalived:1.4.5 pause: gcr.io/google-containers/pause-amd64:3.1 proxy: - proxy: *hyperkube + proxy: gcr.io/google-containers/hyperkube-amd64:v1.17.3 scheduler: - anchor: *hyperkube - scheduler: *hyperkube + anchor: gcr.io/google-containers/hyperkube-amd64:v1.17.3 + scheduler: gcr.io/google-containers/hyperkube-amd64:v1.17.3 validation: pod_logs: image: docker.io/library/busybox:1.28.3 @@ -804,8 +804,8 @@ data: db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 - horizon: docker.io/openstackhelm/horizon:ocata-ubuntu_xenial - horizon_db_sync: docker.io/openstackhelm/horizon:ocata-ubuntu_xenial + horizon: docker.io/openstackhelm/horizon:ocata-ubuntu_xenial-20200513 + horizon_db_sync: docker.io/openstackhelm/horizon:ocata-ubuntu_xenial-20200513 test: docker.io/openstackhelm/osh-selenium:latest-ubuntu_bionic ingress: dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 @@ -980,11 +980,11 @@ data: armada: api: quay.io/airshipit/armada:50384e47c762438b9e39abe4677f3c29f3c09184-ubuntu_xenial dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - helm: docker.io/lachlanevenson/k8s-helm:v2.14.1 + helm: docker.io/lachlanevenson/k8s-helm:v2.16.9 ks_endpoints: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton ks_user: docker.io/openstackhelm/heat:newton - tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 + tiller: gcr.io/kubernetes-helm/tiller:v2.16.9 barbican: barbican_api: docker.io/openstackhelm/barbican:ocata-ubuntu_xenial barbican_db_sync: docker.io/openstackhelm/barbican:ocata-ubuntu_xenial @@ -1076,7 +1076,7 @@ data: prometheus_postgresql_exporter_create_user: docker.io/library/postgres:9.5 promenade: dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - hyperkube: *hyperkube + hyperkube: gcr.io/google_containers/hyperkube-amd64:v1.17.3 ks_endpoints: docker.io/openstackhelm/heat:newton ks_service: docker.io/openstackhelm/heat:newton ks_user: docker.io/openstackhelm/heat:newton