Bump versions of infrastructure providers (CAPI and CAPO)

.github/actions/setup/action.yml

@@ -21,6 +21,7 @@ runs:
         echo "cluster-api-provider-openstack=$(jq -r '.["cluster-api-provider-openstack"]' "$DEPENDENCIES_PATH")" >> $GITHUB_OUTPUT
         echo "cert-manager=$(jq -r '.["cert-manager"]' "$DEPENDENCIES_PATH")" >> $GITHUB_OUTPUT
         echo "helm=$(jq -r '.["helm"]' "$DEPENDENCIES_PATH")" >> $GITHUB_OUTPUT
+        echo "openstack-resource-controller=$(jq -r '.["openstack-resource-controller"]' "$DEPENDENCIES_PATH")" >> $GITHUB_OUTPUT
         echo "sonobuoy=$(jq -r '.["sonobuoy"]' "$DEPENDENCIES_PATH")" >> $GITHUB_OUTPUT
       env:
         DEPENDENCIES_PATH: ${{ inputs.dependencies-path }}
@@ -58,7 +59,7 @@ runs:
           --namespace cert-manager \
           --create-namespace  \
           --install \
-          --set installCRDs=true \
+          --set crds.enabled=true \
           --wait \
           --timeout 10m
 
@@ -93,6 +94,16 @@ runs:
         # unreleased tags kubernetes-sigs/cluster-api#7889
         GOPROXY: off
 
+    - name: Install openstack-resource-controller
+      shell: bash
+      run: |
+        ORC_URL=https://github.com/k-orc/openstack-resource-controller/releases/download/${ORC_VERSION}/install.yaml
+        if ! kubectl apply --server-side -f ${ORC_URL}; then
+          kubectl apply --server-side --force-conflicts -f ${ORC_URL}
+        fi
+      env:
+        ORC_VERSION: ${{ steps.deps.outputs.openstack-resource-controller }}
+
     - name: Install Cluster API add-on provider
       shell: bash
       run: |-

.github/actions/upgrade-and-test/action.yml

@@ -45,6 +45,12 @@ inputs:
       One of certified-conformance, conformance-lite, non-disruptive-conformance, quick.
     required: true
     default: quick
+  sonobuoy-level:
+    description: |
+      The log level for the Sonobuoy run.
+      One of panic, fatal, error, warn, info, debug, trace.
+    required: true
+    default: info
   sonobuoy-upload:
     description: Specify "yes" to upload the Sonobuoy run as an artifact
     required: true
@@ -71,6 +77,22 @@ runs:
           --set kubernetesVersion=${{ inputs.kubernetes-version }} \
           --set machineImageId=${{ inputs.image-id }}
 
+    - name: Check for cluster deployment ready condition name
+      id: check-ready-condition
+      shell: bash
+      run: |-
+        cluster_api_version=$(kubectl api-resources \
+                                --api-group=cluster.x-k8s.io \
+                                --no-headers=true |\
+                                 grep ^clusters |\
+                                 awk '{print $3}')
+
+        if [[ "$cluster_api_version" =~ v1beta1$ ]]; then
+          echo "cluster-ready-condition-name=ready" >> $GITHUB_OUTPUT
+        else
+          echo "cluster-ready-condition-name=available" >> $GITHUB_OUTPUT
+        fi
+
     # Wait for any upgrade to start before checking if it is complete
     # This is to make sure the controller has actioned the update before
     # progressing to wait for ready
@@ -82,15 +104,15 @@ runs:
       shell: bash
       run: |-
         kubectl wait clusters/${{ inputs.name }} \
-          --for=condition=ready=false \
+          --for=condition=${{ steps.check-ready-condition.outputs.cluster-ready-condition-name }}=false \
           --timeout 2m
       continue-on-error: true
 
     - name: Wait for cluster ready
       shell: bash
       run: |-
         kubectl wait clusters/${{ inputs.name }} \
-          --for=condition=ready \
+          --for=condition=${{ steps.check-ready-condition.outputs.cluster-ready-condition-name }} \
           --timeout 30m
 
     - name: Wait for machine deployments to be running
@@ -101,6 +123,30 @@ runs:
           --for=jsonpath='{.status.phase}'=Running \
           --timeout 30m
 
