kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update pause image to 3.5

This commit is contained in:
Peter Rifel 2021-07-02 06:36:39 -04:00
parent 090b525566
commit c5fbcccfa6
No known key found for this signature in database
GPG Key ID: BC6469E5B16DB2B6
15 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml
View File

@ -3,7 +3,7 @@ path: /etc/kubernetes/manifests
type: directory
---
contents: |
DAEMON_ARGS="--cgroup-root=/ --client-ca-file=/srv/kubernetes/ca.crt --cloud-provider=aws --cluster-dns=100.64.0.10 --cluster-domain=cluster.local --enable-debugging-handlers=true --eviction-hard=memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% --feature-gates=AllowExtTrafficLocalEndpoints=false,ExperimentalCriticalPodAnnotation=true --hostname-override=@aws --kubeconfig=/var/lib/kubelet/kubeconfig --network-plugin-mtu=9001 --network-plugin=kubenet --non-masquerade-cidr=100.64.0.0/10 --pod-infra-container-image=k8s.gcr.io/pause:3.2 --pod-manifest-path=/etc/kubernetes/manifests --register-schedulable=true --v=2 --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cloud-config=/etc/kubernetes/cloud.config --cni-bin-dir=/opt/cni/bin/ --cni-conf-dir=/etc/cni/net.d/"
DAEMON_ARGS="--cgroup-root=/ --client-ca-file=/srv/kubernetes/ca.crt --cloud-provider=aws --cluster-dns=100.64.0.10 --cluster-domain=cluster.local --enable-debugging-handlers=true --eviction-hard=memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% --feature-gates=AllowExtTrafficLocalEndpoints=false,ExperimentalCriticalPodAnnotation=true --hostname-override=@aws --kubeconfig=/var/lib/kubelet/kubeconfig --network-plugin-mtu=9001 --network-plugin=kubenet --non-masquerade-cidr=100.64.0.0/10 --pod-infra-container-image=k8s.gcr.io/pause:3.5 --pod-manifest-path=/etc/kubernetes/manifests --register-schedulable=true --v=2 --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cloud-config=/etc/kubernetes/cloud.config --cni-bin-dir=/opt/cni/bin/ --cni-conf-dir=/etc/cni/net.d/"
HOME="/root"
path: /etc/sysconfig/kubelet
type: file

2
nodeup/pkg/model/tests/kubelet/warmpool/tasks.yaml
View File

@ -3,7 +3,7 @@ path: /etc/kubernetes/manifests
type: directory
---
contents: |
DAEMON_ARGS="--authentication-token-webhook=true --authorization-mode=Webhook --cgroup-driver=systemd --cgroup-root=/ --client-ca-file=/srv/kubernetes/ca.crt --cloud-provider=aws --cluster-dns=100.64.0.10 --cluster-domain=cluster.local --enable-debugging-handlers=true --eviction-hard=memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% --hostname-override=@aws --kubeconfig=/var/lib/kubelet/kubeconfig --network-plugin-mtu=9001 --network-plugin=kubenet --non-masquerade-cidr=100.64.0.0/10 --pod-infra-container-image=k8s.gcr.io/pause:3.2 --pod-manifest-path=/etc/kubernetes/manifests --register-schedulable=true --v=2 --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cloud-config=/etc/kubernetes/cloud.config --cni-bin-dir=/opt/cni/bin/ --cni-conf-dir=/etc/cni/net.d/ --tls-cert-file=/srv/kubernetes/kubelet-server.crt --tls-private-key-file=/srv/kubernetes/kubelet-server.key"
DAEMON_ARGS="--authentication-token-webhook=true --authorization-mode=Webhook --cgroup-driver=systemd --cgroup-root=/ --client-ca-file=/srv/kubernetes/ca.crt --cloud-provider=aws --cluster-dns=100.64.0.10 --cluster-domain=cluster.local --enable-debugging-handlers=true --eviction-hard=memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% --hostname-override=@aws --kubeconfig=/var/lib/kubelet/kubeconfig --network-plugin-mtu=9001 --network-plugin=kubenet --non-masquerade-cidr=100.64.0.0/10 --pod-infra-container-image=k8s.gcr.io/pause:3.5 --pod-manifest-path=/etc/kubernetes/manifests --register-schedulable=true --v=2 --volume-plugin-dir=/usr/libexec/kubernetes/kubelet-plugins/volume/exec/ --cloud-config=/etc/kubernetes/cloud.config --cni-bin-dir=/opt/cni/bin/ --cni-conf-dir=/etc/cni/net.d/ --tls-cert-file=/srv/kubernetes/kubelet-server.crt --tls-private-key-file=/srv/kubernetes/kubelet-server.key"
HOME="/root"
path: /etc/sysconfig/kubelet
type: file

