airship
/
promenade
Code Issues Proposed changes

Promenade Enhancement 

Update charts in Promenade to Kubernetes version 1.21

Change-Id: Iab6d10b384a8be3a4b4d2357a51b35ab93a797b0
This commit is contained in:
francisy 2021-12-17 13:24:21 -05:00
parent e4d9d99c13
commit 3cac5cbde0
26 changed files with 94 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/apiserver-webhook/values.yaml
View File

@ -17,7 +17,7 @@ release_uuid: null
images: images:
tags: tags:
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
kubernetes_keystone_webhook: docker.io/k8scloudprovider/k8s-keystone-auth:latest kubernetes_keystone_webhook: docker.io/k8scloudprovider/k8s-keystone-auth:latest
scripted_test: docker.io/openstackhelm/heat:newton scripted_test: docker.io/openstackhelm/heat:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1

6
charts/apiserver/values.yaml
View File

@ -58,9 +58,9 @@ const:
images: images:
tags: tags:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
key_rotate: cwedgwood/kubectl:v1.20.5-1 key_rotate: cwedgwood/kubectl:v1.21.7-1
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
local_registry: local_registry:
active: false active: false

4
charts/controller_manager/values.yaml
View File

@ -16,8 +16,8 @@ release_group: null
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
labels: labels:

2
charts/haproxy/values.yaml
View File

@ -64,7 +64,7 @@ conf:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
haproxy: haproxy:1.8.25 haproxy: haproxy:1.8.25
test: python:3.6 test: python:3.6
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"

2
charts/proxy/values.yaml
View File

@ -68,7 +68,7 @@ pod:
images: images:
tags: tags:
proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 proxy: k8s.gcr.io/kube-proxy-amd64:v1.21.7
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
proxy: proxy:

4
charts/scheduler/values.yaml
View File

@ -85,8 +85,8 @@ secrets:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
network: network:

6
doc/source/configuration/genesis.rst
View File

@ -42,10 +42,10 @@ Here is a complete sample document:
images: images:
armada: quay.io/airshipit/armada:latest armada: quay.io/airshipit/armada:latest
kubernetes: kubernetes:
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
etcd: quay.io/coreos/etcd:v3.4.13 etcd: quay.io/coreos/etcd:v3.4.13
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
files: files:
- path: /var/lib/anchor/calico-etcd-bootstrap - path: /var/lib/anchor/calico-etcd-bootstrap
content: "" content: ""

4
doc/source/configuration/host-system.rst
View File

@ -16,7 +16,7 @@ Sample Document to run containers in Docker runtime
data: data:
files: files:
- path: /opt/kubernetes/bin/kubelet - path: /opt/kubernetes/bin/kubelet
tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_url: https://dl.k8s.io/v1.21.7/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubelet tar_path: kubernetes/node/bin/kubelet
mode: 0555 mode: 0555
images: images:
@ -115,7 +115,7 @@ Sample Document to run containers in Containerd runtime
data: data:
files: files:
- path: /opt/kubernetes/bin/kubelet - path: /opt/kubernetes/bin/kubelet
tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_url: https://dl.k8s.io/v1.21.7/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubelet tar_path: kubernetes/node/bin/kubelet
mode: 0555 mode: 0555
images: images:

6
examples/basic/Genesis.yaml
View File

@ -46,10 +46,10 @@ data:
images: images:
armada: quay.io/airshipit/armada:master-ubuntu_bionic armada: quay.io/airshipit/armada:master-ubuntu_bionic
kubernetes: kubernetes:
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
etcd: quay.io/coreos/etcd:v3.4.13 etcd: quay.io/coreos/etcd:v3.4.13
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
files: files:
- path: /var/lib/anchor/calico-etcd-bootstrap - path: /var/lib/anchor/calico-etcd-bootstrap
content: "# placeholder for triggering calico etcd bootstrapping" content: "# placeholder for triggering calico etcd bootstrapping"

4
examples/basic/HostSystem.yaml
View File

