Merge branch 'main' into renovate/lock-file-maintenance-python-dependencies

Author: theoctober19th

.github/actions/run-test/action.yaml

@@ -115,7 +115,7 @@ runs:
         juju-channel: ${{ inputs.juju-snap-channel }}
         provider: microk8s
         channel: "${{ inputs.k8s-version }}-strict/stable"
-        bootstrap-options: "--agent-version ${{ inputs.juju-agent-version }}"
+        bootstrap-options: "--agent-version 3.6.19"
         microk8s-group: snap_microk8s
         microk8s-addons: "hostpath-storage rbac dns metallb:10.64.140.43-10.64.140.49"
 
@@ -144,11 +144,31 @@ runs:
         # Set the versions
         yq -i e '.providers.k8s.channel = "${{ inputs.k8s-version }}-classic/stable"' concierge.yaml
         yq -i e '.juju.channel = "${{ inputs.juju-snap-channel }}"' concierge.yaml
-        yq -i e '.juju.agent-version = "${{ inputs.juju-agent-version }}"' concierge.yaml
+        yq -i e '.juju.agent-version = "3.6.19"' concierge.yaml
         
         sudo concierge prepare --trace
         cd ..
 
+    - name: Patch juju installation
+      shell: bash
+      run: |
+        sudo snap install yq
+        CONTROLLER_NAME=$(juju controllers --format yaml | yq .current-controller)
+        juju destroy-controller $CONTROLLER_NAME --destroy-storage --no-prompt --destroy-all-models
+        sudo snap refresh juju --revision 33784
+
+    - name: Re-install controller (MicroK8s)
+      shell: bash
+      if: "${{ inputs.k8s-distribution == 'microk8s' }}"
+      run: |
+        sudo -i -u ubuntu juju bootstrap microk8s $CONTROLLER_NAME --agent-version "${{ inputs.juju-agent-version }}"
+
+    - name: Re-install controller (K8s)
+      shell: bash
+      if: "${{ inputs.k8s-distribution == 'k8s' }}"
+      run: |
+        sudo -u ubuntu juju bootstrap k8s $CONTROLLER_NAME --verbose --agent-version "${{ inputs.juju-agent-version }}" --model-default 'logging-config=<root>=INFO; unit=DEBUG' --bootstrap-constraints root-disk=4G
+
     - id: setup-python
       name: Setup Python
       uses: actions/setup-python@v5.0.0

.github/workflows/ci-uat.yaml

@@ -48,9 +48,17 @@ jobs:
           juju-channel: ${{ matrix.juju.snap_channel }}
           provider: microk8s
           channel: "${{ matrix.k8s-version }}-strict/stable"
-          bootstrap-options: "--agent-version ${{ matrix.juju.agent }}"
+          # bootstrap-options: "--agent-version ${{ matrix.juju.agent }}"
           microk8s-group: snap_microk8s
           microk8s-addons: "hostpath-storage rbac dns metallb:10.64.140.43-10.64.140.49"
+      - name: Patch juju installation
+        run: |
+          sudo snap install yq
+          CONTROLLER_NAME=$(juju controllers --format yaml | yq .current-controller)
+          juju destroy-controller $CONTROLLER_NAME --destroy-storage --no-prompt --destroy-all-models
+          sudo snap refresh juju --revision 33784
+          sudo -i -u ubuntu juju bootstrap microk8s $CONTROLLER_NAME --agent-version "${{ matrix.juju.agent }}"
+
       - name: Install tox & poetry
         run: |
           pip install tox
@@ -102,46 +110,15 @@ jobs:
             echo "Installing terraform from snap"
             sudo snap install terraform --classic
           fi
-      - id: cache-image
-        name: Cache Image Locally
-        run: |
-          # Download image for avoiding time out
-          IMAGE="ghcr.io/canonical/charmed-spark-kyuubi@sha256:9268d19a6eef91914e874734b320fab64908faf0f7adb8856be809bc60ecd1d0"
-          docker pull $IMAGE
-          docker save $IMAGE -o image.tar
-          sudo microk8s ctr images import --base-name $IMAGE image.tar
-          docker rmi $IMAGE
-          rm image.tar
       - id: tests-integration
         name: Run Integration Tests
         timeout-minutes: 90
         env:
           AZURE_STORAGE_ACCOUNT: ${{ secrets.AZURE_STORAGE_ACCOUNT }}
           AZURE_STORAGE_KEY: ${{ secrets.AZURE_STORAGE_KEY }}
         run: |
-          UUID=$(uuidgen)
-          echo "Using UUID: ${UUID}"
-          cd python
-          # Run simple tests to make sure backend works and to clean up if needed
-          tox run -e integration-object-storage -- --spark-version ${{ matrix.version }} --storage-backend ${{ matrix.storage-backend }} --uuid $UUID
-
-          # Sometimes deleting resources on the clouds may take some time
-          sleep 60
-
-          # The first tests deploy the bundle
-          tox run -e integration-bundle -- --backend ${{ matrix.backend }} --spark-version ${{ matrix.version }} --storage-backend ${{ matrix.storage-backend }} --keep-models --model test-uat --cos-model cos --uuid $UUID
-
-          # Next we only use --no-deploy flag
-
-          tox run -e integration-kyuubi -- --backend ${{ matrix.backend }} --spark-version ${{ matrix.version }} --storage-backend ${{ matrix.storage-backend }} --no-deploy --keep-models --model test-uat --cos-model cos --uuid $UUID
-          tox run -e integration-sparkjob -- --backend ${{ matrix.backend }} --spark-version ${{ matrix.version }} --storage-backend ${{ matrix.storage-backend }} --no-deploy --keep-models --model test-uat --cos-model cos --uuid $UUID
-
-          # We re-run the last tests to make sure that the tests are idempotent
-          tox run -e integration-kyuubi -- --backend ${{ matrix.backend }} --spark-version ${{ matrix.version }} --storage-backend ${{ matrix.storage-backend }} --no-deploy --keep-models --model test-uat --cos-model cos --uuid $UUID
-          tox run -e integration-sparkjob -- --backend ${{ matrix.backend }} --spark-version ${{ matrix.version }} --storage-backend ${{ matrix.storage-backend }} --no-deploy --model test-uat --cos-model cos --uuid $UUID
-
-          # # Run backup / restore tests separately without --no-deploy and --keep-models
-          # tox run -e integration-backup-restore -- --backend ${{ matrix.backend }} --spark-version ${{ matrix.version }} --storage-backend ${{ matrix.storage-backend }} --model test-uat --cos-model cos --uuid $UUID
+          cd python/
+          tox -e uat -- --backend ${{ matrix.backend }} --spark-version ${{ matrix.version }}  --storage-backend ${{ matrix.storage-backend }}
       - id: collect-logs
         name: Collect logs if job failed
         shell: bash

docs/.custom_wordlist.txt

@@ -31,6 +31,7 @@ https
 Intersphinx
 io
 ip
+Jira
 Kaggle
 kaggle
 kubeconfig
@@ -45,6 +46,7 @@ loadbalancers
 metastore
 Multipass
 MyST
+nodeSelector
 Open Graph
 otf
 PDF
@@ -78,6 +80,8 @@ tex
 texlive
 TOC
 toctree
+tolerations
+Trivy
 txt
 uncommenting
 URL
@@ -92,3 +96,6 @@ xindy
 xml
 yaml
 YouTube
+Ory
+middleware
+Entra