Minor fixes to make 1.23 as default version in test, support 1.23 to …

…1.24 test upgrades, and remove hardcoding of Kubernetes versions (#111)

README.md

@@ -48,17 +48,18 @@ Previous meetings: [ [notes][notes] | [recordings][notes] (coming soon) ]
 **NOTE:** As the versioning for this project is tied to the versioning of Cluster API, future modifications to this
 policy may be made to more closely align with other providers in the Cluster API ecosystem.
 
-#### Cluster API Versions
+### Cluster API Versions
 
-|                                | v1beta1 (v1.0)   |
-| ------------------------------ | :--------------: |
-| OCI Provider v1beta1 (v0.1.0)  |       ✓          |
+CAPOCI supports the following Cluster API versions.
 
-#### Supported Kubernetes versions
+|                              | v1beta1 (v1.0) |
+| ---------------------------- | -------------- |
+| OCI Provider v1beta1 (v0.1)  |        ✓       |
 
-|                                | v1.20   | v1.21   |
-| ------------------------------ | :-----: | :-----: |
-| OCI Provider v1beta1 (v0.1.0)  |   ✓     |   ✓     |
+### Kubernetes versions
+
+CAPOCI provider is able to install and manage the [versions of Kubernetes supported by
+Cluster API (CAPI)](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions).
 
 [cluster_api]: https://github.com/oracle/cluster-api-provider-oci
 [image_builder_book]: https://image-builder.sigs.k8s.io/capi/providers/oci.html

docs/src/introduction.md

@@ -40,15 +40,16 @@ policy may be made to more closely align with other providers in the Cluster API
 
 ### Cluster API Versions
 
+CAPOCI supports the following Cluster API versions.
+
 |                              | v1beta1 (v1.0) |
 | ---------------------------- | -------------- |
 | OCI Provider v1beta1 (v0.1)  |        ✓       |
 
-### Supported Kubernetes versions
+### Kubernetes versions
 
-|                              | v1.20 | v1.21 |
-| ---------------------------- | ----- | ----- |
-| OCI Provider v1beta1 (v0.1)  |   ✓   |   ✓  |
+CAPOCI provider is able to install and manage the [versions of Kubernetes supported by 
+Cluster API (CAPI)](https://cluster-api.sigs.k8s.io/reference/versions.html#supported-kubernetes-versions).
 
 [cluster_api]: https://github.com/oracle/cluster-api-provider-oci
 [image_builder_book]: https://image-builder.sigs.k8s.io/capi/providers/oci.html

test/e2e/config/e2e_conf.yaml

@@ -8,8 +8,8 @@ providers:
   - name: cluster-api
     type: CoreProvider
     versions:
-      - name: v1.1.0
-        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/core-components.yaml
+      - name: v1.1.4
+        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/core-components.yaml
         type: url
         files:
           - sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -21,8 +21,8 @@ providers:
   - name: kubeadm
     type: BootstrapProvider
     versions:
-      - name: v1.1.0
-        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/bootstrap-components.yaml
+      - name: v1.1.4
+        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/bootstrap-components.yaml
         type: url
         files:
           - sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -34,8 +34,8 @@ providers:
   - name: kubeadm
     type: ControlPlaneProvider
     versions:
-      - name: v1.1.0
-        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.0/control-plane-components.yaml
+      - name: v1.1.4
+        value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.1.4/control-plane-components.yaml
         type: url
         files:
           - sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -73,7 +73,7 @@ providers:
           - sourcePath: "../data/infrastructure-oci/v1beta1/metadata.yaml"
 
 variables:
-  KUBERNETES_VERSION: "v1.22.5"
+  KUBERNETES_VERSION: "v1.23.8"
   EXP_MACHINE_POOL: "true"
   EXP_CLUSTER_RESOURCE_SET: "true"
   NODE_DRAIN_TIMEOUT: "60s"
@@ -83,8 +83,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.23.1"
-  KUBERNETES_VERSION_UPGRADE_FROM: "v1.22.5"
+  KUBERNETES_VERSION_UPGRADE_TO: "v1.24.2"
+  KUBERNETES_VERSION_UPGRADE_FROM: "v1.23.8"
   KUBERNETES_UPGRADE_OCI_IMAGE_ID: "${KUBERNETES_UPGRADE_OCI_IMAGE_ID}"
   IP_FAMILY: "IPv4"
   CLUSTER_TOPOLOGY: "true"
@@ -110,7 +110,7 @@ intervals:
   default/wait-control-plane-bare-metal: [ "60m", "10s" ]
   default/wait-worker-nodes-bare-metal: [ "60m", "10s" ]
   default/wait-delete-cluster: ["30m", "10s"]
-  default/wait-machine-upgrade: ["60m", "10s"]
+  default/wait-machine-upgrade: ["30m", "10s"]
   default/wait-machine-remediation: ["30m", "10s"]
   default/wait-deployment: ["15m", "10s"]
   default/wait-deployment-available: ["15m", "10s"]

test/e2e/data/ccm/ccm.yaml

@@ -43,11 +43,14 @@ spec:
       serviceAccountName: cloud-controller-manager
       hostNetwork: true
       nodeSelector:
-        node-role.kubernetes.io/master: ""
+        node-role.kubernetes.io/control-plane: ""
       tolerations:
         - key: node.cloudprovider.kubernetes.io/uninitialized
           value: "true"
           effect: NoSchedule
+        - key: node-role.kubernetes.io/control-plane
+          operator: Exists
+          effect: NoSchedule
         - key: node-role.kubernetes.io/master
           operator: Exists
           effect: NoSchedule
@@ -266,7 +269,7 @@ spec:
         role: csi-oci
     spec:
       nodeSelector:
-        node-role.kubernetes.io/master: ""
+        node-role.kubernetes.io/control-plane: ""
       containers:
         - name: csi-volume-provisioner
           image: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2

test/e2e/data/cni/antrea.yaml

@@ -4379,7 +4379,7 @@ spec:
         - key: CriticalAddonsOnly
           operator: Exists
         - effect: NoSchedule
-          key: node-role.kubernetes.io/master
+          key: node-role.kubernetes.io/control-plane
       volumes:
         - configMap:
             name: antrea-config-ckdtm6hc68

test/e2e/data/cni/calico.yaml

@@ -3706,7 +3706,7 @@ subjects:
 # Source: calico/templates/calico-node.yaml
 # This manifest installs the calico-node container, as well
 # as the CNI plugins and network config on
-# each master and worker node in a Kubernetes cluster.
+# each control-plane and worker node in a Kubernetes cluster.
 kind: DaemonSet
 apiVersion: apps/v1
 metadata:
@@ -4043,6 +4043,8 @@ spec:
           operator: Exists
         - key: node-role.kubernetes.io/master
           effect: NoSchedule
+        - key: node-role.kubernetes.io/control-plane
+          effect: NoSchedule
       serviceAccountName: calico-kube-controllers
       priorityClassName: system-cluster-critical
       containers: