Skip to content

Update 1.26 #299

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

Merged
merged 4 commits into from
Jul 11, 2023
Merged

Update 1.26 #299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
41814cf
feat: Upgrade to Kubernetes 1.26
joekr Jun 29, 2023
e1f31ca
udpated e2e ccm.yaml
joekr Jul 7, 2023
861e203
Update cluster-template-oci-addons to 1.26
joekr Jul 10, 2023
5e2d9c1
remove the snapshot-controller and csi-snapshotter from addons template
joekr Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 21 additions & 6 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,7 +234,7 @@ data:
path: /etc/kubernetes
containers:
- name: oci-cloud-controller-manager
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
command: ["/usr/local/bin/oci-cloud-controller-manager"]
args:
- --cloud-config=/etc/oci/cloud-provider.yaml
Expand Down Expand Up @@ -465,7 +465,7 @@ data:
node-role.kubernetes.io/control-plane: ""
containers:
- name: csi-volume-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
args:
- --csi-address=/var/run/shared-tmpfs/csi.sock
- --volume-name-prefix=csi
Expand All @@ -480,7 +480,7 @@ data:
- mountPath: /var/run/shared-tmpfs
name: shared-tmpfs
- name: csi-fss-volume-provisioner
image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1
image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0
args:
- --csi-address=/var/run/shared-tmpfs/csi-fss.sock
- --volume-name-prefix=csi-fss
Expand Down Expand Up @@ -522,7 +522,7 @@ data:
- --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.25.0
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
imagePullPolicy: IfNotPresent
volumeMounts:
- name: config
Expand Down Expand Up @@ -673,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.25.0
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
securityContext:
privileged: true
volumeMounts:
Expand Down Expand Up @@ -835,8 +835,23 @@ data:
- apiGroups: [""]
resources: ["persistentvolumeclaims/status"]
verbs: ["patch"]
- apiGroups: [ "snapshot.storage.k8s.io" ]
resources: [ "volumesnapshotclasses" ]
verbs: [ "get", "list", "watch" ]
- apiGroups: [ "snapshot.storage.k8s.io" ]
resources: [ "volumesnapshotcontents" ]
verbs: [ "create", "get", "list", "watch", "update", "delete", "patch" ]
- apiGroups: [ "snapshot.storage.k8s.io" ]
resources: [ "volumesnapshotcontents/status" ]
verbs: [ "update", "patch" ]
- apiGroups: [ "snapshot.storage.k8s.io" ]
resources: [ "volumesnapshots" ]
verbs: [ "get", "list", "watch", "update", "patch" ]
- apiGroups: [ "snapshot.storage.k8s.io" ]
resources: [ "volumesnapshots/status" ]
verbs: [ "update", "patch" ]
---

kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
metadata:
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/config/e2e_conf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ providers:
- sourcePath: "../data/infrastructure-oci/v1beta2/metadata.yaml"

variables:
KUBERNETES_VERSION: "v1.25.6"
KUBERNETES_VERSION: "v1.26.6"
OCI_MANAGED_KUBERNETES_VERSION: "v1.25.4"
OCI_MANAGED_KUBERNETES_VERSION_UPGRADE: "v1.26.2"
EXP_MACHINE_POOL: "true"
Expand All @@ -92,8 +92,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.25.6"
KUBERNETES_VERSION_UPGRADE_FROM: "v1.24.4"
KUBERNETES_VERSION_UPGRADE_TO: "v1.26.6"
KUBERNETES_VERSION_UPGRADE_FROM: "v1.25.6"
KUBERNETES_UPGRADE_OCI_IMAGE_ID: "${KUBERNETES_UPGRADE_OCI_IMAGE_ID}"
IP_FAMILY: "IPv4"
CLUSTER_TOPOLOGY: "true"
Expand Down
31 changes: 26 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.25.0
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
command: ["/usr/local/bin/oci-cloud-controller-manager"]
args:
- --cloud-config=/etc/oci/cloud-provider.yaml
Expand Down Expand Up @@ -132,8 +132,6 @@ rules:
- "extension-apiserver-authentication"
verbs:
- get
- list
- watch

- apiGroups:
- ""
Expand Down Expand Up @@ -343,7 +341,7 @@ spec:
- --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.25.0
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
imagePullPolicy: IfNotPresent
volumeMounts:
- name: config
Expand Down Expand Up @@ -385,6 +383,14 @@ spec:
---
apiVersion: storage.k8s.io/v1
kind: CSIDriver
metadata:
name: fss.csi.oraclecloud.com
spec:
attachRequired: false
podInfoOnMount: false
---
apiVersion: storage.k8s.io/v1
kind: CSIDriver
metadata:
name: blockvolume.csi.oraclecloud.com
spec:
Expand Down Expand Up @@ -494,7 +500,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.25.0
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
securityContext:
privileged: true
volumeMounts:
Expand Down Expand Up @@ -655,6 +661,21 @@ rules:
- apiGroups: [""]
resources: ["persistentvolumeclaims/status"]
verbs: ["patch"]
- apiGroups: [ "snapshot.storage.k8s.io" ]
resources: [ "volumesnapshotclasses" ]
verbs: [ "get", "list", "watch" ]
- apiGroups: [ "snapshot.storage.k8s.io" ]
resources: [ "volumesnapshotcontents" ]
verbs: [ "create", "get", "list", "watch", "update", "delete", "patch" ]
- apiGroups: [ "snapshot.storage.k8s.io" ]
resources: [ "volumesnapshotcontents/status" ]
verbs: [ "update", "patch" ]
- apiGroups: [ "snapshot.storage.k8s.io" ]
resources: [ "volumesnapshots" ]
verbs: [ "get", "list", "watch", "update", "patch" ]
- apiGroups: [ "snapshot.storage.k8s.io" ]
resources: [ "volumesnapshots/status" ]
verbs: [ "update", "patch" ]
---
kind: ClusterRoleBinding
apiVersion: rbac.authorization.k8s.io/v1
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/data/infrastructure-oci/bases/ccm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ data:
path: /etc/kubernetes
containers:
- name: oci-cloud-controller-manager
image: ghcr.io/oracle/cloud-provider-oci:v1.25.0
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
command: ["/usr/local/bin/oci-cloud-controller-manager"]
args:
- --cloud-config=/etc/oci/cloud-provider.yaml
Expand Down Expand Up @@ -385,7 +385,7 @@ data:
- --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.25.0
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
imagePullPolicy: IfNotPresent
volumeMounts:
- name: config
Expand Down Expand Up @@ -536,7 +536,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.25.0
image: ghcr.io/oracle/cloud-provider-oci:v1.26.0
securityContext:
privileged: true
volumeMounts:
Expand Down