Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to Kubernetes 1.25 #220

Merged
merged 9 commits into from
Mar 2, 2023
Merged

Upgrade to Kubernetes 1.25 #220

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4599135
Upgrade test and Addons template to Kubernetes 1.25
shyamradhakrishnan Mar 1, 2023
a2de9b0
Upgrade test and Addons template to Kubernetes 1.25
shyamradhakrishnan Mar 1, 2023
7ffb990
Upgrade test and Addons template to Kubernetes 1.25
shyamradhakrishnan Mar 1, 2023
6dd75b3
Upgrade test and Addons template to Kubernetes 1.25
shyamradhakrishnan Mar 1, 2023
1caab90
Upgrade test and Addons template to Kubernetes 1.25
shyamradhakrishnan Mar 1, 2023
e8e722d
Upgrade test and Addons template to Kubernetes 1.25
shyamradhakrishnan Mar 1, 2023
bbfdecc
Upgrade test and Addons template to Kubernetes 1.25
shyamradhakrishnan Mar 2, 2023
cd84530
Upgrade test and Addons template to Kubernetes 1.25
shyamradhakrishnan Mar 2, 2023
2047e66
Upgrade test and Addons template to Kubernetes 1.25
shyamradhakrishnan Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
41 changes: 33 additions & 8 deletions templates/cluster-template-oci-addons.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,13 +234,13 @@ data:
path: /etc/kubernetes
containers:
- name: oci-cloud-controller-manager
image: ghcr.io/oracle/cloud-provider-oci:v1.24.0
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
command: ["/usr/local/bin/oci-cloud-controller-manager"]
args:
- --cloud-config=/etc/oci/cloud-provider.yaml
- --cloud-provider=oci
- --leader-elect-resource-lock=configmapsleases
- -v=2
- --leader-elect-resource-lock=configmapsleases
- --v=2
volumeMounts:
- name: cfg
mountPath: /etc/oci
Expand Down Expand Up @@ -371,6 +371,8 @@ data:
- "extension-apiserver-authentication"
verbs:
- get
- list
- watch
- apiGroups:
- ""
Expand Down Expand Up @@ -477,8 +479,23 @@ data:
readOnly: true
- mountPath: /var/run/shared-tmpfs
name: shared-tmpfs
- name: csi-fss-volume-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
args:
- --csi-address=/var/run/shared-tmpfs/csi-fss.sock
- --volume-name-prefix=csi-fss
- --feature-gates=Topology=true
- --timeout=120s
- --leader-election
- --leader-election-namespace=kube-system
volumeMounts:
- name: config
mountPath: /etc/oci/
readOnly: true
- mountPath: /var/run/shared-tmpfs
name: shared-tmpfs
- name: csi-attacher
image: k8s.gcr.io/sig-storage/csi-attacher:v3.5.0
image: k8s.gcr.io/sig-storage/csi-attacher:v4.2.0
args:
- --csi-address=/var/run/shared-tmpfs/csi.sock
- --timeout=120s
Expand All @@ -491,7 +508,7 @@ data:
- mountPath: /var/run/shared-tmpfs
name: shared-tmpfs
- name: csi-resizer
image: k8s.gcr.io/sig-storage/csi-resizer:v1.5.0
image: k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
args:
- --csi-address=/var/run/shared-tmpfs/csi.sock
- --leader-election
Expand All @@ -502,9 +519,10 @@ data:
- name: oci-csi-controller-driver
args:
- --endpoint=unix://var/run/shared-tmpfs/csi.sock
- --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
command:
- /usr/local/bin/oci-csi-controller-driver
image: ghcr.io/oracle/cloud-provider-oci:v1.24.0
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
imagePullPolicy: IfNotPresent
volumeMounts:
- name: config
Expand Down Expand Up @@ -534,7 +552,7 @@ data:
serviceAccountName: csi-oci-node-sa
terminationGracePeriodSeconds: 30
tolerations:
- operator: Exists
- operator: Exists
---
apiVersion: storage.k8s.io/v1
kind: CSIDriver
Expand All @@ -544,6 +562,13 @@ data:
attachRequired: false
podInfoOnMount: false
---
apiVersion: storage.k8s.io/v1
kind: CSIDriver
metadata:
name: blockvolume.csi.oraclecloud.com
spec:
fsGroupPolicy: File
---
kind: ConfigMap
apiVersion: v1
metadata:
Expand Down Expand Up @@ -648,7 +673,7 @@ data:
fieldPath: spec.nodeName
- name: PATH
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
image: ghcr.io/oracle/cloud-provider-oci:v1.24.0
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
securityContext:
privileged: true
volumeMounts:
Expand Down
10 changes: 5 additions & 5 deletions test/e2e/config/e2e_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ providers:
- sourcePath: "../data/infrastructure-oci/v1beta1/metadata.yaml"