@ -13,11 +13,11 @@ data:
enable: true enable: true
files: files:
- path: /opt/kubernetes/bin/kubelet - path: /opt/kubernetes/bin/kubelet
tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_url: https://dl.k8s.io/v1.21.7/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubelet tar_path: kubernetes/node/bin/kubelet
mode: 0555 mode: 0555
- path: /usr/local/bin/kubectl - path: /usr/local/bin/kubectl
tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_url: https://dl.k8s.io/v1.21.7/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubectl tar_path: kubernetes/node/bin/kubectl
mode: 0555 mode: 0555
- path: /etc/systemd/system/kube-cgroup.service - path: /etc/systemd/system/kube-cgroup.service

16
examples/basic/armada-resources.yaml
View File

@ -159,7 +159,7 @@ data:
values: values:
images: images:
tags: tags:
proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 proxy: k8s.gcr.io/kube-proxy-amd64:v1.21.7
network: network:
kubernetes_netloc: 127.0.0.1:6553 kubernetes_netloc: 127.0.0.1:6553
source: source:
@ -626,7 +626,7 @@ data:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
haproxy: haproxy:1.8.3 haproxy: haproxy:1.8.3
test: python:3.6 test: python:3.6
@ -734,8 +734,8 @@ data:
endpoints: https://127.0.0.1:2378 endpoints: https://127.0.0.1:2378
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
network: network:
kubernetes_service_ip: 10.96.0.1 kubernetes_service_ip: 10.96.0.1
pod_cidr: 10.97.0.0/16 pod_cidr: 10.97.0.0/16
@ -800,8 +800,8 @@ data:
values: values:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
secrets: secrets:
service_account: service_account:
private_key: placeholder private_key: placeholder
@ -874,8 +874,8 @@ data:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
source: source:
type: local type: local

6
examples/complete/Genesis.yaml
View File

@ -35,10 +35,10 @@ data:
images: images:
armada: quay.io/airshipit/armada:master-ubuntu_bionic armada: quay.io/airshipit/armada:master-ubuntu_bionic
kubernetes: kubernetes:
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
etcd: quay.io/coreos/etcd:v3.4.13 etcd: quay.io/coreos/etcd:v3.4.13
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
files: files:
- path: /var/lib/anchor/calico-etcd-bootstrap - path: /var/lib/anchor/calico-etcd-bootstrap
content: "# placeholder for triggering calico etcd bootstrapping" content: "# placeholder for triggering calico etcd bootstrapping"

4
examples/complete/HostSystem.yaml
View File

@ -10,11 +10,11 @@ metadata:
data: data:
files: files:
- path: /opt/kubernetes/bin/kubelet - path: /opt/kubernetes/bin/kubelet
tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_url: https://dl.k8s.io/v1.21.7/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubelet tar_path: kubernetes/node/bin/kubelet
mode: 0555 mode: 0555
- path: /usr/local/bin/kubectl - path: /usr/local/bin/kubectl
tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_url: https://dl.k8s.io/v1.21.7/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubectl tar_path: kubernetes/node/bin/kubectl
mode: 0555 mode: 0555
- path: /etc/logrotate.d/json-logrotate - path: /etc/logrotate.d/json-logrotate

16
examples/complete/armada-resources.yaml
View File

@ -200,7 +200,7 @@ data:
values: values:
images: images:
tags: tags:
proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 proxy: k8s.gcr.io/kube-proxy-amd64:v1.21.7
network: network:
kubernetes_netloc: 127.0.0.1:6553 kubernetes_netloc: 127.0.0.1:6553
source: source:
@ -643,7 +643,7 @@ data:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
haproxy: haproxy:1.8.3 haproxy: haproxy:1.8.3
test: python:3.6 test: python:3.6
@ -736,8 +736,8 @@ data:
endpoints: https://127.0.0.1:2378 endpoints: https://127.0.0.1:2378
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
secrets: secrets:
service_account: service_account:
public_key: placeholder public_key: placeholder
@ -813,8 +813,8 @@ data:
values: values:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
secrets: secrets:
service_account: service_account:
private_key: placeholder private_key: placeholder
@ -886,8 +886,8 @@ data:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
source: source:
type: local type: local

6
examples/containerd/Genesis.yaml
View File

@ -46,10 +46,10 @@ data:
images: images:
armada: quay.io/airshipit/armada:master-ubuntu_bionic armada: quay.io/airshipit/armada:master-ubuntu_bionic
kubernetes: kubernetes:
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
etcd: quay.io/coreos/etcd:v3.4.13 etcd: quay.io/coreos/etcd:v3.4.13
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
files: files:
- path: /var/lib/anchor/calico-etcd-bootstrap - path: /var/lib/anchor/calico-etcd-bootstrap
content: "# placeholder for triggering calico etcd bootstrapping" content: "# placeholder for triggering calico etcd bootstrapping"

4
examples/containerd/HostSystem.yaml
View File

@ -13,11 +13,11 @@ data:
enable: true enable: true
files: files:
- path: /opt/kubernetes/bin/kubelet - path: /opt/kubernetes/bin/kubelet
tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_url: https://dl.k8s.io/v1.21.7/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubelet tar_path: kubernetes/node/bin/kubelet
mode: 0555 mode: 0555
- path: /usr/local/bin/kubectl - path: /usr/local/bin/kubectl
tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_url: https://dl.k8s.io/v1.21.7/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubectl tar_path: kubernetes/node/bin/kubectl
mode: 0555 mode: 0555
- path: /etc/systemd/system/kube-cgroup.service - path: /etc/systemd/system/kube-cgroup.service

16
examples/containerd/armada-resources.yaml
View File

@ -159,7 +159,7 @@ data:
values: values:
images: images:
tags: tags:
proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 proxy: k8s.gcr.io/kube-proxy-amd64:v1.21.7
network: network:
kubernetes_netloc: 127.0.0.1:6553 kubernetes_netloc: 127.0.0.1:6553
source: source:
@ -523,7 +523,7 @@ data:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
haproxy: haproxy:1.8.3 haproxy: haproxy:1.8.3
test: python:3.6 test: python:3.6
@ -632,8 +632,8 @@ data:
endpoints: https://127.0.0.1:2378 endpoints: https://127.0.0.1:2378
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
network: network:
kubernetes_service_ip: 10.96.0.1 kubernetes_service_ip: 10.96.0.1
pod_cidr: 10.97.0.0/16 pod_cidr: 10.97.0.0/16
@ -698,8 +698,8 @@ data:
values: values:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
secrets: secrets:
service_account: service_account:
private_key: placeholder private_key: placeholder
@ -772,8 +772,8 @@ data:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
source: source:
type: local type: local

6
examples/gate/Genesis.yaml
View File

@ -46,10 +46,10 @@ data:
images: images:
armada: quay.io/airshipit/armada:master-ubuntu_bionic armada: quay.io/airshipit/armada:master-ubuntu_bionic
kubernetes: kubernetes:
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
etcd: quay.io/coreos/etcd:v3.4.13 etcd: quay.io/coreos/etcd:v3.4.13
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
files: files:
- path: /var/lib/anchor/calico-etcd-bootstrap - path: /var/lib/anchor/calico-etcd-bootstrap
content: "# placeholder for triggering calico etcd bootstrapping" content: "# placeholder for triggering calico etcd bootstrapping"

4
examples/gate/HostSystem.yaml
View File

@ -13,11 +13,11 @@ data:
enable: true enable: true
files: files:
- path: /opt/kubernetes/bin/kubelet - path: /opt/kubernetes/bin/kubelet
tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_url: https://dl.k8s.io/v1.21.7/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubelet tar_path: kubernetes/node/bin/kubelet
mode: 0555 mode: 0555
- path: /usr/local/bin/kubectl - path: /usr/local/bin/kubectl
tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz tar_url: https://dl.k8s.io/v1.21.7/kubernetes-node-linux-amd64.tar.gz
tar_path: kubernetes/node/bin/kubectl tar_path: kubernetes/node/bin/kubectl
mode: 0555 mode: 0555
- path: /etc/systemd/system/kube-cgroup.service - path: /etc/systemd/system/kube-cgroup.service

16
examples/gate/armada-resources.yaml
View File

