airship
/
promenade
Code Issues Proposed changes

Remove deprecated controller-manager flag 

Additionally update all images from k8s.gcr.io to registry.k8s.io

Change-Id: I0240ee0bf5d23d035126a81318f57b240f5af402
This commit is contained in:
SPEARS, DUSTIN (ds443n) 2023-04-18 15:02:30 -04:00
parent 5f62088d01
commit 70dd0c8599
26 changed files with 63 additions and 64 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:
tags:
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0
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

2
charts/apiserver/values.yaml
View File

@ -59,7 +59,7 @@ images:
tags:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0
key_rotate: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
pull_policy: "IfNotPresent"
local_registry:

3
charts/controller_manager/values.yaml
View File

@ -17,7 +17,7 @@ release_group: null
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0
controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0
pull_policy: "IfNotPresent"
labels:
@ -52,7 +52,6 @@ command_prefix:
- --cluster-cidr=10.97.0.0/16
- --node-monitor-period=5s
- --node-monitor-grace-period=20s
- --pod-eviction-timeout=60s
- --service-cluster-ip-range=10.96.0.0/16
- --terminated-pod-gc-threshold=1000

2
charts/proxy/values.yaml
View File

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

2
charts/scheduler/values.yaml
View File

@ -81,7 +81,7 @@ secrets:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0
scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0
pull_policy: "IfNotPresent"
network:

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

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

2
doc/source/configuration/kubelet.rst
View File

@ -33,7 +33,7 @@ Here is a sample document:
- --network-plugin=cni
- --v=5
images:
pause: k8s.gcr.io/pause-amd64:3.1
pause: registry.k8s.io/pause-amd64:3.1
config_file_overrides:
evictionMaxPodGracePeriod: -1
nodeStatusUpdateFrequency: "5s"

6
examples/basic/Genesis.yaml
View File

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

2
examples/basic/Kubelet.yaml
View File

@ -13,7 +13,7 @@ data:
- --container-runtime-endpoint=unix:///run/containerd/containerd.sock
- --v=3
images:
pause: k8s.gcr.io/pause-amd64:3.1
pause: registry.k8s.io/pause-amd64:3.1
config_file_overrides:
evictionMaxPodGracePeriod: -1
featureGates: {}

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

@ -159,7 +159,7 @@ data:
values:
images:
tags:
proxy: k8s.gcr.io/kube-proxy-amd64:v1.26.0
proxy: registry.k8s.io/kube-proxy-amd64:v1.26.0
network:
kubernetes_netloc: 127.0.0.1:6553
source:
@ -735,7 +735,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0
network:
kubernetes_service_ip: 10.96.0.1
pod_cidr: 10.97.0.0/16
@ -801,7 +801,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0
controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0
secrets:
service_account:
private_key: placeholder
@ -875,7 +875,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0
scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0
source:
type: local

6
examples/complete/Genesis.yaml
View File

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

2
examples/complete/Kubelet.yaml
View File

@ -13,7 +13,7 @@ data:
- --container-runtime-endpoint=unix:///run/containerd/containerd.sock
- --v=3
images:
pause: k8s.gcr.io/pause-amd64:3.1
pause: registry.k8s.io/pause-amd64:3.1
config_file_overrides:
evictionMaxPodGracePeriod: -1
nodeStatusUpdateFrequency: "5s"

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

@ -200,7 +200,7 @@ data:
values:
images:
tags:
proxy: k8s.gcr.io/kube-proxy-amd64:v1.26.0
proxy: registry.k8s.io/kube-proxy-amd64:v1.26.0
network:
kubernetes_netloc: 127.0.0.1:6553
source:
@ -736,7 +736,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0
secrets:
service_account:
public_key: placeholder
@ -813,7 +813,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0
controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0
secrets:
service_account:
private_key: placeholder
@ -886,7 +886,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0
scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0
source:
type: local
@ -1665,7 +1665,7 @@ data:
entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
# https://github.com/kubernetes/ingress-nginx/blob/09524cd3363693463da5bf4a9bb3900da435ad05/Changelog.md#090
ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
error_pages: k8s.gcr.io/defaultbackend:1.0
error_pages: registry.k8s.io/defaultbackend:1.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
source:
type: git

6
examples/containerd/Genesis.yaml
View File

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

2
examples/containerd/Kubelet.yaml
View File

@ -13,7 +13,7 @@ data:
- --container-runtime-endpoint=unix:///run/containerd/containerd.sock
- --v=3
images:
pause: k8s.gcr.io/pause-amd64:3.0
pause: registry.k8s.io/pause-amd64:3.0
config_file_overrides:
runtimeRequestTimeout: 15m
evictionMaxPodGracePeriod: -1

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

@ -159,7 +159,7 @@ data:
values:
images:
tags:
proxy: k8s.gcr.io/kube-proxy-amd64:v1.26.0
proxy: registry.k8s.io/kube-proxy-amd64:v1.26.0
network:
kubernetes_netloc: 127.0.0.1:6553
source:
@ -633,7 +633,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0
network:
kubernetes_service_ip: 10.96.0.1
pod_cidr: 10.97.0.0/16
@ -699,7 +699,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0
controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0
secrets:
service_account:
private_key: placeholder
@ -773,7 +773,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0
scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0
source:
type: local

6
examples/gate/Genesis.yaml
View File

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

2
examples/gate/Kubelet.yaml
View File

@ -13,7 +13,7 @@ data:
- --container-runtime-endpoint=unix:///run/containerd/containerd.sock
- --v=3
images:
pause: k8s.gcr.io/pause-amd64:3.1
pause: registry.k8s.io/pause-amd64:3.1
config_file_overrides:
evictionMaxPodGracePeriod: -1
featureGates: {}

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

