Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 22 additions & 2 deletions .github/actions/run-test/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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
Expand Down
10 changes: 9 additions & 1 deletion .github/workflows/ci-uat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
deusebio marked this conversation as resolved.
sudo -i -u ubuntu juju bootstrap microk8s $CONTROLLER_NAME --agent-version "${{ matrix.juju.agent }}"

- name: Install tox & poetry
run: |
pip install tox
Expand Down
24 changes: 12 additions & 12 deletions releases/3.4/terraform/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ terraform {

locals {
revisions = {
history_server = 94
integration_hub = 113
kyuubi = 140
history_server = 96
integration_hub = 119
kyuubi = 149
kyuubi_users = 495
metastore = 495
zookeeper = 78
data_integrator = 179
s3 = 145
azure_storage = 15
data_integrator = 362
s3 = 330
azure_storage = 270
grafana_agent = 121
# TODO: bump the revision to 1/stable when both of the following issue gets fixed:
# https://github.com/canonical/cos-configuration-k8s-operator/issues/128
Expand All @@ -31,14 +31,14 @@ locals {
}
images = {
history_server = {
spark-history-server-image = "ghcr.io/canonical/charmed-spark@sha256:c7eef66beaeff463fdb7b707c630c0574912df8b843d8e3169f358adee2ae706"
} # rev23, spark-version: 3.5.7, release date 2026-02-27
spark-history-server-image = "ghcr.io/canonical/charmed-spark@sha256:f7f387a76ba2f3b6cfc34a35f36c0f4ae85bfa78c8c9d4bfa06ba86401b95d70"
} # rev24, spark-version: 3.5.7, release date 16/03/2026
integration_hub = {
integration-hub-image = "ghcr.io/canonical/spark-integration-hub@sha256:c04d2d95874612883f6ead105d5f1dd74230370b23a08ea81175df81ba2e06fa"
} # rev11, release date 2026-03-02
integration-hub-image = "ghcr.io/canonical/spark-integration-hub@sha256:a0439da3e6a9433a0db9501c8ea7b28ba3652af9a9ec22fcc2ad1b0197d48134"
} # rev13, release date 19/03/2026
kyuubi = {
kyuubi-image = "ghcr.io/canonical/charmed-spark-kyuubi@sha256:761a50ca0597825e5962c071a6575e7275e7eb04cae958d578bd7cc7f54fbb3e"
} # rev16, spark-3.4.4, kyuubi 1.10.3 release date 2026-02-27
kyuubi-image = "ghcr.io/canonical/charmed-spark-kyuubi@sha256:60e81dd2e9be50d4a857ce987935341c8518c784c7de36e814fc41dd3451d58f"
} # rev19, spark-version: 3.4.4, kyuubi-version: 1.10.3, release date 17/03/2026
kyuubi_users = {
postgresql-image = 165
}
Expand Down
16 changes: 8 additions & 8 deletions releases/3.4/yaml/bundle.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ applications:
kyuubi:
charm: kyuubi-k8s
channel: 3.4/stable
revision: 140
revision: 149
resources:
# rev16, spark-3.4.4, kyuubi 1.10.3 release date 2026-02-27
kyuubi-image: ghcr.io/canonical/charmed-spark-kyuubi@sha256:761a50ca0597825e5962c071a6575e7275e7eb04cae958d578bd7cc7f54fbb3e
# rev19, spark-version: 3.4.4, kyuubi-version: 1.10.3, release date 17/03/2026
kyuubi-image: ghcr.io/canonical/charmed-spark-kyuubi@sha256:60e81dd2e9be50d4a857ce987935341c8518c784c7de36e814fc41dd3451d58f
scale: 3
options:
namespace: {{ namespace }}
Expand Down Expand Up @@ -65,17 +65,17 @@ applications:
channel: 3/stable
revision: 94
resources:
# rev23, spark-version: 3.5.7, release date 2026-02-27
spark-history-server-image: ghcr.io/canonical/charmed-spark@sha256:c7eef66beaeff463fdb7b707c630c0574912df8b843d8e3169f358adee2ae706
# rev24, spark-version: 3.5.7, release date 16/03/2026
spark-history-server-image: ghcr.io/canonical/charmed-spark@sha256:f7f387a76ba2f3b6cfc34a35f36c0f4ae85bfa78c8c9d4bfa06ba86401b95d70
scale: 1
constraints: arch=amd64
integration-hub:
charm: spark-integration-hub-k8s
channel: 3/stable
revision: 113
revision: 119
resources:
# rev 11, release date 2026-03-02
integration-hub-image: ghcr.io/canonical/spark-integration-hub@sha256:c04d2d95874612883f6ead105d5f1dd74230370b23a08ea81175df81ba2e06fa
# rev 13, release date 19/03/2026
integration-hub-image: ghcr.io/canonical/spark-integration-hub@sha256:a0439da3e6a9433a0db9501c8ea7b28ba3652af9a9ec22fcc2ad1b0197d48134
scale: 1
constraints: arch=amd64
trust: true
Expand Down
24 changes: 12 additions & 12 deletions releases/3.5/terraform/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ terraform {

locals {
revisions = {
history_server = 94
integration_hub = 113
kyuubi = 142
history_server = 96
integration_hub = 119
kyuubi = 146
kyuubi_users = 495
metastore = 495
zookeeper = 78
data_integrator = 179
s3 = 145
azure_storage = 15
data_integrator = 362
s3 = 330
azure_storage = 270
grafana_agent = 121
# TODO: bump the revision to 1/stable when both of the following issue gets fixed:
# https://github.com/canonical/cos-configuration-k8s-operator/issues/128
Expand All @@ -31,14 +31,14 @@ locals {
}
images = {
history_server = {
spark-history-server-image = "ghcr.io/canonical/charmed-spark@sha256:c7eef66beaeff463fdb7b707c630c0574912df8b843d8e3169f358adee2ae706"
} # rev23, spark-version: 3.5.7, release date 2026-02-27
spark-history-server-image = "ghcr.io/canonical/charmed-spark@sha256:f7f387a76ba2f3b6cfc34a35f36c0f4ae85bfa78c8c9d4bfa06ba86401b95d70"
} # rev24, spark-version: 3.5.7, release date 16/03/2026
integration_hub = {
integration-hub-image = "ghcr.io/canonical/spark-integration-hub@sha256:c04d2d95874612883f6ead105d5f1dd74230370b23a08ea81175df81ba2e06fa"
} # rev11, release date 2026-03-02
integration-hub-image = "ghcr.io/canonical/spark-integration-hub@sha256:a0439da3e6a9433a0db9501c8ea7b28ba3652af9a9ec22fcc2ad1b0197d48134"
} # rev13, release date 19/03/2026
kyuubi = {
kyuubi-image = "ghcr.io/canonical/charmed-spark-kyuubi@sha256:cdde52a4f72112ea09de11c6d21f901323619cf41015db89cb9d5742c57da303"
} # rev17, spark-3.5.7, kyuubi 1.10.3 release date 2026-02-07
kyuubi-image = "ghcr.io/canonical/charmed-spark-kyuubi@sha256:21beea406001d161538b552cef2b47b86423bd899139ada263c1ef665fd89fff"
} # rev18, spark-version: 3.5.7, kyuubi-version: 1.10.3, release date 16/03/2026
kyuubi_users = {
postgresql-image = 165
}
Expand Down
18 changes: 9 additions & 9 deletions releases/3.5/yaml/bundle.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ applications:
kyuubi:
charm: kyuubi-k8s
channel: 3.5/stable
revision: 142
revision: 146
resources:
# rev17, spark-3.5.7, kyuubi 1.10.3 release date 2026-02-07
kyuubi-image: ghcr.io/canonical/charmed-spark-kyuubi@sha256:cdde52a4f72112ea09de11c6d21f901323619cf41015db89cb9d5742c57da303
# rev18, spark-version: 3.5.7, kyuubi-version: 1.10.3, release date 16/03/2026
kyuubi-image: ghcr.io/canonical/charmed-spark-kyuubi@sha256:21beea406001d161538b552cef2b47b86423bd899139ada263c1ef665fd89fff
scale: 3
options:
namespace: {{ namespace }}
Expand Down Expand Up @@ -63,19 +63,19 @@ applications:
history-server:
charm: spark-history-server-k8s
channel: 3/stable
revision: 94
revision: 96
resources:
# rev23, spark-version: 3.5.7, release date 2026-02-27
spark-history-server-image: ghcr.io/canonical/charmed-spark@sha256:c7eef66beaeff463fdb7b707c630c0574912df8b843d8e3169f358adee2ae706
# rev24, spark-version: 3.5.7, release date 16/03/2026
spark-history-server-image: ghcr.io/canonical/charmed-spark@sha256:f7f387a76ba2f3b6cfc34a35f36c0f4ae85bfa78c8c9d4bfa06ba86401b95d70
scale: 1
constraints: arch=amd64
integration-hub:
charm: spark-integration-hub-k8s
channel: 3/stable
revision: 113
revision: 119
resources:
# rev 11, release date 2026-03-02
integration-hub-image: ghcr.io/canonical/spark-integration-hub@sha256:c04d2d95874612883f6ead105d5f1dd74230370b23a08ea81175df81ba2e06fa
# rev 13, release date 19/03/2026
integration-hub-image: ghcr.io/canonical/spark-integration-hub@sha256:a0439da3e6a9433a0db9501c8ea7b28ba3652af9a9ec22fcc2ad1b0197d48134
scale: 1
constraints: arch=amd64
trust: true
Expand Down
Loading