From ea4aeeee027fb80d5014ad2fa850619e9d95702d Mon Sep 17 00:00:00 2001 From: Samuel Pilla Date: Fri, 10 Jan 2020 11:12:49 -0600 Subject: [PATCH] Changes supporting k8s 1.17.3 Changes made in treasuremap to support k8s v1.17 Change-Id: I625753bc9ef5e28d57f320c440aef3abb246704d --- global/profiles/genesis.yaml | 2 +- global/profiles/kubernetes-host.yaml | 12 +++++++-- .../charts/kubernetes/core/apiserver.yaml | 6 ++--- .../kubernetes/core/controller-manager.yaml | 2 +- .../kubernetes/proxy/kubernetes-proxy.yaml | 2 +- global/software/config/versions.yaml | 25 +++++++++++-------- .../seaworthy-virt/airship_gate/lib/config.sh | 2 +- tools/fixes/hanging-cgroup-release.sh | 6 ++--- tools/fixes/rbd-roomba-scanner.sh | 6 ++--- 9 files changed, 37 insertions(+), 26 deletions(-) diff --git a/global/profiles/genesis.yaml b/global/profiles/genesis.yaml index 712bb3820..9a33650c0 100644 --- a/global/profiles/genesis.yaml +++ b/global/profiles/genesis.yaml @@ -97,7 +97,7 @@ data: - --feature-gates=PodShareProcessNamespace=true - --v=3 - --admission-control-config-file=/etc/kubernetes/apiserver/acconfig.yaml - - --experimental-encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml + - --encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml - --requestheader-allowed-names='aggregator' armada: target_manifest: cluster-bootstrap diff --git a/global/profiles/kubernetes-host.yaml b/global/profiles/kubernetes-host.yaml index 511db0141..13189f002 100644 --- a/global/profiles/kubernetes-host.yaml +++ b/global/profiles/kubernetes-host.yaml @@ -15,6 +15,14 @@ metadata: dest: path: .files[0].docker_image + - src: + schema: pegleg/SoftwareVersions/v1 + name: software-versions + path: .files.kubernetes + dest: + - path: .files[1].tar_url + - path: .files[2].tar_url + # Initial CoreDNS image (used during node Genesis and node join) - src: schema: pegleg/SoftwareVersions/v1 @@ -108,10 +116,10 @@ data: file_path: /hyperkube mode: 0555 - path: /opt/kubernetes/bin/kubelet - symlink: /opt/kubernetes/bin/hyperkube + tar_path: kubernetes/node/bin/kubelet mode: 0555 - path: /usr/local/bin/kubectl - symlink: /opt/kubernetes/bin/hyperkube + tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/logrotate.d/json-logrotate mode: 0444 diff --git a/global/software/charts/kubernetes/core/apiserver.yaml b/global/software/charts/kubernetes/core/apiserver.yaml index 0e8d63a03..890e34a1d 100644 --- a/global/software/charts/kubernetes/core/apiserver.yaml +++ b/global/software/charts/kubernetes/core/apiserver.yaml @@ -147,10 +147,10 @@ data: encryption_provider: file: encryption_provider.yaml command_options: - - '--experimental-encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml' + - '--encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml' content: - kind: EncryptionConfig - apiVersion: v1 + kind: EncryptionConfiguration + apiVersion: apiserver.config.k8s.io/v1 eventconfig: file: eventconfig.yaml content: diff --git a/global/software/charts/kubernetes/core/controller-manager.yaml b/global/software/charts/kubernetes/core/controller-manager.yaml index 74a05527a..d2968451b 100644 --- a/global/software/charts/kubernetes/core/controller-manager.yaml +++ b/global/software/charts/kubernetes/core/controller-manager.yaml @@ -103,7 +103,7 @@ data: release_group: airship-kubernetes-controller-manager values: command_prefix: - - /controller-manager + - kube-controller-manager - --cluster-cidr=SUB_POD_CIDR - --service-cluster-ip-range=SUB_SERVICE_CIDR - --node-monitor-period=5s diff --git a/global/software/charts/kubernetes/proxy/kubernetes-proxy.yaml b/global/software/charts/kubernetes/proxy/kubernetes-proxy.yaml index 3ba13e3a8..f9fc5d66b 100644 --- a/global/software/charts/kubernetes/proxy/kubernetes-proxy.yaml +++ b/global/software/charts/kubernetes/proxy/kubernetes-proxy.yaml @@ -59,7 +59,7 @@ data: release_group: airship-kubernetes-proxy values: command_prefix: - - /proxy + - kube-proxy - --cluster-cidr=POD_CIDR - --proxy-mode=iptables kube_service: diff --git a/global/software/config/versions.yaml b/global/software/config/versions.yaml index f2efd7bfe..0ad43d41f 100644 --- a/global/software/config/versions.yaml +++ b/global/software/config/versions.yaml @@ -613,6 +613,9 @@ data: subpath: helm-toolkit type: git + files: + kubernetes: https://dl.k8s.io/v1.17.3/kubernetes-node-linux-amd64.tar.gz + images: calico: calico: @@ -697,13 +700,13 @@ data: rgw_s3_admin: docker.io/openstackhelm/ceph-config-helper:ubuntu_xenial-20191119 kubernetes: apiserver: - anchor: gcr.io/google-containers/hyperkube-amd64:v1.12.9 - apiserver: gcr.io/google-containers/hyperkube-amd64:v1.12.9 + 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: gcr.io/google-containers/hyperkube-amd64:v1.12.9 + key_rotate: gcr.io/google-containers/hyperkube-amd64:v1.17.3 controller-manager: - anchor: gcr.io/google-containers/hyperkube-amd64:v1.12.9 - controller_manager: gcr.io/google-containers/hyperkube-amd64:v1.12.9 + 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 @@ -711,10 +714,10 @@ data: etcd: quay.io/coreos/etcd:v3.4.2 etcdctl: quay.io/coreos/etcd:v3.4.2 haproxy: - anchor: gcr.io/google-containers/hyperkube-amd64:v1.12.9 + 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: gcr.io/google-containers/hyperkube-amd64:v1.12.9 + 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 @@ -725,10 +728,10 @@ data: keepalived: docker.io/osixia/keepalived:1.4.5 pause: gcr.io/google-containers/pause-amd64:3.1 proxy: - proxy: gcr.io/google-containers/hyperkube-amd64:v1.12.9 + proxy: gcr.io/google-containers/hyperkube-amd64:v1.17.3 scheduler: - anchor: gcr.io/google-containers/hyperkube-amd64:v1.12.9 - scheduler: gcr.io/google-containers/hyperkube-amd64:v1.12.9 + 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 @@ -1073,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: gcr.io/google_containers/hyperkube-amd64:v1.11.6 + 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 diff --git a/tools/deployment/seaworthy-virt/airship_gate/lib/config.sh b/tools/deployment/seaworthy-virt/airship_gate/lib/config.sh index 25cea331f..1c71d31bc 100644 --- a/tools/deployment/seaworthy-virt/airship_gate/lib/config.sh +++ b/tools/deployment/seaworthy-virt/airship_gate/lib/config.sh @@ -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.12.9} +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} diff --git a/tools/fixes/hanging-cgroup-release.sh b/tools/fixes/hanging-cgroup-release.sh index 7b3eb1c45..9734474ba 100755 --- a/tools/fixes/hanging-cgroup-release.sh +++ b/tools/fixes/hanging-cgroup-release.sh @@ -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.11.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' @@ -42,7 +42,7 @@ data: EOF cat >> /tmp/hanging-cgroup-release.yaml << EOF --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: hanging-cgroup-release @@ -92,5 +92,5 @@ docker run --rm -i \ -v /etc/kubernetes/admin:/etc/kubernetes/admin \ -e KUBECONFIG=/etc/kubernetes/admin/kubeconfig.yaml \ ${KUBECTL_IMAGE} \ - /kubectl apply -f /work/hanging-cgroup-release.yaml + kubectl apply -f /work/hanging-cgroup-release.yaml diff --git a/tools/fixes/rbd-roomba-scanner.sh b/tools/fixes/rbd-roomba-scanner.sh index 06095b01b..e573e80db 100755 --- a/tools/fixes/rbd-roomba-scanner.sh +++ b/tools/fixes/rbd-roomba-scanner.sh @@ -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.11.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' @@ -48,7 +48,7 @@ data: EOF cat >> /tmp/rbd-roomba-scanner.yaml << EOF --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: rbd-roomba-scanner @@ -98,4 +98,4 @@ docker run --rm -i \ -v /etc/kubernetes/admin:/etc/kubernetes/admin \ -e KUBECONFIG=/etc/kubernetes/admin/kubeconfig.yaml \ ${KUBECTL_IMAGE} \ - /kubectl apply -f /work/rbd-roomba-scanner.yaml + kubectl apply -f /work/rbd-roomba-scanner.yaml