Merge pull request #98205 from pacoxu/build/pauses
update pause image to 3.4.1 and also update the change log
This commit is contained in:
commit
2b7c61b1bb
@ -160,9 +160,9 @@ dependencies:
|
|||||||
match: TAG =
|
match: TAG =
|
||||||
|
|
||||||
- name: "k8s.gcr.io/pause: dependents"
|
- name: "k8s.gcr.io/pause: dependents"
|
||||||
version: 3.2
|
version: 3.4.1
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: cmd/kubeadm/app/constants/constants_unix.go
|
- path: cmd/kubeadm/app/constants/constants.go
|
||||||
match: PauseVersion\s+=
|
match: PauseVersion\s+=
|
||||||
- path: cmd/kubeadm/app/util/template_test.go
|
- path: cmd/kubeadm/app/util/template_test.go
|
||||||
match: validTmpl\s+=
|
match: validTmpl\s+=
|
||||||
@ -209,7 +209,7 @@ dependencies:
|
|||||||
- path: test/utils/runners.go
|
- path: test/utils/runners.go
|
||||||
match: k8s.gcr.io\/pause:\d+\.\d+
|
match: k8s.gcr.io\/pause:\d+\.\d+
|
||||||
- path: test/utils/image/manifest.go
|
- path: test/utils/image/manifest.go
|
||||||
match: configs\[Pause\] = Config{gcRegistry, "pause", "\d+\.\d+"}
|
match: configs\[Pause\] = Config{gcRegistry, "pause", "\d+\.\d+.\d+"}
|
||||||
|
|
||||||
# metadata-concealment: bump this one first
|
# metadata-concealment: bump this one first
|
||||||
- name: "metadata-concealment"
|
- name: "metadata-concealment"
|
||||||
|
@ -1,3 +1,15 @@
|
|||||||
|
# 3.4.1
|
||||||
|
|
||||||
|
* Support for Windows container images (OS Versions: 20H2) was added.([#97322](https://prs.k8s.io/97322), [@claudiubelu](https://github.com/claudiubelu))
|
||||||
|
|
||||||
|
# 3.4
|
||||||
|
|
||||||
|
* Support for Windows container images (OS Versions: 1809, 1903, 1909, 2004) was added. ([#91452](https://prs.k8s.io/91452), [@claudiubelu](https://github.com/claudiubelu))
|
||||||
|
|
||||||
|
# 3.3
|
||||||
|
|
||||||
|
* update debian-base version to v2.1.0 ([#90665](https://prs.k8s.io/90665), [@justaugustus]
|
||||||
|
|
||||||
# 3.2
|
# 3.2
|
||||||
|
|
||||||
* The pause container is built with the correct "Architecture" metadata. ([#87954](https://prs.k8s.io/87954), [@BenTheElder](https://github.com/BenTheElder))
|
* The pause container is built with the correct "Architecture" metadata. ([#87954](https://prs.k8s.io/87954), [@BenTheElder](https://github.com/BenTheElder))
|
||||||
|
@ -158,7 +158,7 @@ export WINDOWS_BOOTSTRAP_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubelet.bootstrap-k
|
|||||||
# Path for kube-proxy kubeconfig file on Windows nodes.
|
# Path for kube-proxy kubeconfig file on Windows nodes.
|
||||||
export WINDOWS_KUBEPROXY_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubeproxy.kubeconfig"
|
export WINDOWS_KUBEPROXY_KUBECONFIG_FILE="${WINDOWS_K8S_DIR}\kubeproxy.kubeconfig"
|
||||||
# Pause container image for Windows container.
|
# Pause container image for Windows container.
|
||||||
export WINDOWS_INFRA_CONTAINER="gcr.io/gke-release/pause-win:1.5.1"
|
export WINDOWS_INFRA_CONTAINER="k8s.gcr.io/pause:3.4.1"
|
||||||
# Storage Path for csi-proxy. csi-proxy only needs to be installed for Windows.
|
# Storage Path for csi-proxy. csi-proxy only needs to be installed for Windows.
|
||||||
export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/csi-proxy"
|
export CSI_PROXY_STORAGE_PATH="https://storage.googleapis.com/gke-release/csi-proxy"
|
||||||
# Version for csi-proxy
|
# Version for csi-proxy
|
||||||
|
@ -358,7 +358,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: pause-win
|
- name: pause-win
|
||||||
image: gcr.io/gke-release/pause-win:1.5.1
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
kubernetes.io/os: windows
|
kubernetes.io/os: windows
|
||||||
tolerations:
|
tolerations:
|
||||||
|
@ -414,6 +414,9 @@ const (
|
|||||||
ModeRBAC string = "RBAC"
|
ModeRBAC string = "RBAC"
|
||||||
// ModeNode is an authorization mode that authorizes API requests made by kubelets.
|
// ModeNode is an authorization mode that authorizes API requests made by kubelets.
|
||||||
ModeNode string = "Node"
|
ModeNode string = "Node"
|
||||||
|
|
||||||
|
// PauseVersion indicates the default pause image version for kubeadm
|
||||||
|
PauseVersion = "3.4.1"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -21,7 +21,4 @@ package constants
|
|||||||
const (
|
const (
|
||||||
// DefaultDockerCRISocket defines the default Docker CRI socket
|
// DefaultDockerCRISocket defines the default Docker CRI socket
|
||||||
DefaultDockerCRISocket = "/var/run/dockershim.sock"
|
DefaultDockerCRISocket = "/var/run/dockershim.sock"
|
||||||
|
|
||||||
// PauseVersion indicates the default pause image version for kubeadm
|
|
||||||
PauseVersion = "3.2"
|
|
||||||
)
|
)
|
||||||
|
@ -21,7 +21,4 @@ package constants
|
|||||||
const (
|
const (
|
||||||
// DefaultDockerCRISocket defines the default Docker CRI socket
|
// DefaultDockerCRISocket defines the default Docker CRI socket
|
||||||
DefaultDockerCRISocket = "npipe:////./pipe/docker_engine"
|
DefaultDockerCRISocket = "npipe:////./pipe/docker_engine"
|
||||||
|
|
||||||
// PauseVersion indicates the default pause image version for kubeadm
|
|
||||||
PauseVersion = "1.4.0"
|
|
||||||
)
|
)
|
||||||
|
@ -8,23 +8,14 @@ load(
|
|||||||
|
|
||||||
go_library(
|
go_library(
|
||||||
name = "go_default_library",
|
name = "go_default_library",
|
||||||
srcs = [
|
srcs = ["images.go"],
|
||||||
"images.go",
|
|
||||||
"images_unix.go",
|
|
||||||
"images_windows.go",
|
|
||||||
],
|
|
||||||
importpath = "k8s.io/kubernetes/cmd/kubeadm/app/images",
|
importpath = "k8s.io/kubernetes/cmd/kubeadm/app/images",
|
||||||
deps = [
|
deps = [
|
||||||
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
|
"//cmd/kubeadm/app/apis/kubeadm:go_default_library",
|
||||||
"//cmd/kubeadm/app/constants:go_default_library",
|
"//cmd/kubeadm/app/constants:go_default_library",
|
||||||
"//cmd/kubeadm/app/util:go_default_library",
|
"//cmd/kubeadm/app/util:go_default_library",
|
||||||
"//vendor/k8s.io/klog/v2:go_default_library",
|
"//vendor/k8s.io/klog/v2:go_default_library",
|
||||||
] + select({
|
],
|
||||||
"@io_bazel_rules_go//go/platform:windows": [
|
|
||||||
"//cmd/kubeadm/app/apis/kubeadm/v1beta2:go_default_library",
|
|
||||||
],
|
|
||||||
"//conditions:default": [],
|
|
||||||
}),
|
|
||||||
)
|
)
|
||||||
|
|
||||||
go_test(
|
go_test(
|
||||||
|
@ -121,3 +121,8 @@ func GetControlPlaneImages(cfg *kubeadmapi.ClusterConfiguration) []string {
|
|||||||
|
|
||||||
return imgs
|
return imgs
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetPauseImage returns the image for the "pause" container
|
||||||
|
func GetPauseImage(cfg *kubeadmapi.ClusterConfiguration) string {
|
||||||
|
return GetGenericImage(cfg.ImageRepository, "pause", constants.PauseVersion)
|
||||||
|
}
|
||||||
|
@ -1,29 +0,0 @@
|
|||||||
// +build !windows
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright 2020 The Kubernetes Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package images
|
|
||||||
|
|
||||||
import (
|
|
||||||
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
|
|
||||||
"k8s.io/kubernetes/cmd/kubeadm/app/constants"
|
|
||||||
)
|
|
||||||
|
|
||||||
// GetPauseImage returns the image for the "pause" container
|
|
||||||
func GetPauseImage(cfg *kubeadmapi.ClusterConfiguration) string {
|
|
||||||
return GetGenericImage(cfg.ImageRepository, "pause", constants.PauseVersion)
|
|
||||||
}
|
|
@ -1,34 +0,0 @@
|
|||||||
// +build windows
|
|
||||||
|
|
||||||
/*
|
|
||||||
Copyright 2020 The Kubernetes Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package images
|
|
||||||
|
|
||||||
import (
|
|
||||||
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
|
|
||||||
kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2"
|
|
||||||
"k8s.io/kubernetes/cmd/kubeadm/app/constants"
|
|
||||||
)
|
|
||||||
|
|
||||||
// GetPauseImage returns the image for the "pause" container
|
|
||||||
func GetPauseImage(cfg *kubeadmapi.ClusterConfiguration) string {
|
|
||||||
//If user has configured the cluster to use a different image repository, use that for the Windows pause image.
|
|
||||||
if cfg.ImageRepository != kubeadmapiv1beta2.DefaultImageRepository {
|
|
||||||
return GetGenericImage(cfg.ImageRepository, "pause", constants.PauseVersion)
|
|
||||||
}
|
|
||||||
return GetGenericImage("mcr.microsoft.com/oss/kubernetes", "pause", constants.PauseVersion)
|
|
||||||
}
|
|
@ -119,11 +119,11 @@ func TestBuildKubeletArgMap(t *testing.T) {
|
|||||||
nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{
|
nodeRegOpts: &kubeadmapi.NodeRegistrationOptions{
|
||||||
CRISocket: "/var/run/dockershim.sock",
|
CRISocket: "/var/run/dockershim.sock",
|
||||||
},
|
},
|
||||||
pauseImage: "gcr.io/pause:3.2",
|
pauseImage: "gcr.io/pause:3.4.1",
|
||||||
},
|
},
|
||||||
expected: map[string]string{
|
expected: map[string]string{
|
||||||
"network-plugin": "cni",
|
"network-plugin": "cni",
|
||||||
"pod-infra-container-image": "gcr.io/pause:3.2",
|
"pod-infra-container-image": "gcr.io/pause:3.4.1",
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -21,9 +21,9 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
validTmpl = "image: {{ .ImageRepository }}/pause:3.2"
|
validTmpl = "image: {{ .ImageRepository }}/pause:3.4.1"
|
||||||
validTmplOut = "image: k8s.gcr.io/pause:3.2"
|
validTmplOut = "image: k8s.gcr.io/pause:3.4.1"
|
||||||
doNothing = "image: k8s.gcr.io/pause:3.2"
|
doNothing = "image: k8s.gcr.io/pause:3.4.1"
|
||||||
invalidTmpl1 = "{{ .baz }/d}"
|
invalidTmpl1 = "{{ .baz }/d}"
|
||||||
invalidTmpl2 = "{{ !foobar }}"
|
invalidTmpl2 = "{{ !foobar }}"
|
||||||
)
|
)
|
||||||
|
@ -28,7 +28,7 @@ import (
|
|||||||
const (
|
const (
|
||||||
// When these values are updated, also update test/utils/image/manifest.go
|
// When these values are updated, also update test/utils/image/manifest.go
|
||||||
defaultPodSandboxImageName = "k8s.gcr.io/pause"
|
defaultPodSandboxImageName = "k8s.gcr.io/pause"
|
||||||
defaultPodSandboxImageVersion = "3.2"
|
defaultPodSandboxImageVersion = "3.4.1"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
2
hack/testdata/filter/pod-apply-selector.yaml
vendored
2
hack/testdata/filter/pod-apply-selector.yaml
vendored
@ -8,4 +8,4 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: kubernetes-pause
|
- name: kubernetes-pause
|
||||||
image: k8s.gcr.io/pause:2.0
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
|
2
hack/testdata/filter/pod-dont-apply.yaml
vendored
2
hack/testdata/filter/pod-dont-apply.yaml
vendored
@ -8,4 +8,4 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: kubernetes-pause
|
- name: kubernetes-pause
|
||||||
image: k8s.gcr.io/pause:2.0
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
|
2
hack/testdata/multi-resource-1.yaml
vendored
2
hack/testdata/multi-resource-1.yaml
vendored
@ -11,7 +11,7 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: kubernetes-pause
|
- name: kubernetes-pause
|
||||||
image: k8s.gcr.io/pause:2.0
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Namespace
|
kind: Namespace
|
||||||
|
6
hack/testdata/multi-resource-3.yaml
vendored
6
hack/testdata/multi-resource-3.yaml
vendored
@ -8,7 +8,7 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: kubernetes-pause
|
- name: kubernetes-pause
|
||||||
image: k8s.gcr.io/pause:2.0
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Pod
|
kind: Pod
|
||||||
@ -17,7 +17,7 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: kubernetes-pause
|
- name: kubernetes-pause
|
||||||
image: k8s.gcr.io/pause:2.0
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: Pod
|
kind: Pod
|
||||||
@ -26,5 +26,5 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: kubernetes-pause
|
- name: kubernetes-pause
|
||||||
image: k8s.gcr.io/pause:2.0
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
"spec":{
|
"spec":{
|
||||||
"containers":[{
|
"containers":[{
|
||||||
"name": "mock-container",
|
"name": "mock-container",
|
||||||
"image": "k8s.gcr.io/pause:2.0",
|
"image": "k8s.gcr.io/pause:3.4.1",
|
||||||
"ports":[{
|
"ports":[{
|
||||||
"containerPort":9949,
|
"containerPort":9949,
|
||||||
"protocol":"TCP"
|
"protocol":"TCP"
|
||||||
|
2
hack/testdata/multi-resource-json.json
vendored
2
hack/testdata/multi-resource-json.json
vendored
@ -41,7 +41,7 @@
|
|||||||
"spec":{
|
"spec":{
|
||||||
"containers":[{
|
"containers":[{
|
||||||
"name": "mock-container",
|
"name": "mock-container",
|
||||||
"image": "k8s.gcr.io/pause:2.0",
|
"image": "k8s.gcr.io/pause:3.4.1",
|
||||||
"ports":[{
|
"ports":[{
|
||||||
"containerPort":9949,
|
"containerPort":9949,
|
||||||
"protocol":"TCP"
|
"protocol":"TCP"
|
||||||
|
@ -47,7 +47,7 @@
|
|||||||
"spec":{
|
"spec":{
|
||||||
"containers":[{
|
"containers":[{
|
||||||
"name": "mock-container",
|
"name": "mock-container",
|
||||||
"image": "k8s.gcr.io/pause:2.0",
|
"image": "k8s.gcr.io/pause:3.4.1",
|
||||||
"ports":[{
|
"ports":[{
|
||||||
"containerPort":9949,
|
"containerPort":9949,
|
||||||
"protocol":"TCP"
|
"protocol":"TCP"
|
||||||
|
2
hack/testdata/multi-resource-list.json
vendored
2
hack/testdata/multi-resource-list.json
vendored
@ -45,7 +45,7 @@
|
|||||||
"spec":{
|
"spec":{
|
||||||
"containers":[{
|
"containers":[{
|
||||||
"name": "mock-container",
|
"name": "mock-container",
|
||||||
"image": "k8s.gcr.io/pause:2.0",
|
"image": "k8s.gcr.io/pause:3.4.1",
|
||||||
"ports":[{
|
"ports":[{
|
||||||
"containerPort":9949,
|
"containerPort":9949,
|
||||||
"protocol":"TCP"
|
"protocol":"TCP"
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
"spec":{
|
"spec":{
|
||||||
"containers":[{
|
"containers":[{
|
||||||
"name": "mock-container",
|
"name": "mock-container",
|
||||||
"image": "k8s.gcr.io/pause:2.0",
|
"image": "k8s.gcr.io/pause:3.4.1",
|
||||||
"ports":[{
|
"ports":[{
|
||||||
"containerPort":9949,
|
"containerPort":9949,
|
||||||
"protocol":"TCP"
|
"protocol":"TCP"
|
||||||
@ -60,7 +60,7 @@
|
|||||||
"spec":{
|
"spec":{
|
||||||
"containers":[{
|
"containers":[{
|
||||||
"name": "mock-container",
|
"name": "mock-container",
|
||||||
"image": "k8s.gcr.io/pause:2.0",
|
"image": "k8s.gcr.io/pause:3.4.1",
|
||||||
"ports":[{
|
"ports":[{
|
||||||
"containerPort":9949,
|
"containerPort":9949,
|
||||||
"protocol":"TCP"
|
"protocol":"TCP"
|
||||||
|
4
hack/testdata/multi-resource-rclist.json
vendored
4
hack/testdata/multi-resource-rclist.json
vendored
@ -26,7 +26,7 @@
|
|||||||
"spec":{
|
"spec":{
|
||||||
"containers":[{
|
"containers":[{
|
||||||
"name": "mock-container",
|
"name": "mock-container",
|
||||||
"image": "k8s.gcr.io/pause:2.0",
|
"image": "k8s.gcr.io/pause:3.4.1",
|
||||||
"ports":[{
|
"ports":[{
|
||||||
"containerPort":9949,
|
"containerPort":9949,
|
||||||
"protocol":"TCP"
|
"protocol":"TCP"
|
||||||
@ -60,7 +60,7 @@
|
|||||||
"spec":{
|
"spec":{
|
||||||
"containers":[{
|
"containers":[{
|
||||||
"name": "mock-container",
|
"name": "mock-container",
|
||||||
"image": "k8s.gcr.io/pause:2.0",
|
"image": "k8s.gcr.io/pause:3.4.1",
|
||||||
"ports":[{
|
"ports":[{
|
||||||
"containerPort":9949,
|
"containerPort":9949,
|
||||||
"protocol":"TCP"
|
"protocol":"TCP"
|
||||||
|
@ -29,7 +29,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: mock-container
|
- name: mock-container
|
||||||
image: k8s.gcr.io/pause:2.0
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 9949
|
- containerPort: 9949
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
|
2
hack/testdata/multi-resource-yaml.yaml
vendored
2
hack/testdata/multi-resource-yaml.yaml
vendored
@ -27,7 +27,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: mock-container
|
- name: mock-container
|
||||||
image: k8s.gcr.io/pause:2.0
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 9949
|
- containerPort: 9949
|
||||||
protocol: TCP
|
protocol: TCP
|
||||||
|
2
hack/testdata/pod-apply.yaml
vendored
2
hack/testdata/pod-apply.yaml
vendored
@ -7,4 +7,4 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: kubernetes-pause
|
- name: kubernetes-pause
|
||||||
image: k8s.gcr.io/pause:2.0
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
|
2
hack/testdata/pod-changed.yaml
vendored
2
hack/testdata/pod-changed.yaml
vendored
@ -7,4 +7,4 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: kubernetes-pause
|
- name: kubernetes-pause
|
||||||
image: k8s.gcr.io/pause:3.0
|
image: k8s.gcr.io/pause:3.4
|
||||||
|
2
hack/testdata/pod-with-precision.json
vendored
2
hack/testdata/pod-with-precision.json
vendored
@ -9,7 +9,7 @@
|
|||||||
"containers": [
|
"containers": [
|
||||||
{
|
{
|
||||||
"name": "kubernetes-pause",
|
"name": "kubernetes-pause",
|
||||||
"image": "k8s.gcr.io/pause:3.2"
|
"image": "k8s.gcr.io/pause:3.4.1"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"restartPolicy": "Never",
|
"restartPolicy": "Never",
|
||||||
|
2
hack/testdata/pod.yaml
vendored
2
hack/testdata/pod.yaml
vendored
@ -7,4 +7,4 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: kubernetes-pause
|
- name: kubernetes-pause
|
||||||
image: k8s.gcr.io/pause:2.0
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
|
2
hack/testdata/prune/a.yaml
vendored
2
hack/testdata/prune/a.yaml
vendored
@ -7,4 +7,4 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: kubernetes-pause
|
- name: kubernetes-pause
|
||||||
image: k8s.gcr.io/pause:2.0
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
|
2
hack/testdata/prune/b.yaml
vendored
2
hack/testdata/prune/b.yaml
vendored
@ -8,4 +8,4 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: kubernetes-pause
|
- name: kubernetes-pause
|
||||||
image: k8s.gcr.io/pause:2.0
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
|
2
hack/testdata/sorted-pods/sorted-pod1.yaml
vendored
2
hack/testdata/sorted-pods/sorted-pod1.yaml
vendored
@ -8,4 +8,4 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: kubernetes-pause2
|
- name: kubernetes-pause2
|
||||||
image: k8s.gcr.io/pause:2.0
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
|
2
hack/testdata/sorted-pods/sorted-pod2.yaml
vendored
2
hack/testdata/sorted-pods/sorted-pod2.yaml
vendored
@ -8,4 +8,4 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: kubernetes-pause1
|
- name: kubernetes-pause1
|
||||||
image: k8s.gcr.io/pause:2.0
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
|
2
hack/testdata/sorted-pods/sorted-pod3.yaml
vendored
2
hack/testdata/sorted-pods/sorted-pod3.yaml
vendored
@ -8,4 +8,4 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: kubernetes-pause3
|
- name: kubernetes-pause3
|
||||||
image: k8s.gcr.io/pause:2.0
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
|
@ -40,7 +40,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
defaultSandboxImage = "k8s.gcr.io/pause:3.2"
|
defaultSandboxImage = "k8s.gcr.io/pause:3.4.1"
|
||||||
|
|
||||||
// Various default sandbox resources requests/limits.
|
// Various default sandbox resources requests/limits.
|
||||||
defaultSandboxCPUshares int64 = 2
|
defaultSandboxCPUshares int64 = 2
|
||||||
|
@ -13,7 +13,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: mock-container
|
- name: mock-container
|
||||||
image: k8s.gcr.io/pause:3.2
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ReplicationController
|
kind: ReplicationController
|
||||||
@ -30,4 +30,4 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: mock-container
|
- name: mock-container
|
||||||
image: k8s.gcr.io/pause:3.2
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
|
@ -14,4 +14,4 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: mock-container
|
- name: mock-container
|
||||||
image: k8s.gcr.io/pause:3.2
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
|
@ -529,9 +529,9 @@ run_pod_tests() {
|
|||||||
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'changed-with-yaml:'
|
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'changed-with-yaml:'
|
||||||
## Patch pod from JSON can change image
|
## Patch pod from JSON can change image
|
||||||
# Command
|
# Command
|
||||||
kubectl patch "${kube_flags[@]}" -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml -p='{"spec":{"containers":[{"name": "kubernetes-serve-hostname", "image": "k8s.gcr.io/pause:3.2"}]}}'
|
kubectl patch "${kube_flags[@]}" -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml -p='{"spec":{"containers":[{"name": "kubernetes-serve-hostname", "image": "k8s.gcr.io/pause:3.4.1"}]}}'
|
||||||
# Post-condition: valid-pod POD has expected image
|
# Post-condition: valid-pod POD has expected image
|
||||||
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.2:'
|
kube::test::get_object_assert pods "{{range.items}}{{$image_field}}:{{end}}" 'k8s.gcr.io/pause:3.4.1:'
|
||||||
|
|
||||||
# pod has field for kubectl patch field manager
|
# pod has field for kubectl patch field manager
|
||||||
output_message=$(kubectl get pod valid-pod -o=jsonpath='{.metadata.managedFields[*].manager}' "${kube_flags[@]:?}" 2>&1)
|
output_message=$(kubectl get pod valid-pod -o=jsonpath='{.metadata.managedFields[*].manager}' "${kube_flags[@]:?}" 2>&1)
|
||||||
|
@ -47,7 +47,7 @@ run_kubectl_diff_tests() {
|
|||||||
# 1. the exit code for diff is 1 because it found a difference
|
# 1. the exit code for diff is 1 because it found a difference
|
||||||
# 2. the difference contains the changed image
|
# 2. the difference contains the changed image
|
||||||
output_message=$(kubectl diff -f hack/testdata/pod-changed.yaml || test $? -eq 1)
|
output_message=$(kubectl diff -f hack/testdata/pod-changed.yaml || test $? -eq 1)
|
||||||
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.0'
|
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.4'
|
||||||
|
|
||||||
# Ensure diff only dry-runs and doesn't persist change
|
# Ensure diff only dry-runs and doesn't persist change
|
||||||
resourceVersion=$(kubectl get "${kube_flags[@]:?}" -f hack/testdata/pod.yaml -o go-template='{{ .metadata.resourceVersion }}')
|
resourceVersion=$(kubectl get "${kube_flags[@]:?}" -f hack/testdata/pod.yaml -o go-template='{{ .metadata.resourceVersion }}')
|
||||||
@ -55,7 +55,7 @@ run_kubectl_diff_tests() {
|
|||||||
|
|
||||||
# Test found diff with server-side apply
|
# Test found diff with server-side apply
|
||||||
output_message=$(kubectl diff -f hack/testdata/pod-changed.yaml --server-side || test $? -eq 1)
|
output_message=$(kubectl diff -f hack/testdata/pod-changed.yaml --server-side || test $? -eq 1)
|
||||||
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.0'
|
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.4'
|
||||||
|
|
||||||
# Ensure diff --server-side only dry-runs and doesn't persist change
|
# Ensure diff --server-side only dry-runs and doesn't persist change
|
||||||
resourceVersion=$(kubectl get "${kube_flags[@]:?}" -f hack/testdata/pod.yaml -o go-template='{{ .metadata.resourceVersion }}')
|
resourceVersion=$(kubectl get "${kube_flags[@]:?}" -f hack/testdata/pod.yaml -o go-template='{{ .metadata.resourceVersion }}')
|
||||||
@ -86,7 +86,7 @@ run_kubectl_diff_tests() {
|
|||||||
# 1. the exit code for diff is 1 because it found a difference
|
# 1. the exit code for diff is 1 because it found a difference
|
||||||
# 2. the difference contains the changed image
|
# 2. the difference contains the changed image
|
||||||
output_message=$(kubectl diff --server-side -f hack/testdata/pod-changed.yaml || test $? -eq 1)
|
output_message=$(kubectl diff --server-side -f hack/testdata/pod-changed.yaml || test $? -eq 1)
|
||||||
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.0'
|
kube::test::if_has_string "${output_message}" 'k8s.gcr.io/pause:3.4'
|
||||||
|
|
||||||
# Cleanup
|
# Cleanup
|
||||||
kubectl delete -f hack/testdata/pod.yaml
|
kubectl delete -f hack/testdata/pod.yaml
|
||||||
|
@ -76,5 +76,6 @@ spec:
|
|||||||
- name: root-mount
|
- name: root-mount
|
||||||
mountPath: /root
|
mountPath: /root
|
||||||
containers:
|
containers:
|
||||||
- image: "k8s.gcr.io/pause:3.2"
|
- image: "k8s.gcr.io/pause:3.4.1"
|
||||||
name: pause
|
name: pause
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: mock-container
|
- name: mock-container
|
||||||
image: k8s.gcr.io/pause:3.2
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
kind: ReplicationController
|
kind: ReplicationController
|
||||||
@ -30,4 +30,4 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: mock-container
|
- name: mock-container
|
||||||
image: k8s.gcr.io/pause:3.2
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
|
@ -14,4 +14,4 @@ spec:
|
|||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: mock-container
|
- name: mock-container
|
||||||
image: k8s.gcr.io/pause:3.2
|
image: k8s.gcr.io/pause:3.4.1
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
"spec": {
|
"spec": {
|
||||||
"containers": [{
|
"containers": [{
|
||||||
"name": "test-container",
|
"name": "test-container",
|
||||||
"image": "k8s.gcr.io/pause:3.2"
|
"image": "k8s.gcr.io/pause:3.4.1"
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,7 +4,7 @@ metadata:
|
|||||||
generateName: pod-
|
generateName: pod-
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- image: k8s.gcr.io/pause:3.2
|
- image: k8s.gcr.io/pause:3.4.1
|
||||||
name: pause
|
name: pause
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
|
@ -5,7 +5,7 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
priority: 10
|
priority: 10
|
||||||
containers:
|
containers:
|
||||||
- image: k8s.gcr.io/pause:3.2
|
- image: k8s.gcr.io/pause:3.4.1
|
||||||
name: pause
|
name: pause
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
|
@ -4,7 +4,7 @@ metadata:
|
|||||||
generateName: pod-
|
generateName: pod-
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- image: k8s.gcr.io/pause:3.2
|
- image: k8s.gcr.io/pause:3.4.1
|
||||||
name: pause
|
name: pause
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
|
@ -5,7 +5,7 @@ metadata:
|
|||||||
spec:
|
spec:
|
||||||
terminationGracePeriodSeconds: 0
|
terminationGracePeriodSeconds: 0
|
||||||
containers:
|
containers:
|
||||||
- image: k8s.gcr.io/pause:3.2
|
- image: k8s.gcr.io/pause:3.4.1
|
||||||
name: pause
|
name: pause
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
|
@ -14,7 +14,7 @@ spec:
|
|||||||
- zone1
|
- zone1
|
||||||
- zone2
|
- zone2
|
||||||
containers:
|
containers:
|
||||||
- image: k8s.gcr.io/pause:3.2
|
- image: k8s.gcr.io/pause:3.4.1
|
||||||
name: pause
|
name: pause
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
|
@ -14,7 +14,7 @@ spec:
|
|||||||
topologyKey: topology.kubernetes.io/zone
|
topologyKey: topology.kubernetes.io/zone
|
||||||
namespaces: ["sched-test", "sched-setup"]
|
namespaces: ["sched-test", "sched-setup"]
|
||||||
containers:
|
containers:
|
||||||
- image: k8s.gcr.io/pause:3.2
|
- image: k8s.gcr.io/pause:3.4.1
|
||||||
name: pause
|
name: pause
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
|
@ -14,7 +14,7 @@ spec:
|
|||||||
topologyKey: kubernetes.io/hostname
|
topologyKey: kubernetes.io/hostname
|
||||||
namespaces: ["sched-test", "sched-setup"]
|
namespaces: ["sched-test", "sched-setup"]
|
||||||
containers:
|
containers:
|
||||||
- image: k8s.gcr.io/pause:3.2
|
- image: k8s.gcr.io/pause:3.4.1
|
||||||
name: pause
|
name: pause
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
|
@ -16,7 +16,7 @@ spec:
|
|||||||
namespaces: ["sched-test", "sched-setup"]
|
namespaces: ["sched-test", "sched-setup"]
|
||||||
weight: 1
|
weight: 1
|
||||||
containers:
|
containers:
|
||||||
- image: k8s.gcr.io/pause:3.2
|
- image: k8s.gcr.io/pause:3.4.1
|
||||||
name: pause
|
name: pause
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
|
@ -16,7 +16,7 @@ spec:
|
|||||||
namespaces: ["sched-test", "sched-setup"]
|
namespaces: ["sched-test", "sched-setup"]
|
||||||
weight: 1
|
weight: 1
|
||||||
containers:
|
containers:
|
||||||
- image: k8s.gcr.io/pause:3.2
|
- image: k8s.gcr.io/pause:3.4.1
|
||||||
name: pause
|
name: pause
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
|
@ -13,7 +13,7 @@ spec:
|
|||||||
matchLabels:
|
matchLabels:
|
||||||
color: blue
|
color: blue
|
||||||
containers:
|
containers:
|
||||||
- image: k8s.gcr.io/pause:3.2
|
- image: k8s.gcr.io/pause:3.4.1
|
||||||
name: pause
|
name: pause
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
|
@ -4,7 +4,7 @@ metadata:
|
|||||||
generateName: secret-volume-
|
generateName: secret-volume-
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- image: k8s.gcr.io/pause:3.2
|
- image: k8s.gcr.io/pause:3.4.1
|
||||||
name: pause
|
name: pause
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
|
@ -13,7 +13,7 @@ spec:
|
|||||||
matchLabels:
|
matchLabels:
|
||||||
color: blue
|
color: blue
|
||||||
containers:
|
containers:
|
||||||
- image: k8s.gcr.io/pause:3.2
|
- image: k8s.gcr.io/pause:3.4.1
|
||||||
name: pause
|
name: pause
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 80
|
- containerPort: 80
|
||||||
|
@ -248,7 +248,7 @@ func initImageConfigs() (map[int]Config, map[int]Config) {
|
|||||||
configs[Nonewprivs] = Config{promoterE2eRegistry, "nonewprivs", "1.3"}
|
configs[Nonewprivs] = Config{promoterE2eRegistry, "nonewprivs", "1.3"}
|
||||||
configs[NonRoot] = Config{promoterE2eRegistry, "nonroot", "1.1"}
|
configs[NonRoot] = Config{promoterE2eRegistry, "nonroot", "1.1"}
|
||||||
// Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go
|
// Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go
|
||||||
configs[Pause] = Config{gcRegistry, "pause", "3.2"}
|
configs[Pause] = Config{gcRegistry, "pause", "3.4.1"}
|
||||||
configs[Perl] = Config{dockerLibraryRegistry, "perl", "5.26"}
|
configs[Perl] = Config{dockerLibraryRegistry, "perl", "5.26"}
|
||||||
configs[PrometheusDummyExporter] = Config{gcRegistry, "prometheus-dummy-exporter", "v0.1.0"}
|
configs[PrometheusDummyExporter] = Config{gcRegistry, "prometheus-dummy-exporter", "v0.1.0"}
|
||||||
configs[PrometheusToSd] = Config{gcRegistry, "prometheus-to-sd", "v0.5.0"}
|
configs[PrometheusToSd] = Config{gcRegistry, "prometheus-to-sd", "v0.5.0"}
|
||||||
|
@ -1303,7 +1303,7 @@ func MakePodSpec() v1.PodSpec {
|
|||||||
return v1.PodSpec{
|
return v1.PodSpec{
|
||||||
Containers: []v1.Container{{
|
Containers: []v1.Container{{
|
||||||
Name: "pause",
|
Name: "pause",
|
||||||
Image: "k8s.gcr.io/pause:3.2",
|
Image: "k8s.gcr.io/pause:3.4.1",
|
||||||
Ports: []v1.ContainerPort{{ContainerPort: 80}},
|
Ports: []v1.ContainerPort{{ContainerPort: 80}},
|
||||||
Resources: v1.ResourceRequirements{
|
Resources: v1.ResourceRequirements{
|
||||||
Limits: v1.ResourceList{
|
Limits: v1.ResourceList{
|
||||||
@ -1725,7 +1725,7 @@ type DaemonConfig struct {
|
|||||||
|
|
||||||
func (config *DaemonConfig) Run() error {
|
func (config *DaemonConfig) Run() error {
|
||||||
if config.Image == "" {
|
if config.Image == "" {
|
||||||
config.Image = "k8s.gcr.io/pause:3.2"
|
config.Image = "k8s.gcr.io/pause:3.4.1"
|
||||||
}
|
}
|
||||||
nameLabel := map[string]string{
|
nameLabel := map[string]string{
|
||||||
"name": config.Name + "-daemon",
|
"name": config.Name + "-daemon",
|
||||||
|
Loading…
Reference in New Issue
Block a user