Skip to content

Commit 7582c5a

Browse files
mmamczurtheobarberbany
authored andcommitted
Update cluster/ directory to version 1.32.2
k/k tag used https://github.com/kubernetes/kubernetes/tree/v1.32.2
1 parent f4ff675 commit 7582c5a

File tree

16 files changed

+70
-318
lines changed

16 files changed

+70
-318
lines changed

Diff for: cluster/addons/device-plugins/nvidia-gpu/daemonset.yaml

-57
This file was deleted.

Diff for: cluster/addons/ip-masq-agent/ip-masq-agent.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
hostNetwork: true
3030
containers:
3131
- name: ip-masq-agent
32-
image: registry.k8s.io/networking/ip-masq-agent-amd64:v2.6.1
32+
image: registry.k8s.io/networking/ip-masq-agent:v2.9.3
3333
args:
3434
- --masq-chain=IP-MASQ
3535
- --nomasq-all-reserved-ranges

Diff for: cluster/addons/kube-network-policies/kube-network-policies.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
serviceAccountName: kube-network-policies
2828
containers:
2929
- name: kube-network-policies
30-
image: registry.k8s.io/networking/kube-network-policies:v0.5.0
30+
image: registry.k8s.io/networking/kube-network-policies:v0.6.0
3131
command:
3232
- /bin/sh
3333
- -c

Diff for: cluster/addons/metrics-server/metrics-server-deployment.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@ data:
2323
apiVersion: apps/v1
2424
kind: Deployment
2525
metadata:
26-
name: metrics-server-v0.7.1
26+
name: metrics-server-v0.7.2
2727
namespace: kube-system
2828
labels:
2929
k8s-app: metrics-server
3030
addonmanager.kubernetes.io/mode: Reconcile
31-
version: v0.7.1
31+
version: v0.7.2
3232
spec:
3333
selector:
3434
matchLabels:
3535
k8s-app: metrics-server
36-
version: v0.7.1
36+
version: v0.7.2
3737
template:
3838
metadata:
3939
name: metrics-server
4040
labels:
4141
k8s-app: metrics-server
42-
version: v0.7.1
42+
version: v0.7.2
4343
spec:
4444
securityContext:
4545
seccompProfile:
@@ -50,7 +50,7 @@ spec:
5050
kubernetes.io/os: linux
5151
containers:
5252
- name: metrics-server
53-
image: registry.k8s.io/metrics-server/metrics-server:v0.7.1
53+
image: registry.k8s.io/metrics-server/metrics-server:v0.7.2
5454
command:
5555
- /metrics-server
5656
- --metric-resolution=15s
@@ -109,7 +109,7 @@ spec:
109109
- --memory={{ base_metrics_server_memory }}
110110
- --extra-memory={{ metrics_server_memory_per_node }}Mi
111111
- --threshold=5
112-
- --deployment=metrics-server-v0.7.1
112+
- --deployment=metrics-server-v0.7.2
113113
- --container=metrics-server
114114
- --poll-period=30000
115115
- --estimator=exponential

Diff for: cluster/addons/node-problem-detector/npd.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ metadata:
3030
namespace: kube-system
3131
labels:
3232
app.kubernetes.io/name: node-problem-detector
33-
app.kubernetes.io/version: v0.8.19
33+
app.kubernetes.io/version: v0.8.20
3434
addonmanager.kubernetes.io/mode: Reconcile
3535
spec:
3636
selector:
3737
matchLabels:
3838
app.kubernetes.io/name: node-problem-detector
39-
app.kubernetes.io/version: v0.8.19
39+
app.kubernetes.io/version: v0.8.20
4040
template:
4141
metadata:
4242
labels:
4343
app.kubernetes.io/name: node-problem-detector
44-
app.kubernetes.io/version: v0.8.19
44+
app.kubernetes.io/version: v0.8.20
4545
spec:
4646
containers:
4747
- name: node-problem-detector
48-
image: registry.k8s.io/node-problem-detector/node-problem-detector:v0.8.19
48+
image: registry.k8s.io/node-problem-detector/node-problem-detector:v0.8.20
4949
command:
5050
- "/bin/sh"
5151
- "-c"

