Browse Source

Merge "Revert "Upgrade k8s from v1.17.3 to v1.18.6""

master
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
f83fdb6e9f
5 changed files with 18 additions and 20 deletions
  1. +1
    -3
      global/software/config/Kubelet.yaml
  2. +14
    -14
      global/software/config/versions.yaml
  3. +1
    -1
      tools/deployment/seaworthy-virt/airship_gate/lib/config.sh
  4. +1
    -1
      tools/fixes/hanging-cgroup-release.sh
  5. +1
    -1
      tools/fixes/rbd-roomba-scanner.sh

+ 1
- 3
global/software/config/Kubelet.yaml View File

@@ -33,9 +33,7 @@ data:
evictionMaxPodGracePeriod: -1
featureGates:
PodShareProcessNamespace: true
# TaintBasedEvictions is GA in v1.18.6 and must be set to true
# https://kubernetes.io/docs/reference/command-line-tools-reference/feature-gates/
TaintBasedEvictions: true
TaintBasedEvictions: false
kubeAPIBurst: 40
kubeAPIQPS: 20
maxPods: 200


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

@@ -614,7 +614,7 @@ 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:
@@ -700,13 +700,13 @@ 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
@@ -714,10 +714,10 @@ data:
etcd: quay.io/coreos/etcd:v3.4.3
etcdctl: quay.io/coreos/etcd:v3.4.3
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
@@ -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


+ 1
- 1
tools/deployment/seaworthy-virt/airship_gate/lib/config.sh View File

@@ -16,7 +16,7 @@ export IMAGE_COREDNS=${IMAGE_COREDNS:-docker.io/coredns/coredns:1.2.2}
export IMAGE_QUAGGA=${IMAGE_QUAGGA:-docker.io/cumulusnetworks/quagga:CL3.3.2}
export IMAGE_DRYDOCK_CLI=${IMAGE_DRYDOCK_CLI:-quay.io/airshipit/drydock:d93d6d5a0a370ced536180612d1ade708e29cd47}
export IMAGE_DOCKER_REGISTRY=${IMAGE_DOCKER_REGISTRY:-"docker.io/registry:2"}
export IMAGE_HYPERKUBE=${IMAGE_HYPERKUBE:-gcr.io/google_containers/hyperkube-amd64:v1.18.6}
export IMAGE_HYPERKUBE=${IMAGE_HYPERKUBE:-gcr.io/google_containers/hyperkube-amd64:v1.17.3}
export PROMENADE_DEBUG=${PROMENADE_DEBUG:-0}
export PROMENADE_TMP_LOCAL=${PROMENADE_TMP_LOCAL:-cache}
export REGISTRY_DATA_DIR=${REGISTRY_DATA_DIR:-/mnt/registry}


+ 1
- 1
tools/fixes/hanging-cgroup-release.sh View File

@@ -3,7 +3,7 @@ set -ex

CLUSTER_DNS=${CLUSTER_DNS:-10.96.0.10}

KUBECTL_IMAGE=${KUBECTL_IMAGE:-gcr.io/google-containers/hyperkube-amd64:v1.18.6}
KUBECTL_IMAGE=${KUBECTL_IMAGE:-gcr.io/google-containers/hyperkube-amd64:v1.17.3}
UBUNTU_IMAGE=${UBUNTU_IMAGE:-docker.io/ubuntu:16.04}

cat > /tmp/hanging-cgroup-release.yaml << 'EOF'


+ 1
- 1
tools/fixes/rbd-roomba-scanner.sh View File

@@ -3,7 +3,7 @@ set -ex

CLUSTER_DNS=${CLUSTER_DNS:-10.96.0.10}

KUBECTL_IMAGE=${KUBECTL_IMAGE:-gcr.io/google-containers/hyperkube-amd64:v1.18.6}
KUBECTL_IMAGE=${KUBECTL_IMAGE:-gcr.io/google-containers/hyperkube-amd64:v1.17.3}
UBUNTU_IMAGE=${UBUNTU_IMAGE:-docker.io/ubuntu:16.04}

cat > /tmp/rbd-roomba-scanner.yaml << 'EOF'


Loading…
Cancel
Save