Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update pause image to 3.5 #11909

Merged
merged 1 commit into from
Jul 2, 2021
Merged

Update pause image to 3.5 #11909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion nodeup/pkg/model/tests/kubelet/featuregates/tasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion nodeup/pkg/model/tests/kubelet/warmpool/tasks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/model/components/kubelet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions tests/integration/update_cluster/docker-custom/cloudformation.json.extracted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down
10 changes: 5 additions & 5 deletions tests/integration/update_cluster/privatecilium2/cloudformation.json.extracted.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions ...m2/data/aws_launch_template_master-us-test-1a.masters.privatecilium.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ...cluster/privatecilium2/data/aws_launch_template_nodes.privatecilium.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ...on/update_cluster/privatecilium2/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...e_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...ration/update_cluster/privatecilium2/data/aws_s3_bucket_object_nodeupconfig-nodes_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions ...piserver/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ...luster/public-jwks-apiserver/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ...te_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...er/public-jwks-apiserver/data/aws_s3_bucket_object_nodeupconfig-master-us-test-1a_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...update_cluster/public-jwks-apiserver/data/aws_s3_bucket_object_nodeupconfig-nodes_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down