Diff for: cluster/gce/config-common.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export WINDOWS_CNI_CONFIG_DIR="${WINDOWS_K8S_DIR}\cni\config"
136136
# CNI storage path for Windows nodes
137137
export WINDOWS_CNI_STORAGE_PATH="https://storage.googleapis.com/k8s-artifacts-cni/release"
138138
# CNI version for Windows nodes
139-
export WINDOWS_CNI_VERSION="v1.5.1"
139+
export WINDOWS_CNI_VERSION="v1.6.0"
140140
# Pod manifests directory for Windows nodes on Windows nodes.
141141
export WINDOWS_MANIFESTS_DIR="${WINDOWS_K8S_DIR}\manifests"
142142
# Directory where cert/key files will be stores on Windows nodes.

Diff for: cluster/gce/gci/BUILD

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ pkg_tar(
2222
files = {
2323
"//cluster/gce/gci/mounter": "gci-mounter",
2424
"configure-helper.sh": "gci-configure-helper.sh",
25-
"health-monitor.sh": "health-monitor.sh",
2625
"configure-kubeapiserver.sh": "configure-kubeapiserver.sh",
2726
},
2827
mode = "0755",

Diff for: cluster/gce/gci/configure-helper.sh

+2-11
Original file line numberDiff line numberDiff line change
@@ -1662,6 +1662,7 @@ After=network-online.target
16621662
[Service]
16631663
Restart=always
16641664
RestartSec=10
1665+
WatchdogSec=30s
16651666
EnvironmentFile=${kubelet_env_file}
16661667
ExecStart=${kubelet_bin} \$KUBELET_OPTS
16671668
@@ -2227,9 +2228,6 @@ function start-kube-controller-manager {
22272228
if [[ -n "${SERVICE_CLUSTER_IP_RANGE:-}" ]]; then
22282229
params+=("--service-cluster-ip-range=${SERVICE_CLUSTER_IP_RANGE}")
22292230
fi
2230-
if [[ -n "${CONCURRENT_SERVICE_SYNCS:-}" ]]; then
2231-
params+=("--concurrent-service-syncs=${CONCURRENT_SERVICE_SYNCS}")
2232-
fi
22332231
if [[ "${NETWORK_PROVIDER:-}" == "kubenet" ]]; then
22342232
params+=("--allocate-node-cidrs=true")
22352233
elif [[ -n "${ALLOCATE_NODE_CIDRS:-}" ]]; then
@@ -2238,10 +2236,6 @@ function start-kube-controller-manager {
22382236
if [[ -n "${TERMINATED_POD_GC_THRESHOLD:-}" ]]; then
22392237
params+=("--terminated-pod-gc-threshold=${TERMINATED_POD_GC_THRESHOLD}")
22402238
fi
2241-
if [[ "${ENABLE_IP_ALIASES:-}" == 'true' ]]; then
2242-
params+=("--cidr-allocator-type=${NODE_IPAM_MODE}")
2243-
params+=("--configure-cloud-routes=false")
2244-
fi
22452239
if [[ -n "${FEATURE_GATES:-}" ]]; then
22462240
params+=("--feature-gates=${FEATURE_GATES}")
22472241
fi
@@ -2953,9 +2947,6 @@ EOF
29532947
sed -i -e "s@{{ metrics_server_memory_per_node }}@${metrics_server_memory_per_node}@g" "${metrics_server_yaml}"
29542948
sed -i -e "s@{{ metrics_server_min_cluster_size }}@${metrics_server_min_cluster_size}@g" "${metrics_server_yaml}"
29552949
fi
2956-
if [[ "${ENABLE_NVIDIA_GPU_DEVICE_PLUGIN:-}" == "true" ]]; then
2957-
setup-addon-manifests "addons" "device-plugins/nvidia-gpu"
2958-
fi
29592950
# Setting up the konnectivity-agent daemonset
29602951
if [[ "${RUN_KONNECTIVITY_PODS:-false}" == "true" ]]; then
29612952
setup-addon-manifests "addons" "konnectivity-agent"
@@ -3242,7 +3233,7 @@ spec:
32423233
- name: vol
32433234
containers:
32443235
- name: pv-recycler
3245-
image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.3
3236+
image: registry.k8s.io/build-image/debian-base:bookworm-v1.0.4
32463237
command:
32473238
- /bin/sh
32483239
args:

Diff for: cluster/gce/gci/configure.sh

+8-10
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ set -o nounset
2424
set -o pipefail
2525

2626
### Hardcoded constants
27-
DEFAULT_CNI_VERSION='v1.5.1'
28-
DEFAULT_CNI_HASH='c7ee3e074e15d46dd6b58bc3ae8282e97e1b0d315bcdf252b98fe7b9fe04cc1cfa892e6663d9258b5271cf5f2ecd5cd7caed4503bad53de8142c0bc44b3fd7ba'
29-
DEFAULT_NPD_VERSION='v0.8.19'
30-
DEFAULT_NPD_HASH_AMD64='41e7816614a1e30c94cbe37a1d09c2ef6c3f2ad336b40d95378528deac9a8b811356e46bae268dab006132f2bdce22668a640517f000853109d1e3be77aef25e'
31-
DEFAULT_NPD_HASH_ARM64='678352d0544c166e86d3435c4f49b1ea5ce19c2d6f083f51f7688599377928e5b1425d1733006981d17e94ddede67f9fc1d2035577a87687701044950f697390'
32-
DEFAULT_CRICTL_VERSION='v1.30.0'
33-
DEFAULT_CRICTL_AMD64_SHA512='2bd1e85ab6abd2ac59e6d1a4ccb316fd08e3b025f8de85a6c8396defb7df5ee4e8daf884c4ad9d6451477ef9754240ec786cc5c5ccf1e9a2f616450f2a98a0d0'
34-
DEFAULT_CRICTL_ARM64_SHA512='bf2d18b781fd4072058862e23e787dd9b1c6c18626bfc5140fbbf34b78b4fca4b3243eff42d28f0a10f1054b4547405a82afae319c9d9975669ef9a7e27a6b42'
27+
DEFAULT_CNI_VERSION='v1.6.0'
28+
DEFAULT_CNI_HASH='3d9f34a43e0550d9f4f28c724e25bc5cfcfc601c329586bafe4910c3c72f918055151066e71e14e157276138e358344a1d815d957646df43a86d3673ab2849c3'
29+
DEFAULT_NPD_VERSION='v0.8.20'
30+
DEFAULT_NPD_HASH_AMD64='09029b62f8023885f3a856c20b5fafecabb880806467848ae25f578c4ee6afacd97c85a0c2d0c582c8d79d3716c83d0e7d324073c5816ae5a812812a6f21450b'
31+
DEFAULT_NPD_HASH_ARM64='233f7e4451de920b7ce8b0ac0e46da1a07ef559e628a75746ce7927492a1886ebd007875f76462d2d0bf3b1dc807a7e8321108cafbd7db9eee39c0e2cfb6c051'
32+
DEFAULT_CRICTL_VERSION='v1.31.1'
33+
DEFAULT_CRICTL_AMD64_SHA512='831ee7b3589197dbee399973793e0750e9870cd963e0d6c57eca9231fbc366c2e683855cdcabede33acdb56c15161cc9d40d5a01ec2de8cfee21ba8aa8adba54'
34+
DEFAULT_CRICTL_ARM64_SHA512='4d12cf190c03d03d86a1a10b93abbbcb4857d013b62a601b17d767d2397d3e17f7c93d3d32b54cc1ac80262c0837afa5f34c88a58bf52d93e5cfc330dd83218c'
3535
DEFAULT_MOUNTER_TAR_SHA='7956fd42523de6b3107ddc3ce0e75233d2fcb78436ff07a1389b6eaac91fb2b1b72a08f7a219eaf96ba1ca4da8d45271002e0d60e0644e796c665f99bb356516'
3636
AUTH_PROVIDER_GCP_HASH_LINUX_AMD64="${AUTH_PROVIDER_GCP_HASH_LINUX_AMD64:-156058e5b3994cba91c23831774033e0d505d6d8b80f43541ef6af91b320fd9dfaabe42ec8a8887b51d87104c2b57e1eb895649d681575ffc80dd9aee8e563db}"
3737
AUTH_PROVIDER_GCP_HASH_LINUX_ARM64="${AUTH_PROVIDER_GCP_HASH_LINUX_ARM64:-1aa3b0bea10a9755231989ffc150cbfa770f1d96932db7535473f7bfeb1108bafdae80202ae738d59495982512e716ff7366d5f414d0e76dd50519f98611f9ab}"
@@ -418,8 +418,6 @@ function install-kube-manifests {
418418
cp "${dst_dir}/kubernetes/gci-trusty/gke-internal-configure-helper.sh" "${KUBE_BIN}/"
419419
fi
420420

421-
cp "${dst_dir}/kubernetes/gci-trusty/health-monitor.sh" "${KUBE_BIN}/health-monitor.sh"
422-
423421
rm -f "${KUBE_HOME}/${manifests_tar}"
424422
rm -f "${KUBE_HOME}/${manifests_tar}.sha512"
425423
}

Diff for: cluster/gce/gci/health-monitor.sh

-99
This file was deleted.

Diff for: cluster/gce/gci/master.yaml

-38
Original file line numberDiff line numberDiff line change
@@ -90,42 +90,6 @@ write_files:
9090
[Install]
9191
WantedBy=kubernetes.target
9292
93-
- path: /etc/systemd/system/kube-container-runtime-monitor.service
94-
permissions: 0644
95-
owner: root
96-
content: |
97-
[Unit]
98-
Description=Kubernetes health monitoring for container runtime
99-
After=kube-master-configuration.service
100-
101-
[Service]
102-
Restart=always
103-
RestartSec=10
104-
RemainAfterExit=yes
105-
ExecStartPre=/bin/chmod 544 /home/kubernetes/bin/health-monitor.sh
106-
ExecStart=/home/kubernetes/bin/health-monitor.sh container-runtime
107-
108-
[Install]
109-
WantedBy=kubernetes.target
110-
111-
- path: /etc/systemd/system/kubelet-monitor.service
112-
permissions: 0644
113-
owner: root
114-
content: |
115-
[Unit]
116-
Description=Kubernetes health monitoring for kubelet
117-
After=kube-master-configuration.service
118-
119-
[Service]
120-
Restart=always
121-
RestartSec=10
122-
RemainAfterExit=yes
123-
ExecStartPre=/bin/chmod 544 /home/kubernetes/bin/health-monitor.sh
124-
ExecStart=/home/kubernetes/bin/health-monitor.sh kubelet
125-
126-
[Install]
127-
WantedBy=kubernetes.target
128-
12993
- path: /etc/systemd/system/kube-logrotate.timer
13094
permissions: 0644
13195
owner: root
@@ -170,8 +134,6 @@ runcmd:
170134
- systemctl enable kube-master-installation.service
171135
- systemctl enable kube-master-internal-route.service
172136
- systemctl enable kube-master-configuration.service
173-
- systemctl enable kube-container-runtime-monitor.service
174-
- systemctl enable kubelet-monitor.service
175137
- systemctl enable kube-logrotate.timer
176138
- systemctl enable kube-logrotate.service
177139
- systemctl enable kubernetes.target

0 commit comments

Comments
 (0)