Merge branch 'kubernetes-sigs:main' into use-transition-error-if-cluster-was-ok

Author: qeqar

docs/book/src/clusteropenstack/configuration.md

@@ -664,9 +664,10 @@ spec:
     spec:
       ...
         rootVolume:
-          diskSize: <image size>
-          volumeType: <a cinder volume type (*optional)>
-          availabilityZone: <the cinder availability zone for the root volume (*optional)>
+          sizeGiB: <image size>
+          type: <a cinder volume type (*optional)>
+          availabilityZone:
+            name: <The cinder availability zone name>
       ...
 ```
 

hack/ci/cloud-init/controller.yaml.tpl

@@ -34,7 +34,7 @@
     # Neutron
     enable_plugin neutron https://github.com/openstack/neutron stable/${OPENSTACK_RELEASE}
     ENABLED_SERVICES+=,q-svc,neutron-trunk,ovn-controller,ovs-vswitchd,ovn-northd,ovsdb-server,q-ovn-metadata-agent
-    
+
     DISABLED_SERVICES=q-agt,q-dhcp,q-l3,q-meta,q-metering
     PUBLIC_BRIDGE_MTU=${MTU}
     ENABLE_CHASSIS_AS_GW="True"
@@ -68,9 +68,9 @@
     # https://docs.openstack.org/glance/latest/admin/quotas.html
     IMAGE_URLS="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/amphora/2022-12-05/amphora-x64-haproxy.qcow2,"
     IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/cirros/2022-12-05/cirros-0.6.1-x86_64-disk.img,"
-    IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2023-09-29/ubuntu-2204-kube-v1.27.2.img,"
-    IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2024-01-10/ubuntu-2204-kube-v1.28.5.img,"
-    IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar-stable-3815.2.0-kube-v1.28.5.img,"
+    IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2024-05-28/ubuntu-2204-kube-v1.29.5.img,"
+    IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/ubuntu/2024-05-28/ubuntu-2204-kube-v1.30.1.img,"
+    IMAGE_URLS+="https://storage.googleapis.com/artifacts.k8s-staging-capi-openstack.appspot.com/test/flatcar/flatcar-stable-3815.2.2-kube-v1.30.1.img,"
     IMAGE_URLS+="https://stable.release.flatcar-linux.net/amd64-usr/current/flatcar_production_openstack_image.img"
 
     [[post-config|$NOVA_CONF]]

templates/clusterclass-dev-test.yaml

@@ -117,6 +117,9 @@ spec:
     spec:
       apiServerLoadBalancer:
         enabled: true
+      externalNetwork:
+        filter:
+          name: ${OPENSTACK_EXTERNAL_NETWORK_NAME:=public}
       identityRef:
         name: dev-test-cloud-config
         cloudName: ${OPENSTACK_CLOUD:=capo-e2e}
@@ -154,7 +157,8 @@ spec:
     spec:
       flavor: ${OPENSTACK_CONTROL_PLANE_MACHINE_FLAVOR:=m1.medium}
       image:
-        name: overridden-by-patch
+        filter:
+          name: overridden-by-patch
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME:=""}
 ---
 apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
@@ -166,5 +170,6 @@ spec:
     spec:
       flavor: ${OPENSTACK_NODE_MACHINE_FLAVOR:=m1.small}
       image:
-        name: overridden-by-patch
+        filter:
+          name: overridden-by-patch
       sshKeyName: ${OPENSTACK_SSH_KEY_NAME:=""}

test/e2e/data/e2e_conf.yaml

@@ -12,28 +12,28 @@
 managementClusterName: capo-e2e
 
 images:
-- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.6.0
+- name: gcr.io/k8s-staging-cluster-api/cluster-api-controller:v1.7.2
   loadBehavior: tryLoad
-- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.6.0
+- name: gcr.io/k8s-staging-cluster-api/kubeadm-bootstrap-controller:v1.7.2
   loadBehavior: tryLoad
-- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.6.0
+- name: gcr.io/k8s-staging-cluster-api/kubeadm-control-plane-controller:v1.7.2
   loadBehavior: tryLoad
 # Use local dev images built source tree;
 - name: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:e2e
   loadBehavior: mustLoad
-- name: quay.io/jetstack/cert-manager-cainjector:v1.12.1
+- name: quay.io/jetstack/cert-manager-cainjector:v1.14.5
   loadBehavior: tryLoad
-- name: quay.io/jetstack/cert-manager-webhook:v1.12.1
+- name: quay.io/jetstack/cert-manager-webhook:v1.14.5
   loadBehavior: tryLoad
-- name: quay.io/jetstack/cert-manager-controller:v1.12.1
+- name: quay.io/jetstack/cert-manager-controller:v1.14.5
   loadBehavior: tryLoad
 
 providers:
 - name: cluster-api
   type: CoreProvider
   versions:
-  - name: v1.6.0
-    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/core-components.yaml"
+  - name: v1.7.2
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.2/core-components.yaml"
     type: url
     contract: v1beta1
     files:
@@ -44,8 +44,8 @@ providers:
     - old: "--leader-elect"
       new: "--leader-elect=false\n        - --sync-period=1m"
   # For clusterctl upgrade test
-  - name: v1.4.6
-    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.6/core-components.yaml"
+  - name: v1.6.0
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/core-components.yaml"
     type: url
     contract: v1beta1
     files:
@@ -58,7 +58,7 @@ providers:
 - name: kubeadm
   type: BootstrapProvider
   versions:
-  - name: v1.6.0
+  - name: v1.7.2
     value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/bootstrap-components.yaml"
     type: url
     contract: v1beta1
@@ -70,8 +70,8 @@ providers:
     - old: "--leader-elect"
       new: "--leader-elect=false\n        - --sync-period=1m"
   # For clusterctl upgrade test
-  - name: v1.4.6
-    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.6/bootstrap-components.yaml"
+  - name: v1.6.0
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/bootstrap-components.yaml"
     type: url
     contract: v1beta1
     files:
@@ -84,8 +84,8 @@ providers:
 - name: kubeadm
   type: ControlPlaneProvider
   versions:
-  - name: v1.6.0
-    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/control-plane-components.yaml"
+  - name: v1.7.2
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.2/control-plane-components.yaml"
     type: url
     contract: v1beta1
     files:
@@ -96,8 +96,8 @@ providers:
     - old: "--leader-elect"
       new: "--leader-elect=false\n        - --sync-period=1m"
   # For clusterctl upgrade test
-  - name: v1.4.6
-    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.4.6/control-plane-components.yaml"
+  - name: v1.6.0
+    value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.6.0/control-plane-components.yaml"
     type: url
     contract: v1beta1
     files:
@@ -111,34 +111,6 @@ providers:
   type: InfrastructureProvider
   versions:
   # This is only for clusterctl upgrade tests
-  - name: v0.7.2
-    value: "https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/download/v0.7.2/infrastructure-components.yaml"
-    type: url
-    contract: v1beta1
-    files:
-    - sourcePath: "../data/shared/v1beta1_provider/metadata.yaml"
-    - sourcePath: "./infrastructure-openstack-no-artifact/cluster-template.yaml"
-    replacements:
-    - old: "imagePullPolicy: Always"
-      new: "imagePullPolicy: IfNotPresent"
-    - old: "--v=2"
-      new: "--v=4"
-    - old: "--leader-elect"
-      new: "--leader-elect=false\n        - --sync-period=1m"
-  - name: v0.8.0
-    value: "https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/download/v0.8.0/infrastructure-components.yaml"
-    type: url
-    contract: v1beta1
-    files:
-    - sourcePath: "../data/shared/v1beta1_provider/metadata.yaml"
-    - sourcePath: "./infrastructure-openstack-no-artifact/cluster-template.yaml"
-    replacements:
-    - old: "imagePullPolicy: Always"
-      new: "imagePullPolicy: IfNotPresent"
-    - old: "--v=2"
-      new: "--v=4"
-    - old: "--leader-elect"
-      new: "--leader-elect=false\n        - --sync-period=1m"
   - name: v0.9.0
     value: "https://github.com/kubernetes-sigs/cluster-api-provider-openstack/releases/download/v0.9.0/infrastructure-components.yaml"
     type: url
@@ -178,11 +150,12 @@ providers:
 variables:
   # used to ensure we deploy to the correct management cluster
   KUBE_CONTEXT: "kind-capo-e2e"
-  KUBERNETES_VERSION: "v1.28.5"
-  KUBERNETES_VERSION_UPGRADE_FROM: "v1.27.2"
-  KUBERNETES_VERSION_UPGRADE_TO: "v1.28.5"
-  ETCD_VERSION_UPGRADE_TO: "3.5.9-0"
-  COREDNS_VERSION_UPGRADE_TO: "v1.10.1"
+  KUBERNETES_VERSION: "v1.30.1"
+  KUBERNETES_VERSION_UPGRADE_FROM: "v1.29.5"
+  KUBERNETES_VERSION_UPGRADE_TO: "v1.30.1"
+  # NOTE: To see default images run kubeadm config images list (optionally with --kubernetes-version=vX.Y.Z)
+  ETCD_VERSION_UPGRADE_TO: "3.5.12-0"
+  COREDNS_VERSION_UPGRADE_TO: "v1.11.1"
   CONTROL_PLANE_MACHINE_TEMPLATE_UPGRADE_TO: "upgrade-to-control-plane"
   WORKERS_MACHINE_TEMPLATE_UPGRADE_TO: "upgrade-to-md-0"
   CNI: "../../data/cni/calico.yaml"
@@ -199,22 +172,22 @@ variables:
   OPENSTACK_DNS_NAMESERVERS: "8.8.8.8"
   OPENSTACK_FAILURE_DOMAIN: "testaz1"
   OPENSTACK_FAILURE_DOMAIN_ALT: "testaz2"
-  OPENSTACK_IMAGE_NAME: "ubuntu-2204-kube-v1.28.5"
-  OPENSTACK_IMAGE_NAME_UPGRADE_FROM: "ubuntu-2204-kube-v1.27.2"
+  OPENSTACK_IMAGE_NAME: "ubuntu-2204-kube-v1.30.1"
+  OPENSTACK_IMAGE_NAME_UPGRADE_FROM: "ubuntu-2204-kube-v1.29.5"
   OPENSTACK_NODE_MACHINE_FLAVOR: "m1.small"
   OPENSTACK_SSH_KEY_NAME: "cluster-api-provider-openstack-sigs-k8s-io"
   # The default external network created by devstack
   OPENSTACK_EXTERNAL_NETWORK_NAME: "public"
   OPENSTACK_VOLUME_TYPE_ALT: "test-volume-type"
   CONFORMANCE_WORKER_MACHINE_COUNT: "5"
   CONFORMANCE_CONTROL_PLANE_MACHINE_COUNT: "1"
-  INIT_WITH_KUBERNETES_VERSION: "v1.28.5"
+  INIT_WITH_KUBERNETES_VERSION: "v1.30.1"
   E2E_IMAGE_URL: "http://10.0.3.15/capo-e2e-image.tar"
   # The default user for SSH connections from bastion to machines
   SSH_USER_MACHINE: "ubuntu"
   EXP_KUBEADM_BOOTSTRAP_FORMAT_IGNITION: "true"
   # The Flatcar image produced by the image-builder
-  OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-3815.2.0-kube-v1.28.5"
+  OPENSTACK_FLATCAR_IMAGE_NAME: "flatcar-stable-3815.2.2-kube-v1.30.1"
   # A plain Flatcar from the Flatcar releases server
   FLATCAR_IMAGE_NAME: "flatcar_production_openstack_image"
 

test/e2e/data/shared/v1beta1/metadata.yaml

@@ -16,3 +16,6 @@ releaseSeries:
   - major: 1
     minor: 6
     contract: v1beta1
+  - major: 1
+    minor: 7
+    contract: v1beta1