@ -159,7 +159,7 @@ data:
values: values:
images: images:
tags: tags:
proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 proxy: k8s.gcr.io/kube-proxy-amd64:v1.21.7
network: network:
kubernetes_netloc: 127.0.0.1:6553 kubernetes_netloc: 127.0.0.1:6553
source: source:
@ -529,7 +529,7 @@ data:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
haproxy: haproxy:1.8.3 haproxy: haproxy:1.8.3
test: python:3.6 test: python:3.6
@ -638,8 +638,8 @@ data:
endpoints: https://127.0.0.1:2378 endpoints: https://127.0.0.1:2378
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
network: network:
kubernetes_service_ip: 10.96.0.1 kubernetes_service_ip: 10.96.0.1
pod_cidr: 10.97.0.0/16 pod_cidr: 10.97.0.0/16
@ -704,8 +704,8 @@ data:
values: values:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
secrets: secrets:
service_account: service_account:
private_key: placeholder private_key: placeholder
@ -778,8 +778,8 @@ data:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
source: source:
type: local type: local

8
tests/unit/api/test_validatedesign.py
View File

@ -104,13 +104,13 @@ VALID_DOCS = [
'armada': 'quay.io/airshipit/armada:master-ubuntu_bionic', 'armada': 'quay.io/airshipit/armada:master-ubuntu_bionic',
'kubernetes': { 'kubernetes': {
'apiserver': 'apiserver':
'k8s.gcr.io/kube-apiserver-amd64:v1.20.5', 'k8s.gcr.io/kube-apiserver-amd64:v1.21.7',
'controller-manager': 'controller-manager':
'k8s.gcr.io/kube-controller-manager-amd64:v1.20.5', 'k8s.gcr.io/kube-controller-manager-amd64:v1.21.7',
'etcd': 'etcd':
'quay.io/coreos/etcd:v3.4.13', 'quay.io/coreos/etcd:v3.4.13',
'scheduler': 'scheduler':
'k8s.gcr.io/kube-scheduler-amd64:v1.20.5' 'k8s.gcr.io/kube-scheduler-amd64:v1.21.7'
} }
}, },
'ip': 'ip':
@ -146,7 +146,7 @@ VALID_DOCS = [
'tar_path': 'tar_path':
'kubernetes/node/bin/kubelet', 'kubernetes/node/bin/kubelet',
'tar_url': 'tar_url':
'https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz' 'https://dl.k8s.io/v1.21.7/kubernetes-node-linux-amd64.tar.gz'
}, },
{ {
'content': 'content':

6
tests/unit/builder_data/simple/Genesis.yaml
View File

@ -32,10 +32,10 @@ data:
images: images:
armada: quay.io/airshipit/armada:master-ubuntu_bionic armada: quay.io/airshipit/armada:master-ubuntu_bionic
kubernetes: kubernetes:
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 controller-manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
etcd: quay.io/coreos/etcd:v3.4.13 etcd: quay.io/coreos/etcd:v3.4.13
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
files: files:
- path: /var/lib/anchor/calico-etcd-bootstrap - path: /var/lib/anchor/calico-etcd-bootstrap
content: "# placeholder for triggering calico etcd bootstrapping" content: "# placeholder for triggering calico etcd bootstrapping"

2
tests/unit/builder_data/simple/HostSystem.yaml
View File

@ -14,7 +14,7 @@ data:
# attempt to actually run Kubernetes, only to construct the genesis and # attempt to actually run Kubernetes, only to construct the genesis and
# join scripts. # join scripts.
# - path: /opt/kubernetes/bin/kubelet # - path: /opt/kubernetes/bin/kubelet
# tar_url: https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz # tar_url: https://dl.k8s.io/v1.21.7/kubernetes-node-linux-amd64.tar.gz
# tar_path: kubernetes/node/bin/kubelet # tar_path: kubernetes/node/bin/kubelet
# mode: 0555 # mode: 0555
- path: /etc/logrotate.d/json-logrotate - path: /etc/logrotate.d/json-logrotate

16
tests/unit/builder_data/simple/armada-resources.yaml
View File

@ -160,7 +160,7 @@ data:
values: values:
images: images:
tags: tags:
proxy: k8s.gcr.io/kube-proxy-amd64:v1.20.5 proxy: k8s.gcr.io/kube-proxy-amd64:v1.21.7
network: network:
kubernetes_netloc: 127.0.0.1:6553 kubernetes_netloc: 127.0.0.1:6553
source: source:
@ -536,7 +536,7 @@ data:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
haproxy: haproxy:1.8.3 haproxy: haproxy:1.8.3
test: python:3.6 test: python:3.6
@ -635,8 +635,8 @@ data:
endpoints: https://127.0.0.1:2378 endpoints: https://127.0.0.1:2378
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.20.5 apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.21.7
secrets: secrets:
service_account: service_account:
public_key: placeholder public_key: placeholder
@ -712,8 +712,8 @@ data:
values: values:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
secrets: secrets:
service_account: service_account:
private_key: placeholder private_key: placeholder
@ -785,8 +785,8 @@ data:
images: images:
tags: tags:
anchor: cwedgwood/kubectl:v1.20.5-1 anchor: cwedgwood/kubectl:v1.21.7-1
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.20.5 scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.21.7
source: source:
type: local type: local

12
tools/gate/default-config-env
View File

@ -8,9 +8,9 @@ IMAGE_DEP_CHECK=quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
IMAGE_ETCD=quay.io/coreos/etcd:v3.4.13 IMAGE_ETCD=quay.io/coreos/etcd:v3.4.13
IMAGE_HAPROXY=haproxy:1.8.3 IMAGE_HAPROXY=haproxy:1.8.3
IMAGE_HELM=lachlanevenson/k8s-helm:v3.6.2 IMAGE_HELM=lachlanevenson/k8s-helm:v3.6.2
IMAGE_APISERVER=k8s.gcr.io/kube-apiserver-amd64:v1.20.5 IMAGE_APISERVER=k8s.gcr.io/kube-apiserver-amd64:v1.21.7
IMAGE_CONTROLLER_MANAGER=k8s.gcr.io/kube-controller-manager-amd64:v1.20.5 IMAGE_CONTROLLER_MANAGER=k8s.gcr.io/kube-controller-manager-amd64:v1.21.7
IMAGE_SCHEDULER=k8s.gcr.io/kube-scheduler-amd64:v1.20.5 IMAGE_SCHEDULER=k8s.gcr.io/kube-scheduler-amd64:v1.21.7
IMAGE_PROXY=k8s.gcr.io/kube-proxy-amd64:v1.20.5 IMAGE_PROXY=k8s.gcr.io/kube-proxy-amd64:v1.21.7
IMAGE_ANCHOR=cwedgwood/kubectl:v1.20.5-1 IMAGE_ANCHOR=cwedgwood/kubectl:v1.21.7-1
KUBELET_URL=https://dl.k8s.io/v1.20.5/kubernetes-node-linux-amd64.tar.gz KUBELET_URL=https://dl.k8s.io/v1.21.7/kubernetes-node-linux-amd64.tar.gz

10
tools/registry/IMAGES
View File

@ -1,10 +1,10 @@
# source_name, tag, cache_name # source_name, tag, cache_name
coredns/coredns,1.7.0,coredns coredns/coredns,1.7.0,coredns
cwedgwood/kubectl,v1.20.5-1,kubectl cwedgwood/kubectl,v1.21.7-1,kubectl
k8s.gcr.io/kube-apiserver-amd64,v1.20.5,apiserver k8s.gcr.io/kube-apiserver-amd64,v1.21.7,apiserver
k8s.gcr.io/kube-controller-manager-amd64,v1.20.5,controller-manager k8s.gcr.io/kube-controller-manager-amd64,v1.21.7,controller-manager
k8s.gcr.io/kube-scheduler-amd64,v1.20.5,scheduler k8s.gcr.io/kube-scheduler-amd64,v1.21.7,scheduler
k8s.gcr.io/kube-proxy-amd64,v1.20.5,proxy k8s.gcr.io/kube-proxy-amd64,v1.21.7,proxy
k8s.gcr.io/k8s-dns-dnsmasq-nanny-amd64,1.14.4,k8s-dns-dnsmasq-nanny-amd64 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-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 k8s.gcr.io/k8s-dns-sidecar-amd64,1.14.4,k8s-dns-sidecar-amd64