2
pkg/model/components/kubelet.go
View File

@ -192,7 +192,7 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
}
// Specify our pause image
image := "k8s.gcr.io/pause:3.2"
image := "k8s.gcr.io/pause:3.5"
var err error
if image, err = b.AssetBuilder.RemapImage(image); err != nil {
return err

10
tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml
View File

@ -236,7 +236,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L
logLevel: 2
networkPluginName: cni
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
masterKubelet:
anonymousAuth: false
@ -252,7 +252,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L
logLevel: 2
networkPluginName: cni
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
@ -263,7 +263,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersdockerexamplecom.Properties.L
ConfigBase: memfs://clusters.example.com/docker.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: Master
NodeupConfigHash: 7wLhmU1CsrGQdjeTFR3pywjn0UU5yJ9H4J3atlA+dWQ=
NodeupConfigHash: U1FUN5EgqeCFZxtdv3VWAjFME1bbXO1EGjbD0dS/pBU=
__EOF_KUBE_ENV
@ -441,7 +441,7 @@ Resources.AWSEC2LaunchTemplatenodesdockerexamplecom.Properties.LaunchTemplateDat
logLevel: 2
networkPluginName: cni
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
__EOF_CLUSTER_SPEC
@ -451,7 +451,7 @@ Resources.AWSEC2LaunchTemplatenodesdockerexamplecom.Properties.LaunchTemplateDat
ConfigBase: memfs://clusters.example.com/docker.example.com
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: uT7gaCMeKs7EkZrpwa31G1F5Co17mCbeRrWt3TOJS5M=
NodeupConfigHash: 4kf0pNVgBo7CPqMs66X9wpgiS8RbBqgPJUCmUtz5Shg=
__EOF_KUBE_ENV

10
tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml
View File

@ -225,7 +225,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope
logLevel: 2
networkPluginName: cni
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
masterKubelet:
anonymousAuth: false
@ -240,7 +240,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope
logLevel: 2
networkPluginName: cni
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
@ -251,7 +251,7 @@ Resources.AWSEC2LaunchTemplatemasterustest1amastersprivateciliumexamplecom.Prope
ConfigBase: memfs://clusters.example.com/privatecilium.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: Master
NodeupConfigHash: ngYYJkW+TGhe+wp8I86DL9etMMMzxq0wVOnnR+zlizo=
NodeupConfigHash: QRHTXO65Pe8y20r5yRz3IVLzz0EHPx7Zvx3vkAmzOY0=
__EOF_KUBE_ENV
@ -421,7 +421,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp
logLevel: 2
networkPluginName: cni
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
__EOF_CLUSTER_SPEC
@ -431,7 +431,7 @@ Resources.AWSEC2LaunchTemplatenodesprivateciliumexamplecom.Properties.LaunchTemp
ConfigBase: memfs://clusters.example.com/privatecilium.example.com
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: r2LvXGGufHxQJKN5OJSTbt2PNQ66dbWcpSgXU2aUP3U=
NodeupConfigHash: ssrLjXJ4JB/GBn+44ZEf+9sx+dVKdFYGsi5lT/c+0F8=
__EOF_KUBE_ENV

6
tests/integration/update_cluster/privatecilium2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
View File

@ -223,7 +223,7 @@ kubelet:
logLevel: 2
networkPluginName: cni
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
masterKubelet:
anonymousAuth: false
@ -238,7 +238,7 @@ masterKubelet:
logLevel: 2
networkPluginName: cni
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
@ -249,7 +249,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/privatecilium.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: Master
NodeupConfigHash: ngYYJkW+TGhe+wp8I86DL9etMMMzxq0wVOnnR+zlizo=
NodeupConfigHash: QRHTXO65Pe8y20r5yRz3IVLzz0EHPx7Zvx3vkAmzOY0=
__EOF_KUBE_ENV

4
tests/integration/update_cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data
View File

@ -161,7 +161,7 @@ kubelet:
logLevel: 2
networkPluginName: cni
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
__EOF_CLUSTER_SPEC
@ -171,7 +171,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/privatecilium.example.com
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: r2LvXGGufHxQJKN5OJSTbt2PNQ66dbWcpSgXU2aUP3U=
NodeupConfigHash: ssrLjXJ4JB/GBn+44ZEf+9sx+dVKdFYGsi5lT/c+0F8=
__EOF_KUBE_ENV

4
tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -148,7 +148,7 @@ spec:
logLevel: 2
networkPluginName: cni
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
kubernetesApiAccess:
- 0.0.0.0/0
@ -167,7 +167,7 @@ spec:
logLevel: 2
networkPluginName: cni
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
masterPublicName: api.privatecilium.example.com

2
tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content
View File

@ -153,7 +153,7 @@ KubeletConfig:
node-role.kubernetes.io/master: ""
node.kubernetes.io/exclude-from-external-load-balancers: ""
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
UpdatePolicy: automatic

2
tests/integration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-nodes_content
View File

@ -52,7 +52,7 @@ KubeletConfig:
kubernetes.io/role: node
node-role.kubernetes.io/node: ""
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
UpdatePolicy: automatic
channels:

6
tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View File

@ -229,7 +229,7 @@ kubelet:
logLevel: 2
networkPluginName: cni
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
masterKubelet:
anonymousAuth: false
@ -244,7 +244,7 @@ masterKubelet:
logLevel: 2
networkPluginName: cni
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
@ -255,7 +255,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: Master
NodeupConfigHash: dCeJh2eGQxd5dMQm67DNQnkfZCyhY2LquYX/UUVEeXQ=
NodeupConfigHash: kZa+QZsnvJR5cfP4T3lf6GjEagghHV/IebikWUF1kd4=
__EOF_KUBE_ENV

4
tests/integration/update_cluster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data
View File

@ -161,7 +161,7 @@ kubelet:
logLevel: 2
networkPluginName: cni
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
__EOF_CLUSTER_SPEC
@ -171,7 +171,7 @@ CloudProvider: aws
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: DPy0HNggZ8VLHKRcC3hJq5KckOW/D8JeqbJhXHWfzvc=
NodeupConfigHash: Sf1d0CKsog5e6NOJKOqoWxwb2YlKySwIMWAC1YycyHs=
__EOF_KUBE_ENV

4
tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_cluster-completed.spec_content
View File

@ -152,7 +152,7 @@ spec:
logLevel: 2
networkPluginName: cni
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
kubernetesApiAccess:
- 0.0.0.0/0
@ -171,7 +171,7 @@ spec:
logLevel: 2
networkPluginName: cni
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
masterPublicName: api.minimal.example.com

2
tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content
View File

@ -159,7 +159,7 @@ KubeletConfig:
node-role.kubernetes.io/master: ""
node.kubernetes.io/exclude-from-external-load-balancers: ""
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
registerSchedulable: false
UpdatePolicy: automatic

2
tests/integration/update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_nodeupconfig-nodes_content
View File

@ -52,7 +52,7 @@ KubeletConfig:
kubernetes.io/role: node
node-role.kubernetes.io/node: ""
nonMasqueradeCIDR: 100.64.0.0/10
podInfraContainerImage: k8s.gcr.io/pause:3.2
podInfraContainerImage: k8s.gcr.io/pause:3.5
podManifestPath: /etc/kubernetes/manifests
UpdatePolicy: automatic
channels: