Skip to content

Commit 8ca7fd9

Browse files
authored
Merge pull request #353 from MikeSpreitzer/debump-to-kube-130
✨ Downgrade Kubernetes version to 1.30.12
2 parents ba1a762 + 2946178 commit 8ca7fd9

File tree

13 files changed

+440
-90
lines changed

13 files changed

+440
-90
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
namespace: ci
33
name: kcp-dev-build-root
4-
tag: "1.23.0"
4+
tag: "1.23.9"

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
225225

226226
## Tool Versions
227227
KUSTOMIZE_VERSION ?= v5.1.0
228-
CONTROLLER_TOOLS_VERSION ?= v0.17.3
228+
CONTROLLER_TOOLS_VERSION ?= v0.15.0
229229

230230
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
231231
.PHONY: kustomize
@@ -267,4 +267,4 @@ build: bin-dir require-jq require-go require-git verify-go-versions ## Build th
267267

268268
.PHONY: bin-dir
269269
bin-dir:
270-
mkdir -p bin
270+
mkdir -p bin

chart/crds/crds.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.17.3
5+
controller-gen.kubebuilder.io/version: v0.15.0
66
name: controlplanes.tenancy.kflex.kubestellar.org
77
spec:
88
group: tenancy.kflex.kubestellar.org
@@ -183,7 +183,7 @@ apiVersion: apiextensions.k8s.io/v1
183183
kind: CustomResourceDefinition
184184
metadata:
185185
annotations:
186-
controller-gen.kubebuilder.io/version: v0.17.3
186+
controller-gen.kubebuilder.io/version: v0.15.0
187187
name: postcreatehooks.tenancy.kflex.kubestellar.org
188188
spec:
189189
group: tenancy.kflex.kubestellar.org

chart/templates/install-hooks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ spec:
99
spec:
1010
containers:
1111
- name: "{{ .Release.Name }}"
12-
image: quay.io/kubestellar/kubectl:1.27.8
12+
image: quay.io/kubestellar/kubectl:1.30.12
1313
command:
1414
- sh
1515
- -c

chart/templates/operator.yaml