+    - name: Wait for control-plane and worker machines to be up-to-date and ready (v1beta2)
+      shell: bash
+      run: |-
+        kubectl wait clusters/${{ inputs.name }} \
+          --for=condition=RollingOut=false \
+          --timeout 30m \
+        && \
+        kubectl wait clusters/${{ inputs.name }} \
+          --for=condition=ControlPlaneMachinesUpToDate \
+          --timeout 30m \
+        && \
+        kubectl wait clusters/${{ inputs.name }} \
+          --for=condition=ControlPlaneMachinesReady \
+          --timeout 30m \
+        && \
+        kubectl wait clusters/${{ inputs.name }} \
+          --for=condition=WorkerMachinesUpToDate \
+          --timeout 30m \
+        && \
+        kubectl wait clusters/${{ inputs.name }} \
+          --for=condition=WorkerMachinesReady \
+          --timeout 30m
+      if: ${{ steps.check-ready-condition.outputs.cluster-ready-condition-name == 'available' }}
+
     - name: Wait for addons to deploy
       shell: bash
       run: |-
@@ -138,9 +184,15 @@ runs:
         KUBECONFIG: ./kubeconfig
       if: "${{ inputs.skip-workload-status != 'yes' }}"
 
+    - name: Get cluster nodes
+      shell: bash
+      run: kubectl get nodes -o wide
+      env:
+        KUBECONFIG: ./kubeconfig
+
     - name: Run sonobuoy
       shell: bash
-      run: sonobuoy run --mode ${{ inputs.sonobuoy-mode }} --wait
+      run: sonobuoy run --level ${{ inputs.sonobuoy-level }} --mode ${{ inputs.sonobuoy-mode }} --wait
       env:
         KUBECONFIG: ./kubeconfig
 

.github/workflows/lint.yaml

@@ -32,7 +32,7 @@ jobs:
             --all \
             --validate-maintainers=false
 
-      - name: Run template validation
+      - name: Run template validation (current values)
         run: |-
           helm template foo charts/openstack-cluster \
             -f charts/openstack-cluster/tests/values_base.yaml \
@@ -45,5 +45,32 @@ jobs:
 
       # NOTE: Run the following command locally to generate updated snapshots:
       # docker run -i --rm -v $(pwd):/apps helmunittest/helm-unittest charts/openstack-cluster -u
-      - name: Run manifest snapshot test
+      - name: Run manifest snapshot test (current values)
+        run: docker run -i --rm -v $(pwd):/apps helmunittest/helm-unittest charts/openstack-cluster
+      - name: Get latest tag
+        id: latest-tag
+        run: |
+          set -eo pipefail
+          TAG_NAME="$(curl -fsSL "$GITHUB_API_URL/repos/$GITHUB_REPOSITORY/releases/latest" | jq -r '.tag_name')"
+          echo "tag-name=${TAG_NAME}" >> "$GITHUB_OUTPUT"
+      - name: Checkout default values from latest tag
+        run: |
+          git checkout $LATEST_TAG -- charts/openstack-cluster/values.yaml
+        env:
+          LATEST_TAG: ${{ steps.latest-tag.outputs.tag-name }}
+
+      - name: Run template validation (values from latest tag)
+        run: |-
+          helm template foo charts/openstack-cluster \
+            -f charts/openstack-cluster/tests/values_base.yaml \
+            -f charts/openstack-cluster/tests/values_full.yaml \
+            | docker run -i --rm ghcr.io/yannh/kubeconform:latest \
+            --strict --summary \
+            --schema-location default \
+            --schema-location 'https://raw.githubusercontent.com/datreeio/CRDs-catalog/main/{{.Group}}/{{.ResourceKind}}_{{.ResourceAPIVersion}}.json' \
+            --skip HelmRelease,Manifests,OpenStackCluster,OpenStackMachineTemplate
+
+      # NOTE: Run the following command locally to generate updated snapshots:
+      # docker run -i --rm -v $(pwd):/apps helmunittest/helm-unittest charts/openstack-cluster -u
+      - name: Run manifest snapshot test (values from latest tag)
         run: docker run -i --rm -v $(pwd):/apps helmunittest/helm-unittest charts/openstack-cluster

.github/workflows/update-dependencies.yml

@@ -42,6 +42,10 @@ jobs:
           - key: helm
             type: github
             repo: helm/helm
+
+          - key: openstack-resource-controller
+            type: github
+            repo: k-orc/openstack-resource-controller
 
           - key: sonobuoy
             type: github

charts/openstack-cluster/README.md

@@ -48,8 +48,8 @@ templates for more details.
 
 First, you must set up a
 [Cluster API management cluster](https://cluster-api.sigs.k8s.io/user/concepts.html#management-cluster)
-with the [OpenStack Infrastructure Provider](https://github.com/kubernetes-sigs/cluster-api-provider-openstack)
-installed.
+with both the [OpenStack Infrastructure Provider](https://github.com/kubernetes-sigs/cluster-api-provider-openstack)
+and [OpenStack Resource Controller](https://github.com/k-orc/openstack-resource-controller) installed.
 
 Addons are managed by the
 [Cluster API Addon Provider](https://github.com/azimuth-cloud/cluster-api-addon-provider),