variables:
KUBERNETES_VERSION: "v1.24.4"
OCI_MANAGED_KUBERNETES_VERSION: "v1.23.4"
OCI_MANAGED_KUBERNETES_VERSION_UPGRADE: "v1.24.1"
KUBERNETES_VERSION: "v1.25.6"
OCI_MANAGED_KUBERNETES_VERSION: "v1.24.1"
OCI_MANAGED_KUBERNETES_VERSION_UPGRADE: "v1.25.4"
EXP_MACHINE_POOL: "true"
EXP_CLUSTER_RESOURCE_SET: "true"
NODE_DRAIN_TIMEOUT: "60s"
Expand All @@ -88,8 +88,8 @@ variables:
CCM_PATH: "${PWD}/test/e2e/data/ccm/ccm.yaml"
CONFORMANCE_WORKER_MACHINE_COUNT: "2"
CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
KUBERNETES_VERSION_UPGRADE_TO: "v1.24.2"
KUBERNETES_VERSION_UPGRADE_FROM: "v1.23.8"
KUBERNETES_VERSION_UPGRADE_TO: "v1.25.6"
KUBERNETES_VERSION_UPGRADE_FROM: "v1.24.4"
KUBERNETES_UPGRADE_OCI_IMAGE_ID: "${KUBERNETES_UPGRADE_OCI_IMAGE_ID}"
IP_FAMILY: "IPv4"
CLUSTER_TOPOLOGY: "true"
Expand Down
35 changes: 30 additions & 5 deletions test/e2e/data/ccm/ccm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
path: /etc/kubernetes
containers:
- name: oci-cloud-controller-manager
image: ghcr.io/oracle/cloud-provider-oci:v1.24.0
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
command: ["/usr/local/bin/oci-cloud-controller-manager"]
args:
- --cloud-config=/etc/oci/cloud-provider.yaml
Expand Down Expand Up @@ -132,6 +132,8 @@ rules:
- "extension-apiserver-authentication"
verbs:
- get
- list
- watch
shyamradhakrishnan marked this conversation as resolved.
Show resolved Hide resolved

- apiGroups:
- ""
Expand Down Expand Up @@ -298,8 +300,23 @@ spec:
readOnly: true
- mountPath: /var/run/shared-tmpfs
name: shared-tmpfs
- name: csi-fss-volume-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
args:
- --csi-address=/var/run/shared-tmpfs/csi-fss.sock
- --volume-name-prefix=csi-fss
- --feature-gates=Topology=true
- --timeout=120s
- --leader-election
- --leader-election-namespace=kube-system
volumeMounts:
- name: config
mountPath: /etc/oci/
readOnly: true
- mountPath: /var/run/shared-tmpfs
name: shared-tmpfs
- name: csi-attacher
image: k8s.gcr.io/sig-storage/csi-attacher:v3.5.0
image: k8s.gcr.io/sig-storage/csi-attacher:v4.2.0
args:
- --csi-address=/var/run/shared-tmpfs/csi.sock
- --timeout=120s
Expand All @@ -312,7 +329,7 @@ spec:
- mountPath: /var/run/shared-tmpfs
name: shared-tmpfs
- name: csi-resizer
image: k8s.gcr.io/sig-storage/csi-resizer:v1.5.0
image: k8s.gcr.io/sig-storage/csi-resizer:v1.7.0
args:
- --csi-address=/var/run/shared-tmpfs/csi.sock
- --leader-election
Expand All @@ -323,9 +340,10 @@ spec:
- name: oci-csi-controller-driver
args:
- --endpoint=unix://var/run/shared-tmpfs/csi.sock
- --fss-csi-endpoint=unix://var/run/shared-tmpfs/csi-fss.sock
command:
- /usr/local/bin/oci-csi-controller-driver
image: ghcr.io/oracle/cloud-provider-oci:v1.24.0
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
imagePullPolicy: IfNotPresent
volumeMounts:
- name: config
Expand Down Expand Up @@ -365,6 +383,13 @@ spec:
attachRequired: false
podInfoOnMount: false
---
apiVersion: storage.k8s.io/v1
kind: CSIDriver
metadata:
name: blockvolume.csi.oraclecloud.com
spec:
fsGroupPolicy: File
---
kind: ConfigMap
apiVersion: v1
metadata:
Expand Down Expand Up @@ -469,7 +494,7 @@ spec:
fieldPath: spec.nodeName
- name: PATH
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/host/usr/bin:/host/sbin
image: ghcr.io/oracle/cloud-provider-oci:v1.24.0
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
securityContext:
privileged: true
volumeMounts:
Expand Down