From 5bb58863b694a78b935f2d70d45bd3448f17b6a3 Mon Sep 17 00:00:00 2001 From: Phil Sphicas Date: Fri, 15 Jan 2021 20:17:32 +0000 Subject: [PATCH] Uplift Kubernetes to v1.19.7 Change-Id: I2ac28e2383cb9c4d84d09c23c02a087db714803e --- charts/apiserver-webhook/values.yaml | 3 +-- charts/apiserver/values.yaml | 8 +++----- charts/controller_manager/values.yaml | 4 ++-- charts/haproxy/values.yaml | 2 +- charts/proxy/values.yaml | 2 +- charts/scheduler/values.yaml | 4 ++-- doc/source/configuration/genesis.rst | 6 +++--- doc/source/configuration/host-system.rst | 4 ++-- examples/basic/Genesis.yaml | 7 +++---- examples/basic/HostSystem.yaml | 4 ++-- examples/basic/Kubelet.yaml | 1 - examples/basic/armada-resources.yaml | 16 ++++++++-------- examples/complete/Genesis.yaml | 6 +++--- examples/complete/HostSystem.yaml | 4 ++-- examples/complete/armada-resources.yaml | 16 ++++++++-------- examples/containerd/Genesis.yaml | 7 +++---- examples/containerd/HostSystem.yaml | 4 ++-- examples/containerd/Kubelet.yaml | 1 - examples/containerd/armada-resources.yaml | 16 ++++++++-------- examples/gate/Genesis.yaml | 7 +++---- examples/gate/HostSystem.yaml | 4 ++-- examples/gate/Kubelet.yaml | 1 - examples/gate/armada-resources.yaml | 16 ++++++++-------- tests/unit/api/test_validatedesign.py | 8 ++++---- tests/unit/builder_data/simple/Genesis.yaml | 6 +++--- tests/unit/builder_data/simple/HostSystem.yaml | 2 +- .../builder_data/simple/armada-resources.yaml | 16 ++++++++-------- tools/gate/default-config-env | 12 ++++++------ tools/registry/IMAGES | 10 +++++----- 29 files changed, 94 insertions(+), 103 deletions(-) diff --git a/charts/apiserver-webhook/values.yaml b/charts/apiserver-webhook/values.yaml index 4fc4fa32..a67e4dfa 100644 --- a/charts/apiserver-webhook/values.yaml +++ b/charts/apiserver-webhook/values.yaml @@ -17,7 +17,7 @@ release_uuid: null images: tags: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 kubernetes_keystone_webhook: docker.io/k8scloudprovider/k8s-keystone-auth:latest scripted_test: docker.io/openstackhelm/heat:newton dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 @@ -240,7 +240,6 @@ pod: periodSeconds: 20 env: apiserver: - GODEBUG: http2server=0,http2client=0 lifecycle: upgrades: daemonsets: diff --git a/charts/apiserver/values.yaml b/charts/apiserver/values.yaml index 339a36ae..621e7424 100644 --- a/charts/apiserver/values.yaml +++ b/charts/apiserver/values.yaml @@ -57,9 +57,9 @@ const: images: tags: dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 - anchor: cwedgwood/kubectl:v1.18.6-4 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 - key_rotate: cwedgwood/kubectl:v1.18.6-4 + anchor: cwedgwood/kubectl:v1.19.7-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 + key_rotate: cwedgwood/kubectl:v1.19.7-1 pull_policy: "IfNotPresent" local_registry: active: false @@ -164,7 +164,6 @@ apiserver: - --authorization-mode=Node,RBAC - --service-cluster-ip-range=10.96.0.0/16 - --endpoint-reconciler-type=lease - - --feature-gates=PodShareProcessNamespace=true - --v=3 etcd: endpoints: https://kubernetes-etcd.kube-system.svc.cluster.local @@ -352,7 +351,6 @@ pod: timeoutSeconds: 5 env: apiserver: - GODEBUG: http2server=0,http2client=0 manifests: configmap_bin: true diff --git a/charts/controller_manager/values.yaml b/charts/controller_manager/values.yaml index 2db091ce..fb86ded0 100644 --- a/charts/controller_manager/values.yaml +++ b/charts/controller_manager/values.yaml @@ -16,8 +16,8 @@ release_group: null images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 pull_policy: "IfNotPresent" labels: diff --git a/charts/haproxy/values.yaml b/charts/haproxy/values.yaml index 4f02982b..d05cb8a2 100644 --- a/charts/haproxy/values.yaml +++ b/charts/haproxy/values.yaml @@ -64,7 +64,7 @@ conf: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 + anchor: cwedgwood/kubectl:v1.19.7-1 haproxy: haproxy:1.8.25 test: python:3.6 pull_policy: "IfNotPresent" diff --git a/charts/proxy/values.yaml b/charts/proxy/values.yaml index 1196df83..72061516 100644 --- a/charts/proxy/values.yaml +++ b/charts/proxy/values.yaml @@ -67,7 +67,7 @@ pod: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.18.6 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.19.7 pull_policy: "IfNotPresent" proxy: diff --git a/charts/scheduler/values.yaml b/charts/scheduler/values.yaml index c41e3c4b..6b8f9389 100644 --- a/charts/scheduler/values.yaml +++ b/charts/scheduler/values.yaml @@ -85,8 +85,8 @@ secrets: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 pull_policy: "IfNotPresent" network: diff --git a/doc/source/configuration/genesis.rst b/doc/source/configuration/genesis.rst index dcf5163c..90708ad0 100644 --- a/doc/source/configuration/genesis.rst +++ b/doc/source/configuration/genesis.rst @@ -48,10 +48,10 @@ Here is a complete sample document: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "" diff --git a/doc/source/configuration/host-system.rst b/doc/source/configuration/host-system.rst index 4a7714eb..c67bc238 100644 --- a/doc/source/configuration/host-system.rst +++ b/doc/source/configuration/host-system.rst @@ -16,7 +16,7 @@ Sample Document to run containers in Docker runtime data: files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.18.6/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 images: @@ -115,7 +115,7 @@ Sample Document to run containers in Containerd runtime data: files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.18.6/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 images: diff --git a/examples/basic/Genesis.yaml b/examples/basic/Genesis.yaml index 3cd6abd8..288a273c 100644 --- a/examples/basic/Genesis.yaml +++ b/examples/basic/Genesis.yaml @@ -24,7 +24,6 @@ data: - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds,NodeRestriction,EventRateLimit - --service-cluster-ip-range=10.96.0.0/16 - --endpoint-reconciler-type=lease - - --feature-gates=PodShareProcessNamespace=true - --admission-control-config-file=/etc/kubernetes/apiserver/acconfig.yaml - --encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml - --v=3 @@ -51,10 +50,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/basic/HostSystem.yaml b/examples/basic/HostSystem.yaml index 9c0bc131..c1a47fa8 100644 --- a/examples/basic/HostSystem.yaml +++ b/examples/basic/HostSystem.yaml @@ -13,11 +13,11 @@ data: enable: true files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.18.6/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 - path: /usr/local/bin/kubectl - tar_url: https://dl.k8s.io/v1.18.6/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/systemd/system/kube-cgroup.service diff --git a/examples/basic/Kubelet.yaml b/examples/basic/Kubelet.yaml index 4712bd84..6135f6e6 100644 --- a/examples/basic/Kubelet.yaml +++ b/examples/basic/Kubelet.yaml @@ -18,7 +18,6 @@ data: config_file_overrides: evictionMaxPodGracePeriod: -1 featureGates: - PodShareProcessNamespace: true TaintBasedEvictions: true nodeStatusUpdateFrequency: "5s" serializeImagePulls: false diff --git a/examples/basic/armada-resources.yaml b/examples/basic/armada-resources.yaml index b25150c7..5daef8dc 100644 --- a/examples/basic/armada-resources.yaml +++ b/examples/basic/armada-resources.yaml @@ -160,7 +160,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.18.6 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.19.7 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -627,7 +627,7 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 + anchor: cwedgwood/kubectl:v1.19.7-1 haproxy: haproxy:1.8.3 test: python:3.6 @@ -728,8 +728,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -794,8 +794,8 @@ data: values: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 secrets: service_account: private_key: placeholder @@ -868,8 +868,8 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 source: type: local diff --git a/examples/complete/Genesis.yaml b/examples/complete/Genesis.yaml index 0195beb6..171ba872 100644 --- a/examples/complete/Genesis.yaml +++ b/examples/complete/Genesis.yaml @@ -39,10 +39,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/complete/HostSystem.yaml b/examples/complete/HostSystem.yaml index 86bef535..7b1add99 100644 --- a/examples/complete/HostSystem.yaml +++ b/examples/complete/HostSystem.yaml @@ -10,11 +10,11 @@ metadata: data: files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.18.6/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 - path: /usr/local/bin/kubectl - tar_url: https://dl.k8s.io/v1.18.6/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/logrotate.d/json-logrotate diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml index 392b0148..ed80ec7d 100644 --- a/examples/complete/armada-resources.yaml +++ b/examples/complete/armada-resources.yaml @@ -201,7 +201,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.18.6 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.19.7 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -644,7 +644,7 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 + anchor: cwedgwood/kubectl:v1.19.7-1 haproxy: haproxy:1.8.3 test: python:3.6 @@ -730,8 +730,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 secrets: service_account: public_key: placeholder @@ -807,8 +807,8 @@ data: values: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 secrets: service_account: private_key: placeholder @@ -880,8 +880,8 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 source: type: local diff --git a/examples/containerd/Genesis.yaml b/examples/containerd/Genesis.yaml index e0dfe0c4..60c1b537 100644 --- a/examples/containerd/Genesis.yaml +++ b/examples/containerd/Genesis.yaml @@ -24,7 +24,6 @@ data: - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds,EventRateLimit,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota - --service-cluster-ip-range=10.96.0.0/16 - --endpoint-reconciler-type=lease - - --feature-gates=PodShareProcessNamespace=true - --admission-control-config-file=/etc/kubernetes/apiserver/acconfig.yaml - --encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml - --v=3 @@ -51,10 +50,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/containerd/HostSystem.yaml b/examples/containerd/HostSystem.yaml index 3cc36e9e..b0539734 100644 --- a/examples/containerd/HostSystem.yaml +++ b/examples/containerd/HostSystem.yaml @@ -13,11 +13,11 @@ data: enable: true files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.18.6/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 - path: /usr/local/bin/kubectl - tar_url: https://dl.k8s.io/v1.18.6/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/systemd/system/kube-cgroup.service diff --git a/examples/containerd/Kubelet.yaml b/examples/containerd/Kubelet.yaml index cfee4294..21dba5a1 100644 --- a/examples/containerd/Kubelet.yaml +++ b/examples/containerd/Kubelet.yaml @@ -21,7 +21,6 @@ data: runtimeRequestTimeout: 15m evictionMaxPodGracePeriod: -1 featureGates: - PodShareProcessNamespace: true TaintBasedEvictions: true nodeStatusUpdateFrequency: "5s" serializeImagePulls: false diff --git a/examples/containerd/armada-resources.yaml b/examples/containerd/armada-resources.yaml index 5a56f378..a551c006 100644 --- a/examples/containerd/armada-resources.yaml +++ b/examples/containerd/armada-resources.yaml @@ -160,7 +160,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.18.6 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.19.7 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -524,7 +524,7 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 + anchor: cwedgwood/kubectl:v1.19.7-1 haproxy: haproxy:1.8.3 test: python:3.6 @@ -626,8 +626,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -692,8 +692,8 @@ data: values: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 secrets: service_account: private_key: placeholder @@ -766,8 +766,8 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 source: type: local diff --git a/examples/gate/Genesis.yaml b/examples/gate/Genesis.yaml index e0dfe0c4..60c1b537 100644 --- a/examples/gate/Genesis.yaml +++ b/examples/gate/Genesis.yaml @@ -24,7 +24,6 @@ data: - --enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,ResourceQuota,DefaultTolerationSeconds,EventRateLimit,PersistentVolumeLabel,DefaultStorageClass,ResourceQuota - --service-cluster-ip-range=10.96.0.0/16 - --endpoint-reconciler-type=lease - - --feature-gates=PodShareProcessNamespace=true - --admission-control-config-file=/etc/kubernetes/apiserver/acconfig.yaml - --encryption-provider-config=/etc/kubernetes/apiserver/encryption_provider.yaml - --v=3 @@ -51,10 +50,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/examples/gate/HostSystem.yaml b/examples/gate/HostSystem.yaml index c1928812..debbce75 100644 --- a/examples/gate/HostSystem.yaml +++ b/examples/gate/HostSystem.yaml @@ -13,11 +13,11 @@ data: enable: true files: - path: /opt/kubernetes/bin/kubelet - tar_url: https://dl.k8s.io/v1.18.6/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubelet mode: 0555 - path: /usr/local/bin/kubectl - tar_url: https://dl.k8s.io/v1.18.6/kubernetes-node-linux-amd64.tar.gz + tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz tar_path: kubernetes/node/bin/kubectl mode: 0555 - path: /etc/systemd/system/kube-cgroup.service diff --git a/examples/gate/Kubelet.yaml b/examples/gate/Kubelet.yaml index 4712bd84..6135f6e6 100644 --- a/examples/gate/Kubelet.yaml +++ b/examples/gate/Kubelet.yaml @@ -18,7 +18,6 @@ data: config_file_overrides: evictionMaxPodGracePeriod: -1 featureGates: - PodShareProcessNamespace: true TaintBasedEvictions: true nodeStatusUpdateFrequency: "5s" serializeImagePulls: false diff --git a/examples/gate/armada-resources.yaml b/examples/gate/armada-resources.yaml index d24bc17a..6e72ebe8 100644 --- a/examples/gate/armada-resources.yaml +++ b/examples/gate/armada-resources.yaml @@ -160,7 +160,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.18.6 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.19.7 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -530,7 +530,7 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 + anchor: cwedgwood/kubectl:v1.19.7-1 haproxy: haproxy:1.8.3 test: python:3.6 @@ -632,8 +632,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 network: kubernetes_service_ip: 10.96.0.1 pod_cidr: 10.97.0.0/16 @@ -698,8 +698,8 @@ data: values: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 secrets: service_account: private_key: placeholder @@ -772,8 +772,8 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 source: type: local diff --git a/tests/unit/api/test_validatedesign.py b/tests/unit/api/test_validatedesign.py index 0067b685..42fab326 100644 --- a/tests/unit/api/test_validatedesign.py +++ b/tests/unit/api/test_validatedesign.py @@ -107,13 +107,13 @@ VALID_DOCS = [ }, 'kubernetes': { 'apiserver': - 'k8s.gcr.io/kube-apiserver-amd64:v1.18.6', + 'k8s.gcr.io/kube-apiserver-amd64:v1.19.7', 'controller-manager': - 'k8s.gcr.io/kube-controller-manager-amd64:v1.18.6', + 'k8s.gcr.io/kube-controller-manager-amd64:v1.19.7', 'etcd': 'quay.io/coreos/etcd:v3.4.13', 'scheduler': - 'k8s.gcr.io/kube-scheduler-amd64:v1.18.6' + 'k8s.gcr.io/kube-scheduler-amd64:v1.19.7' } }, 'ip': @@ -149,7 +149,7 @@ VALID_DOCS = [ 'tar_path': 'kubernetes/node/bin/kubelet', 'tar_url': - 'https://dl.k8s.io/v1.18.6/kubernetes-node-linux-amd64.tar.gz' + 'https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz' }, { 'content': diff --git a/tests/unit/builder_data/simple/Genesis.yaml b/tests/unit/builder_data/simple/Genesis.yaml index 6968d38b..0cd8129e 100644 --- a/tests/unit/builder_data/simple/Genesis.yaml +++ b/tests/unit/builder_data/simple/Genesis.yaml @@ -36,10 +36,10 @@ data: helm: tiller: gcr.io/kubernetes-helm/tiller:v2.16.1 kubernetes: - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 - controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 + controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 etcd: quay.io/coreos/etcd:v3.4.13 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 files: - path: /var/lib/anchor/calico-etcd-bootstrap content: "# placeholder for triggering calico etcd bootstrapping" diff --git a/tests/unit/builder_data/simple/HostSystem.yaml b/tests/unit/builder_data/simple/HostSystem.yaml index de6618c4..c83c4d37 100644 --- a/tests/unit/builder_data/simple/HostSystem.yaml +++ b/tests/unit/builder_data/simple/HostSystem.yaml @@ -14,7 +14,7 @@ data: # attempt to actually run Kubernetes, only to construct the genesis and # join scripts. # - path: /opt/kubernetes/bin/kubelet - # tar_url: https://dl.k8s.io/v1.18.6/kubernetes-node-linux-amd64.tar.gz + # tar_url: https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz # tar_path: kubernetes/node/bin/kubelet # mode: 0555 - path: /etc/logrotate.d/json-logrotate diff --git a/tests/unit/builder_data/simple/armada-resources.yaml b/tests/unit/builder_data/simple/armada-resources.yaml index 5761b81e..9af0911f 100644 --- a/tests/unit/builder_data/simple/armada-resources.yaml +++ b/tests/unit/builder_data/simple/armada-resources.yaml @@ -161,7 +161,7 @@ data: values: images: tags: - proxy: k8s.gcr.io/kube-proxy-amd64:v1.18.6 + proxy: k8s.gcr.io/kube-proxy-amd64:v1.19.7 network: kubernetes_netloc: 127.0.0.1:6553 source: @@ -537,7 +537,7 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 + anchor: cwedgwood/kubectl:v1.19.7-1 haproxy: haproxy:1.8.3 test: python:3.6 @@ -629,8 +629,8 @@ data: endpoints: https://127.0.0.1:2378 images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.19.7 secrets: service_account: public_key: placeholder @@ -706,8 +706,8 @@ data: values: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 secrets: service_account: private_key: placeholder @@ -779,8 +779,8 @@ data: images: tags: - anchor: cwedgwood/kubectl:v1.18.6-4 - scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.18.6 + anchor: cwedgwood/kubectl:v1.19.7-1 + scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.19.7 source: type: local diff --git a/tools/gate/default-config-env b/tools/gate/default-config-env index a06f9dff..a583422b 100644 --- a/tools/gate/default-config-env +++ b/tools/gate/default-config-env @@ -8,10 +8,10 @@ IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 IMAGE_ETCD=quay.io/coreos/etcd:v3.4.13 IMAGE_HAPROXY=haproxy:1.8.3 IMAGE_HELM=lachlanevenson/k8s-helm:v2.14.0 -IMAGE_APISERVER=k8s.gcr.io/kube-apiserver-amd64:v1.18.6 -IMAGE_CONTROLLER_MANAGER=k8s.gcr.io/kube-controller-manager-amd64:v1.18.6 -IMAGE_SCHEDULER=k8s.gcr.io/kube-scheduler-amd64:v1.18.6 -IMAGE_PROXY=k8s.gcr.io/kube-proxy-amd64:v1.18.6 -IMAGE_ANCHOR=cwedgwood/kubectl:v1.18.6-4 +IMAGE_APISERVER=k8s.gcr.io/kube-apiserver-amd64:v1.19.7 +IMAGE_CONTROLLER_MANAGER=k8s.gcr.io/kube-controller-manager-amd64:v1.19.7 +IMAGE_SCHEDULER=k8s.gcr.io/kube-scheduler-amd64:v1.19.7 +IMAGE_PROXY=k8s.gcr.io/kube-proxy-amd64:v1.19.7 +IMAGE_ANCHOR=cwedgwood/kubectl:v1.19.7-1 IMAGE_TILLER=gcr.io/kubernetes-helm/tiller:v2.16.1 -KUBELET_URL=https://dl.k8s.io/v1.18.6/kubernetes-node-linux-amd64.tar.gz +KUBELET_URL=https://dl.k8s.io/v1.19.7/kubernetes-node-linux-amd64.tar.gz diff --git a/tools/registry/IMAGES b/tools/registry/IMAGES index ccd7b6b1..3ac3d40b 100644 --- a/tools/registry/IMAGES +++ b/tools/registry/IMAGES @@ -1,10 +1,10 @@ # source_name, tag, cache_name coredns/coredns,1.6.4,coredns -cwedgwood/kubectl,v1.18.6-4,kubectl -k8s.gcr.io/kube-apiserver-amd64,v1.18.6,apiserver -k8s.gcr.io/kube-controller-manager-amd64,v1.18.6,controller-manager -k8s.gcr.io/kube-scheduler-amd64,v1.18.6,scheduler -k8s.gcr.io/kube-proxy-amd64,v1.18.6,proxy +cwedgwood/kubectl,v1.19.7-1,kubectl +k8s.gcr.io/kube-apiserver-amd64,v1.19.7,apiserver +k8s.gcr.io/kube-controller-manager-amd64,v1.19.7,controller-manager +k8s.gcr.io/kube-scheduler-amd64,v1.19.7,scheduler +k8s.gcr.io/kube-proxy-amd64,v1.19.7,proxy k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64,1.14.4,k8s-dns-dnsmasq-nanny-amd64 k8s.gcr.io/k8s-dns-kube-dns-amd64,1.14.4,k8s-dns-kube-dns-amd64 k8s.gcr.io/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64