@ -159,7 +159,7 @@ data:
values:
images:
tags:
proxy: k8s.gcr.io/kube-proxy-amd64:v1.26.0
proxy: registry.k8s.io/kube-proxy-amd64:v1.26.0
network:
kubernetes_netloc: 127.0.0.1:6553
source:
@ -639,7 +639,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0
network:
kubernetes_service_ip: 10.96.0.1
pod_cidr: 10.97.0.0/16
@ -705,7 +705,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0
controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0
secrets:
service_account:
private_key: placeholder
@ -779,7 +779,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0
scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0
source:
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',
'kubernetes': {
'apiserver':
'k8s.gcr.io/kube-apiserver-amd64:v1.26.0',
'registry.k8s.io/kube-apiserver-amd64:v1.26.0',
'controller-manager':
'k8s.gcr.io/kube-controller-manager-amd64:v1.26.0',
'registry.k8s.io/kube-controller-manager-amd64:v1.26.0',
'etcd':
'quay.io/coreos/etcd:v3.5.4',
'scheduler':
'k8s.gcr.io/kube-scheduler-amd64:v1.26.0'
'registry.k8s.io/kube-scheduler-amd64:v1.26.0'
}
},
'ip':
@ -195,7 +195,7 @@ VALID_DOCS = [
'data': {
'arguments': ['--v=5'],
'images': {
'pause': 'k8s.gcr.io/pause-amd64:3.1'
'pause': 'registry.k8s.io/pause-amd64:3.1'
},
'config_file_overrides': {
'evictionMaxPodGracePeriod': -1,

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

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

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

@ -14,7 +14,7 @@ data:
- --network-plugin=cni
- --v=5
images:
pause: k8s.gcr.io/pause-amd64:3.1
pause: registry.k8s.io/pause-amd64:3.1
config_file_overrides:
evictionMaxPodGracePeriod: -1
nodeStatusUpdateFrequency: "5s"

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

@ -160,7 +160,7 @@ data:
values:
images:
tags:
proxy: k8s.gcr.io/kube-proxy-amd64:v1.26.0
proxy: registry.k8s.io/kube-proxy-amd64:v1.26.0
network:
kubernetes_netloc: 127.0.0.1:6553
source:
@ -635,7 +635,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
apiserver: k8s.gcr.io/kube-apiserver-amd64:v1.26.0
apiserver: registry.k8s.io/kube-apiserver-amd64:v1.26.0
secrets:
service_account:
public_key: placeholder
@ -712,7 +712,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
controller_manager: k8s.gcr.io/kube-controller-manager-amd64:v1.26.0
controller_manager: registry.k8s.io/kube-controller-manager-amd64:v1.26.0
secrets:
service_account:
private_key: placeholder
@ -785,7 +785,7 @@ data:
images:
tags:
anchor: quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
scheduler: k8s.gcr.io/kube-scheduler-amd64:v1.26.0
scheduler: registry.k8s.io/kube-scheduler-amd64:v1.26.0
source:
type: local

2
tools/gate/config-templates/site-config.yaml
View File

@ -159,7 +159,7 @@ data:
arguments:
- --v=5
images:
pause: k8s.gcr.io/pause-amd64:3.1
pause: registry.k8s.io/pause-amd64:3.1
config_file_overrides:
evictionMaxPodGracePeriod: -1
nodeStatusUpdateFrequency: "5s"

8
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.5.4
IMAGE_HAPROXY=haproxy:1.8.3
IMAGE_HELM=lachlanevenson/k8s-helm:v3.9.4
IMAGE_APISERVER=k8s.gcr.io/kube-apiserver-amd64:v1.26.0
IMAGE_CONTROLLER_MANAGER=k8s.gcr.io/kube-controller-manager-amd64:v1.26.0
IMAGE_SCHEDULER=k8s.gcr.io/kube-scheduler-amd64:v1.26.0
IMAGE_PROXY=k8s.gcr.io/kube-proxy-amd64:v1.26.0
IMAGE_APISERVER=registry.k8s.io/kube-apiserver-amd64:v1.26.0
IMAGE_CONTROLLER_MANAGER=registry.k8s.io/kube-controller-manager-amd64:v1.26.0
IMAGE_SCHEDULER=registry.k8s.io/kube-scheduler-amd64:v1.26.0
IMAGE_PROXY=registry.k8s.io/kube-proxy-amd64:v1.26.0
IMAGE_ANCHOR=quay.io/airshipit/porthole-compute-utility:master-ubuntu_focal
KUBELET_URL=https://dl.k8s.io/v1.26.0/kubernetes-node-linux-amd64.tar.gz

8
tools/registry/IMAGES
View File

@ -1,10 +1,10 @@
# source_name, tag, cache_name
coredns/coredns,1.9.4,coredns
quay.io/airshipit/porthole-compute-utility,master-ubuntu_focal,kubectl
k8s.gcr.io/kube-apiserver-amd64,v1.26.0,apiserver
k8s.gcr.io/kube-controller-manager-amd64,v1.26.0,controller-manager
k8s.gcr.io/kube-scheduler-amd64,v1.26.0,scheduler
k8s.gcr.io/kube-proxy-amd64,v1.26.0,proxy
registry.k8s.io/kube-apiserver-amd64,v1.26.0,apiserver
registry.k8s.io/kube-controller-manager-amd64,v1.26.0,controller-manager
registry.k8s.io/kube-scheduler-amd64,v1.26.0,scheduler
registry.k8s.io/kube-proxy-amd64,v1.26.0,proxy
lachlanevenson/k8s-helm,v3.9.4,helm
quay.io/airshipit/armada,master,armada
quay.io/calico/cni,v3.4.0,calico-cni