Skip to content

Commit 8c75fab

Browse files
aojeaaojea
committed
sync cluster folder
1 parent 697d8a1 commit 8c75fab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+632
-352
lines changed

‎cluster/addons/addon-manager/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### Version 9.1.7 (Thu May 15 2023 Paco Xu <[email protected]>)
2+
- Update kubectl to v1.27.1.
3+
- Use `--prune-allowlist` instead of deprecated `--prune-whitelist`.
4+
15
### Version 9.1.6 (Thu February 24 2022 Shihang Zhang <[email protected]>)
26
- Clean up the wait check for service account (https://github.com/kubernetes/kubernetes/pull/108313)
37

‎cluster/addons/addon-manager/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
IMAGE=gcr.io/k8s-staging-addon-manager/kube-addon-manager
1616
ARCH?=amd64
1717
TEMP_DIR:=$(shell mktemp -d)
18-
VERSION=v9.1.6
19-
KUBECTL_VERSION?=v1.20.2
18+
VERSION=v9.1.7
19+
KUBECTL_VERSION?=v1.27.1
2020

2121
BASEIMAGE=registry.k8s.io/debian-base-$(ARCH):v1.0.1
2222

‎cluster/addons/addon-manager/kube-addons.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,28 +114,28 @@ function log() {
114114
esac
115115
}
116116

117-
# Generate kubectl prune-whitelist flags from provided resource list.
118-
function generate_prune_whitelist_flags() {
117+
# Generate kubectl prune-allowlist flags from provided resource list.
118+
function generate_prune_allowlist_flags() {
119119
local -r resources=( "$@" )
120120
for resource in "${resources[@]}"; do
121121
# Check if $resource isn't composed just of whitespaces by replacing ' '
122122
# with '' and checking whether the resulting string is not empty.
123123
if [[ -n "${resource// /}" ]]; then
124-
printf "%s" "--prune-whitelist ${resource} "
124+
printf "%s" "--prune-allowlist ${resource} "
125125
fi
126126
done
127127
}
128128

129-
# KUBECTL_EXTRA_PRUNE_WHITELIST is a list of extra whitelisted resources
129+
# KUBECTL_EXTRA_PRUNE_WHITELIST is a list of extra allowed resources
130130
# besides the default ones.
131-
extra_prune_whitelist=
131+
extra_prune_allowlist=
132132
if [ -n "${KUBECTL_EXTRA_PRUNE_WHITELIST:-}" ]; then
133-
read -ra extra_prune_whitelist <<< "${KUBECTL_EXTRA_PRUNE_WHITELIST}"
133+
read -ra extra_prune_allowlist <<< "${KUBECTL_EXTRA_PRUNE_WHITELIST}"
134134
fi
135-
prune_whitelist=( "${KUBECTL_PRUNE_WHITELIST[@]}" "${extra_prune_whitelist[@]}" )
136-
prune_whitelist_flags=$(generate_prune_whitelist_flags "${prune_whitelist[@]}")
135+
prune_allowlist=( "${KUBECTL_PRUNE_WHITELIST[@]}" "${extra_prune_allowlist[@]}" )
136+
prune_allowlist_flags=$(generate_prune_allowlist_flags "${prune_allowlist[@]}")
137137

138-
log INFO "== Generated kubectl prune whitelist flags: $prune_whitelist_flags =="
138+
log INFO "== Generated kubectl prune allowlist flags: $prune_allowlist_flags =="
139139

140140
# $1 filename of addon to start.
141141
# $2 count of tries to start the addon.
@@ -240,14 +240,14 @@ function reconcile_addons() {
240240
# Disabling because "${KUBECTL_OPTS}" needs to allow for expansion here
241241
${KUBECTL} ${KUBECTL_OPTS} apply -f ${ADDON_PATH} \
242242
-l ${CLUSTER_SERVICE_LABEL}=true,${ADDON_MANAGER_LABEL}!=EnsureExists \
243-
--prune=true ${prune_whitelist_flags} --recursive | grep -v configured
243+
--prune=true ${prune_allowlist_flags} --recursive | grep -v configured
244244

245245
log INFO "== Reconciling with addon-manager label =="
246246
# shellcheck disable=SC2086
247247
# Disabling because "${KUBECTL_OPTS}" needs to allow for expansion here
248248
${KUBECTL} ${KUBECTL_OPTS} apply -f ${ADDON_PATH} \
249249
-l ${CLUSTER_SERVICE_LABEL}!=true,${ADDON_MANAGER_LABEL}=Reconcile \
250-
--prune=true ${prune_whitelist_flags} --recursive | grep -v configured
250+
--prune=true ${prune_allowlist_flags} --recursive | grep -v configured
251251

252252
log INFO "== Kubernetes addon reconcile completed at $(date -Is) =="
253253
}

‎cluster/addons/cloud-controller-manager/cloud-node-controller-role.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ rules:
4444
- nodes
4545
verbs:
4646
- get
47+
- patch
4748
- update
4849
- apiGroups:
4950
- ""

‎cluster/addons/dns/coredns/coredns.yaml.base

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ rules:
2727
verbs:
2828
- list
2929
- watch
30-
- apiGroups:
31-
- ""
32-
resources:
33-
- nodes
34-
verbs:
35-
- get
3630
- apiGroups:
3731
- discovery.k8s.io
3832
resources:
@@ -139,7 +133,7 @@ spec:
139133
kubernetes.io/os: linux
140134
containers:
141135
- name: coredns
142-
image: registry.k8s.io/coredns/coredns:v1.9.3
136+
image: registry.k8s.io/coredns/coredns:v1.11.1
143137
imagePullPolicy: IfNotPresent
144138
resources:
145139
limits:
@@ -182,7 +176,7 @@ spec:
182176
add:
183177
- NET_BIND_SERVICE
184178
drop:
185-
- all
179+
- ALL
186180
readOnlyRootFilesystem: true
187181
dnsPolicy: Default
188182
volumes:

‎cluster/addons/dns/coredns/coredns.yaml.in

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ rules:
2727
verbs:
2828
- list
2929
- watch
30-
- apiGroups:
31-
- ""
32-
resources:
33-
- nodes
34-
verbs:
35-
- get
3630
- apiGroups:
3731
- discovery.k8s.io
3832
resources:
@@ -139,7 +133,7 @@ spec:
139133
kubernetes.io/os: linux
140134
containers:
141135
- name: coredns
142-
image: registry.k8s.io/coredns/coredns:v1.9.3
136+
image: registry.k8s.io/coredns/coredns:v1.11.1
143137
imagePullPolicy: IfNotPresent
144138
resources:
145139
limits:
@@ -182,7 +176,7 @@ spec:
182176
add:
183177
- NET_BIND_SERVICE
184178
drop:
185-
- all
179+
- ALL
186180
readOnlyRootFilesystem: true
187181
dnsPolicy: Default
188182
volumes:

‎cluster/addons/dns/coredns/coredns.yaml.sed

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ rules:
2727
verbs:
2828
- list
2929
- watch
30-
- apiGroups:
31-
- ""
32-
resources:
33-
- nodes
34-
verbs:
35-
- get
3630
- apiGroups:
3731
- discovery.k8s.io
3832
resources:
@@ -139,7 +133,7 @@ spec:
139133
kubernetes.io/os: linux
140134
containers:
141135
- name: coredns
142-
image: registry.k8s.io/coredns/coredns:v1.9.3
136+
image: registry.k8s.io/coredns/coredns:v1.11.1
143137
imagePullPolicy: IfNotPresent
144138
resources:
145139
limits:
@@ -182,7 +176,7 @@ spec:
182176
add:
183177
- NET_BIND_SERVICE
184178
drop:
185-
- all
179+
- ALL
186180
readOnlyRootFilesystem: true
187181
dnsPolicy: Default
188182
volumes:

‎cluster/addons/dns/kube-dns/kube-dns.yaml.base

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ spec:
114114
kubernetes.io/os: linux
115115
containers:
116116
- name: kubedns
117-
image: registry.k8s.io/dns/k8s-dns-kube-dns:1.22.13
117+
image: registry.k8s.io/dns/k8s-dns-kube-dns:1.22.28
118118
resources:
119119
# TODO: Set memory limits when we've profiled the container for large
120120
# clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
170170
runAsUser: 1001
171171
runAsGroup: 1001
172172
- name: dnsmasq
173-
image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.22.13
173+
image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.22.28
174174
livenessProbe:
175175
httpGet:
176176
path: /healthcheck/dnsmasq
@@ -217,7 +217,7 @@ spec:
217217
- NET_BIND_SERVICE
218218
- SETGID
219219
- name: sidecar
220-
image: registry.k8s.io/dns/k8s-dns-sidecar:1.22.13
220+
image: registry.k8s.io/dns/k8s-dns-sidecar:1.22.28
221221
livenessProbe:
222222
httpGet:
223223
path: /metrics

‎cluster/addons/dns/kube-dns/kube-dns.yaml.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ spec:
114114
kubernetes.io/os: linux
115115
containers:
116116
- name: kubedns
117-
image: registry.k8s.io/dns/k8s-dns-kube-dns:1.22.13
117+
image: registry.k8s.io/dns/k8s-dns-kube-dns:1.22.28
118118
resources:
119119
# TODO: Set memory limits when we've profiled the container for large
120120
# clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
170170
runAsUser: 1001
171171
runAsGroup: 1001
172172
- name: dnsmasq
173-
image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.22.13
173+
image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.22.28
174174
livenessProbe:
175175
httpGet:
176176
path: /healthcheck/dnsmasq
@@ -217,7 +217,7 @@ spec:
217217
- NET_BIND_SERVICE
218218
- SETGID
219219
- name: sidecar
220-
image: registry.k8s.io/dns/k8s-dns-sidecar:1.22.13
220+
image: registry.k8s.io/dns/k8s-dns-sidecar:1.22.28
221221
livenessProbe:
222222
httpGet:
223223
path: /metrics

‎cluster/addons/dns/kube-dns/kube-dns.yaml.sed

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ spec:
114114
kubernetes.io/os: linux
115115
containers:
116116
- name: kubedns
117-
image: registry.k8s.io/dns/k8s-dns-kube-dns:1.22.13
117+
image: registry.k8s.io/dns/k8s-dns-kube-dns:1.22.28
118118
resources:
119119
# TODO: Set memory limits when we've profiled the container for large
120120
# clusters, then set request = limit to keep this container in
@@ -170,7 +170,7 @@ spec:
170170
runAsUser: 1001
171171
runAsGroup: 1001
172172
- name: dnsmasq
173-
image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.22.13
173+
image: registry.k8s.io/dns/k8s-dns-dnsmasq-nanny:1.22.28
174174
livenessProbe:
175175
httpGet:
176176
path: /healthcheck/dnsmasq
@@ -217,7 +217,7 @@ spec:
217217
- NET_BIND_SERVICE
218218
- SETGID
219219
- name: sidecar
220-
image: registry.k8s.io/dns/k8s-dns-sidecar:1.22.13
220+
image: registry.k8s.io/dns/k8s-dns-sidecar:1.22.28
221221
livenessProbe:
222222
httpGet:
223223
path: /metrics

0 commit comments

Comments
 (0)