Lines changed: 179 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,138 @@ rules:
6969
- ""
7070
resources:
7171
- configmaps
72+
verbs:
73+
- create
74+
- delete
75+
- get
76+
- list
77+
- patch
78+
- update
79+
- watch
80+
- apiGroups:
81+
- ""
82+
resources:
7283
- endpoints
84+
verbs:
85+
- create
86+
- delete
87+
- get
88+
- list
89+
- patch
90+
- update
91+
- watch
92+
- apiGroups:
93+
- ""
94+
resources:
7395
- endpoints/restricted
96+
verbs:
97+
- create
98+
- delete
99+
- get
100+
- list
101+
- patch
102+
- update
103+
- watch
104+
- apiGroups:
105+
- ""
106+
resources:
74107
- events
108+
verbs:
109+
- create
110+
- delete
111+
- get
112+
- list
113+
- patch
114+
- update
115+
- watch
116+
- apiGroups:
117+
- ""
118+
resources:
75119
- namespaces
120+
verbs:
121+
- create
122+
- delete
123+
- get
124+
- list
125+
- patch
126+
- update
127+
- watch
128+
- apiGroups:
129+
- ""
130+
resources:
76131
- persistentvolumeclaims
132+
verbs:
133+
- create
134+
- delete
135+
- get
136+
- list
137+
- patch
138+
- update
139+
- watch
140+
- apiGroups:
141+
- ""
142+
resources:
77143
- pods
144+
verbs:
145+
- create
146+
- delete
147+
- get
148+
- list
149+
- patch
150+
- update
151+
- watch
152+
- apiGroups:
153+
- ""
154+
resources:
78155
- pods/attach
156+
verbs:
157+
- create
158+
- delete
159+
- get
160+
- list
161+
- patch
162+
- update
163+
- watch
164+
- apiGroups:
165+
- ""
166+
resources:
79167
- pods/exec
168+
verbs:
169+
- create
170+
- delete
171+
- get
172+
- list
173+
- patch
174+
- update
175+
- watch
176+
- apiGroups:
177+
- ""
178+
resources:
80179
- pods/log
180+
verbs:
181+
- create
182+
- delete
183+
- get
184+
- list
185+
- patch
186+
- update
187+
- watch
188+
- apiGroups:
189+
- ""
190+
resources:
81191
- pods/portforward
192+
verbs:
193+
- create
194+
- delete
195+
- get
196+
- list
197+
- patch
198+
- update
199+
- watch
200+
- apiGroups:
201+
- ""
202+
resources:
82203
- secrets
83-
- services
84204
verbs:
85205
- create
86206
- delete
@@ -102,6 +222,18 @@ rules:
102222
- services
103223
- update
104224
- watch
225+
- apiGroups:
226+
- ""
227+
resources:
228+
- services
229+
verbs:
230+
- create
231+
- delete
232+
- get
233+
- list
234+
- patch
235+
- update
236+
- watch
105237
- apiGroups:
106238
- apiextensions.k8s.io
107239
resources:
@@ -118,7 +250,6 @@ rules:
118250
- apps
119251
resources:
120252
- deployments
121-
- statefulsets
122253
verbs:
123254
- create
124255
- delete
@@ -135,6 +266,18 @@ rules:
135266
- get
136267
- list
137268
- watch
269+
- apiGroups:
270+
- apps
271+
resources:
272+
- statefulsets
273+
verbs:
274+
- create
275+
- delete
276+
- get
277+
- list
278+
- patch
279+
- update
280+
- watch
138281
- apiGroups:
139282
- batch
140283
resources:
@@ -175,8 +318,41 @@ rules:
175318
- rbac.authorization.k8s.io
176319
resources:
177320
- clusterrolebindings
321+
verbs:
322+
- create
323+
- delete
324+
- get
325+
- list
326+
- patch
327+
- update
328+
- watch
329+
- apiGroups:
330+
- rbac.authorization.k8s.io
331+
resources:
178332
- clusterroles
333+
verbs:
334+
- create
335+
- delete
336+
- get
337+
- list
338+
- patch
339+
- update
340+
- watch
341+
- apiGroups:
342+
- rbac.authorization.k8s.io
343+
resources:
179344
- rolebindings
345+
verbs:
346+
- create
347+
- delete
348+
- get
349+
- list
350+
- patch
351+
- update
352+
- watch
353+
- apiGroups:
354+
- rbac.authorization.k8s.io
355+
resources:
180356
- roles
181357
verbs:
182358
- create
@@ -480,7 +656,7 @@ spec:
480656
command:
481657
- sh
482658
- -c
483-
image: quay.io/kubestellar/kubectl:1.29.3
659+
image: quay.io/kubestellar/kubectl:1.30.12
484660
name: wait-postgresql
485661
securityContext:
486662
runAsNonRoot: true

cmd/kflex/list/list.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,4 @@ func (cp *CPList) List(chattyStatus bool) {
7272

7373
fmt.Printf("%-20s %-10s %-10s %-10s %-10s\n", cp.Name, synced, ready, cp.Spec.Type, age)
7474
}
75-
}
75+
}

config/crd/bases/tenancy.kflex.kubestellar.org_controlplanes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.3
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: controlplanes.tenancy.kflex.kubestellar.org
88
spec:
99
group: tenancy.kflex.kubestellar.org

config/crd/bases/tenancy.kflex.kubestellar.org_postcreatehooks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.3
6+
controller-gen.kubebuilder.io/version: v0.15.0
77
name: postcreatehooks.tenancy.kflex.kubestellar.org
88
spec:
99
group: tenancy.kflex.kubestellar.org

config/default/manager_auth_proxy_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
- linux
2727
initContainers:
2828
- name: wait-postgresql
29-
image: quay.io/kubestellar/kubectl:1.29.3
29+
image: quay.io/kubestellar/kubectl:1.30.12
3030
command: ['sh', '-c']
3131
args:
3232
- |

0 commit comments

Comments
 (0)