Skip to content

Commit 101cf16

Browse files
shyamradhakrishnanshyamradhakrishnan
authored
Upgrade to Kubernetes 1.25 (#220)
* Upgrade test and Addons template to Kubernetes 1.25
1 parent e059b84 commit 101cf16

File tree

7 files changed

+3188
-2441
lines changed

7 files changed

+3188
-2441
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ generate-e2e-templates: $(KUSTOMIZE)
259259
.PHONY: test-e2e-run
260260
test-e2e-run: generate-e2e-templates $(GINKGO) $(ENVSUBST) ## Run e2e tests
261261
$(ENVSUBST) < $(E2E_CONF_FILE) > $(E2E_CONF_FILE_ENVSUBST) && \
262-
$(GINKGO) -v -trace -tags=e2e -focus="$(GINKGO_FOCUS)" -skip=$(GINKGO_SKIP) -nodes=$(GINKGO_NODES) --no-color=$(GINKGO_NOCOLOR) $(GINKGO_ARGS) ./test/e2e -- \
262+
$(GINKGO) -v -trace -timeout=4h -tags=e2e -focus="$(GINKGO_FOCUS)" -skip=$(GINKGO_SKIP) -nodes=$(GINKGO_NODES) --no-color=$(GINKGO_NOCOLOR) $(GINKGO_ARGS) ./test/e2e -- \
263263
-e2e.artifacts-folder="$(ARTIFACTS)" \
264264
-e2e.config="$(E2E_CONF_FILE_ENVSUBST)" \
265265
-e2e.skip-resource-cleanup=$(SKIP_CLEANUP) -e2e.use-existing-cluster=$(SKIP_CREATE_MGMT_CLUSTER) $(E2E_ARGS)

‎templates/cluster-template-oci-addons.yaml‎

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,13 @@ data:
234234
path: /etc/kubernetes
235235
containers:
236236
- name: oci-cloud-controller-manager
237-
image: ghcr.io/oracle/cloud-provider-oci:v1.24.0
237+
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
238238
command: ["/usr/local/bin/oci-cloud-controller-manager"]
239239
args:
240240
- --cloud-config=/etc/oci/cloud-provider.yaml
241241
- --cloud-provider=oci
242-
- --leader-elect-resource-lock=configmapsleases
243-
- -v=2
242+
- --leader-elect-resource-lock=configmapsleases
243+
- --v=2
244244
volumeMounts:
245245
- name: cfg
246246
mountPath: /etc/oci
@@ -371,6 +371,8 @@ data:
371371
- "extension-apiserver-authentication"
372372
verbs:
373373
- get
374+
- list
375+
- watch
374376
375377
- apiGroups:
376378
- ""
@@ -477,8 +479,23 @@ data:
477479
readOnly: true
478480
- mountPath: /var/run/shared-tmpfs
479481
name: shared-tmpfs
482+
- name: csi-fss-volume-provisioner
483+
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
484+
args:
485+
- --csi-address=/var/run/shared-tmpfs/csi-fss.sock
486+
- --volume-name-prefix=csi-fss
487+
- --feature-gates=Topology=true
488+
- --timeout=120s
489+
- --leader-election
490+
- --leader-election-namespace=kube-system
491+
volumeMounts:
492+
- name: config
493+
mountPath: /etc/oci/
494+
readOnly: true
495+
- mountPath: /var/run/shared-tmpfs
496+
name: shared-tmpfs
480497
- name: csi-attacher
481-
image: k8s.gcr.io/sig-storage/csi-attacher:v3.5.0
498+
image: k8s.gcr.io/sig-storage/csi-attacher:v4.2.0
482499
args:
483500
- --csi-address=/var/run/shared-tmpfs/csi.sock
484501
- --timeout=120s
@@ -491,7 +508,7 @@ data:
491508
- mountPath: /var/run/shared-tmpfs
492509
name: shared-tmpfs
493510
- name: csi-resizer
494-
image: k8s.gcr.io/sig-storage/csi-resizer:v1.5.0
511+
image: k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
495512
args:
496513
- --csi-address=/var/run/shared-tmpfs/csi.sock
497514
- --leader-election
@@ -502,9 +519,10 @@ data:
502519
- name: oci-csi-controller-driver
503520
args:
504521
- --endpoint=unix://var/run/shared-tmpfs/csi.sock
522+
- --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
505523
command:
506524
- /usr/local/bin/oci-csi-controller-driver
507-
image: ghcr.io/oracle/cloud-provider-oci:v1.24.0
525+
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
508526
imagePullPolicy: IfNotPresent
509527
volumeMounts:
510528
- name: config
@@ -534,7 +552,7 @@ data:
534552
serviceAccountName: csi-oci-node-sa
535553
terminationGracePeriodSeconds: 30
536554
tolerations:
537-
- operator: Exists
555+
- operator: Exists
538556
---
539557
apiVersion: storage.k8s.io/v1
540558
kind: CSIDriver
@@ -544,6 +562,13 @@ data:
544562
attachRequired: false
545563
podInfoOnMount: false
546564
---
565+
apiVersion: storage.k8s.io/v1
566+
kind: CSIDriver
567+
metadata:
568+
name: blockvolume.csi.oraclecloud.com
569+
spec:
570+
fsGroupPolicy: File
571+
---
547572
kind: ConfigMap
548573
apiVersion: v1
549574
metadata:
@@ -648,7 +673,7 @@ data:
648673
fieldPath: spec.nodeName
649674
- name: PATH
650675
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
651-
image: ghcr.io/oracle/cloud-provider-oci:v1.24.0
676+
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
652677
securityContext:
653678
privileged: true
654679
volumeMounts:

‎test/e2e/config/e2e_conf.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,9 @@ providers:
7676
- sourcePath: "../data/infrastructure-oci/v1beta1/metadata.yaml"
7777

7878
variables:
79-
KUBERNETES_VERSION: "v1.24.4"
80-
OCI_MANAGED_KUBERNETES_VERSION: "v1.23.4"
81-
OCI_MANAGED_KUBERNETES_VERSION_UPGRADE: "v1.24.1"
79+
KUBERNETES_VERSION: "v1.25.6"
80+
OCI_MANAGED_KUBERNETES_VERSION: "v1.24.1"
81+
OCI_MANAGED_KUBERNETES_VERSION_UPGRADE: "v1.25.4"
8282
EXP_MACHINE_POOL: "true"
8383
EXP_CLUSTER_RESOURCE_SET: "true"
8484
NODE_DRAIN_TIMEOUT: "60s"
@@ -88,8 +88,8 @@ variables:
8888
CCM_PATH: "${PWD}/test/e2e/data/ccm/ccm.yaml"
8989
CONFORMANCE_WORKER_MACHINE_COUNT: "2"
9090
CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
91-
KUBERNETES_VERSION_UPGRADE_TO: "v1.24.2"
92-
KUBERNETES_VERSION_UPGRADE_FROM: "v1.23.8"
91+
KUBERNETES_VERSION_UPGRADE_TO: "v1.25.6"
92+
KUBERNETES_VERSION_UPGRADE_FROM: "v1.24.4"
9393
KUBERNETES_UPGRADE_OCI_IMAGE_ID: "${KUBERNETES_UPGRADE_OCI_IMAGE_ID}"
9494
IP_FAMILY: "IPv4"
9595
CLUSTER_TOPOLOGY: "true"

‎test/e2e/data/ccm/ccm.yaml‎

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
path: /etc/kubernetes
6464
containers:
6565
- name: oci-cloud-controller-manager
66-
image: ghcr.io/oracle/cloud-provider-oci:v1.24.0
66+
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
6767
command: ["/usr/local/bin/oci-cloud-controller-manager"]
6868
args:
6969
- --cloud-config=/etc/oci/cloud-provider.yaml
@@ -132,6 +132,8 @@ rules:
132132
- "extension-apiserver-authentication"
133133
verbs:
134134
- get
135+
- list
136+
- watch
135137

136138
- apiGroups:
137139
- ""
@@ -298,8 +300,23 @@ spec:
298300
readOnly: true
299301
- mountPath: /var/run/shared-tmpfs
300302
name: shared-tmpfs
303+
- name: csi-fss-volume-provisioner
304+
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
305+
args:
306+
- --csi-address=/var/run/shared-tmpfs/csi-fss.sock
307+
- --volume-name-prefix=csi-fss
308+
- --feature-gates=Topology=true
309+
- --timeout=120s
310+
- --leader-election
311+
- --leader-election-namespace=kube-system
312+
volumeMounts:
313+
- name: config
314+
mountPath: /etc/oci/
315+
readOnly: true
316+
- mountPath: /var/run/shared-tmpfs
317+
name: shared-tmpfs
301318
- name: csi-attacher
302-
image: k8s.gcr.io/sig-storage/csi-attacher:v3.5.0
319+
image: k8s.gcr.io/sig-storage/csi-attacher:v4.2.0
303320
args:
304321
- --csi-address=/var/run/shared-tmpfs/csi.sock
305322
- --timeout=120s
@@ -312,7 +329,7 @@ spec:
312329
- mountPath: /var/run/shared-tmpfs
313330
name: shared-tmpfs
314331
- name: csi-resizer
315-
image: k8s.gcr.io/sig-storage/csi-resizer:v1.5.0
332+
image: k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
316333
args:
317334
- --csi-address=/var/run/shared-tmpfs/csi.sock
318335
- --leader-election
@@ -323,9 +340,10 @@ spec:
323340
- name: oci-csi-controller-driver
324341
args:
325342
- --endpoint=unix://var/run/shared-tmpfs/csi.sock
343+
- --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
326344
command:
327345
- /usr/local/bin/oci-csi-controller-driver
328-
image: ghcr.io/oracle/cloud-provider-oci:v1.24.0
346+
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
329347
imagePullPolicy: IfNotPresent
330348
volumeMounts:
331349
- name: config
@@ -365,6 +383,13 @@ spec:
365383
attachRequired: false
366384
podInfoOnMount: false
367385
---
386+
apiVersion: storage.k8s.io/v1
387+
kind: CSIDriver
388+
metadata:
389+
name: blockvolume.csi.oraclecloud.com
390+
spec:
391+
fsGroupPolicy: File
392+
---
368393
kind: ConfigMap
369394
apiVersion: v1
370395
metadata:
@@ -469,7 +494,7 @@ spec:
469494
fieldPath: spec.nodeName
470495
- name: PATH
471496
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
472-
image: ghcr.io/oracle/cloud-provider-oci:v1.24.0
497+
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
473498
securityContext:
474499
privileged: true
475500
volumeMounts:

0 commit comments

Comments
 (0)