Merge branch 'main' into KU-2391/charm-ownership-of-node-role-labels

canonical · Jan 8, 2025 · 515166a · 515166a
2 parents e957db4 + 673cdaa
commit 515166a
Show file tree

Hide file tree

Showing 75 changed files with 83 additions and 82 deletions.
diff --git a/.github/workflows/download-charm.yaml b/.github/workflows/download-charm.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 name: Download Charm

diff --git a/.github/workflows/promote-charms.yaml b/.github/workflows/promote-charms.yaml
@@ -58,24 +58,25 @@ jobs:
         run: |
           echo "Determines which charms were chosen from $CHOICE"
           if [[ "${CHOICE}" == "all" ]]; then
-            echo "charms=[\"charms/worker\", \"charms/worker/k8s\"]" >> "$GITHUB_OUTPUT"
+            echo 'charms=[{"name": "k8s-worker", "path": "charms/worker"}, {"name": "k8s", "path": "charms/worker/k8s"}]' >> "$GITHUB_OUTPUT"
           elif [[ "${CHOICE}" == "k8s" ]]; then
-            echo "charms=[\"charms/worker/k8s\"]" >> "$GITHUB_OUTPUT"
+            echo 'charms=[{"name": "k8s", "path": "charms/worker/k8s"}]' >> "$GITHUB_OUTPUT"
           else
-            echo "charms=[\"charms/worker\"]" >> "$GITHUB_OUTPUT"
+            echo 'charms=[{"name": "k8s-worker", "path": "charms/worker"}]' >> "$GITHUB_OUTPUT"
           fi
   promote-charm:
     needs: [configure-track, select-charms]
     strategy:
       matrix:
-        charm-directory: ${{ fromJson(needs.select-charms.outputs.charms) }}
+        charm: ${{ fromJson(needs.select-charms.outputs.charms) }}
         arch:
         - amd64
         - arm64
     uses: canonical/operator-workflows/.github/workflows/promote_charm.yaml@main
     with:
       base-architecture: ${{ matrix.arch }}
-      charm-directory: ${{ matrix.charm-directory }}
+      charm-directory: ${{ matrix.charm.path }}
       destination-channel: ${{needs.configure-track.outputs.track}}/${{ inputs.destination-risk }}
       origin-channel: ${{needs.configure-track.outputs.track}}/${{ inputs.origin-risk }}
+      tag-prefix: ${{ matrix.charm.name }}
     secrets: inherit
diff --git a/.github/workflows/update-snap-revision.py b/.github/workflows/update-snap-revision.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 

diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -1,7 +1,7 @@
 header:
   - license:
       copyright-owner: Canonical Ltd.
-      copyright-year: 2024
+      copyright-year: 2025
       content: |
         Copyright [year] [owner]
         Licensed under the Apache2.0. See LICENSE file in charm source for details.

diff --git a/LICENSE b/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2024 Canonical Ltd.
+   Copyright 2025 Canonical Ltd.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/charms/worker/charmcraft.yaml b/charms/worker/charmcraft.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 # This file configures Charmcraft.
 # See https://juju.is/docs/sdk/charmcraft-config for guidance.

diff --git a/charms/worker/k8s/build-snap-installation.sh b/charms/worker/k8s/build-snap-installation.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Create an empty tarball to be used as a placeholder for the snap installation override
 echo "Creating empty tarball at $1"
-touch "${1}"
+touch "${1}"
diff --git a/charms/worker/k8s/charmcraft.yaml b/charms/worker/k8s/charmcraft.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 # This file configures Charmcraft.
 # See https://juju.is/docs/sdk/charmcraft-config for guidance.

diff --git a/charms/worker/k8s/lib/charms/k8s/v0/k8sd_api_manager.py b/charms/worker/k8s/lib/charms/k8s/v0/k8sd_api_manager.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Module for managing k8sd API interactions.

diff --git a/charms/worker/k8s/lib/charms/kubernetes_libs/v0/etcd.py b/charms/worker/k8s/lib/charms/kubernetes_libs/v0/etcd.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/charms/worker/k8s/lib/charms/operator_libs_linux/v2/snap.py b/charms/worker/k8s/lib/charms/operator_libs_linux/v2/snap.py
@@ -84,7 +84,7 @@
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 8
+LIBPATCH = 9
 
 
 # Regex to locate 7-bit C1 ANSI sequences
@@ -787,7 +787,7 @@ def _wait(self, change_id: str, timeout=300) -> JSONType:
             status = response["status"]
             if status == "Done":
                 return response.get("data")
-            if status == "Doing":
+            if status == "Doing" or status == "Do":
                 time.sleep(0.1)
                 continue
             if status == "Wait":

diff --git a/charms/worker/k8s/scripts/rules-patches/core-alert-rules.patch b/charms/worker/k8s/scripts/rules-patches/core-alert-rules.patch
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 diff --git a/charms/worker/k8s/src/prometheus_alert_rules/kubernetesControlPlane-prometheusRule.yaml b/charms/worker/k8s/src/prometheus_alert_rules/kubernetesControlPlane-prometheusRule.yaml

diff --git a/charms/worker/k8s/scripts/update_alert_rules.py b/charms/worker/k8s/scripts/update_alert_rules.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Sync AlertManager rules from an upstream repository.
@@ -80,7 +80,7 @@ def process_rule_file(contents, destination_file: Path, source_url: str):
         ]
 
     data = [
-        "# Copyright 2024 Canonical Ltd.",
+        "# Copyright 2025 Canonical Ltd.",
         "# See LICENSE file for licensing details.\n\n" f"# Automatically generated by {sys.argv}",
         f"# Source: {source_url}",
         yaml.safe_dump(alert_rules),

diff --git a/charms/worker/k8s/scripts/update_dashboards.py b/charms/worker/k8s/scripts/update_dashboards.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Sync Grafana dashboards from an upstream repository.

diff --git a/charms/worker/k8s/src/charm.py b/charms/worker/k8s/src/charm.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Learn more at: https://juju.is/docs/sdk

diff --git a/charms/worker/k8s/src/cloud_integration.py b/charms/worker/k8s/src/cloud_integration.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Cloud Integration for Canonical k8s Operator."""

diff --git a/charms/worker/k8s/src/config/extra_args.py b/charms/worker/k8s/src/config/extra_args.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Learn more at: https://juju.is/docs/sdk

diff --git a/charms/worker/k8s/src/containerd.py b/charms/worker/k8s/src/containerd.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Learn more at: https://juju.is/docs/sdk

diff --git a/charms/worker/k8s/src/cos_integration.py b/charms/worker/k8s/src/cos_integration.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """COS Integration module."""

diff --git a/charms/worker/k8s/src/events/update_status.py b/charms/worker/k8s/src/events/update_status.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Learn more at: https://juju.is/docs/sdk

diff --git a/charms/worker/k8s/src/inspector.py b/charms/worker/k8s/src/inspector.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """A module for inspecting a Kubernetes cluster."""

diff --git a/charms/worker/k8s/src/kube_control.py b/charms/worker/k8s/src/kube_control.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Relation kube-control module."""

diff --git a/charms/worker/k8s/src/literals.py b/charms/worker/k8s/src/literals.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Literals for the charm."""

diff --git a/charms/worker/k8s/src/prometheus_alert_rules/kubePrometheus-prometheusRule.yaml b/charms/worker/k8s/src/prometheus_alert_rules/kubePrometheus-prometheusRule.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Automatically generated by ['scripts/update_alert_rules.py']

diff --git a/charms/worker/k8s/src/prometheus_alert_rules/kubeStateMetrics-prometheusRule.yaml b/charms/worker/k8s/src/prometheus_alert_rules/kubeStateMetrics-prometheusRule.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Automatically generated by ['scripts/update_alert_rules.py']

diff --git a/charms/worker/k8s/src/prometheus_alert_rules/kubernetesControlPlane-prometheusRule.yaml b/charms/worker/k8s/src/prometheus_alert_rules/kubernetesControlPlane-prometheusRule.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Automatically generated by ['scripts/update_alert_rules.py']

diff --git a/charms/worker/k8s/src/protocols.py b/charms/worker/k8s/src/protocols.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Protocol definitions module."""

diff --git a/charms/worker/k8s/src/reschedule.py b/charms/worker/k8s/src/reschedule.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """EventTimer for scheduling dispatch of juju event on regular intervals."""

diff --git a/charms/worker/k8s/src/snap.py b/charms/worker/k8s/src/snap.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Learn more at: https://juju.is/docs/sdk

diff --git a/charms/worker/k8s/src/token_distributor.py b/charms/worker/k8s/src/token_distributor.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Token Distributor module."""

diff --git a/charms/worker/k8s/src/upgrade.py b/charms/worker/k8s/src/upgrade.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """A module for upgrading the k8s and k8s-worker charms."""

diff --git a/charms/worker/k8s/templates/cos_roles.yaml b/charms/worker/k8s/templates/cos_roles.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 apiVersion: rbac.authorization.k8s.io/v1

diff --git a/charms/worker/k8s/templates/ksm.yaml b/charms/worker/k8s/templates/ksm.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Source: https://raw.githubusercontent.com/kubernetes/kube-state-metrics/v2.9.2/examples/standard/cluster-role-binding.yaml

diff --git a/charms/worker/k8s/templates/snap_installation.yaml b/charms/worker/k8s/templates/snap_installation.yaml
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 amd64:

diff --git a/charms/worker/k8s/terraform/main.tf b/charms/worker/k8s/terraform/main.tf
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 resource "juju_application" "k8s" {

diff --git a/charms/worker/k8s/terraform/outputs.tf b/charms/worker/k8s/terraform/outputs.tf
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 output "app_name" {

diff --git a/charms/worker/k8s/terraform/variables.tf b/charms/worker/k8s/terraform/variables.tf
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 variable "app_name" {

diff --git a/charms/worker/k8s/terraform/versions.tf b/charms/worker/k8s/terraform/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  # Copyright 2024 Canonical Ltd.
+  # Copyright 2025 Canonical Ltd.
   # See LICENSE file for licensing details.
 
   required_version = ">= 1.6"

diff --git a/charms/worker/k8s/tests/unit/test_base.py b/charms/worker/k8s/tests/unit/test_base.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Learn more about testing at: https://juju.is/docs/sdk/testing

diff --git a/charms/worker/k8s/tests/unit/test_cloud_integration.py b/charms/worker/k8s/tests/unit/test_cloud_integration.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Unit tests cloud-integration module."""

diff --git a/charms/worker/k8s/tests/unit/test_config_options.py b/charms/worker/k8s/tests/unit/test_config_options.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Learn more about testing at: https://juju.is/docs/sdk/testing

diff --git a/charms/worker/k8s/tests/unit/test_containerd.py b/charms/worker/k8s/tests/unit/test_containerd.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Learn more about testing at: https://juju.is/docs/sdk/testing

diff --git a/charms/worker/k8s/tests/unit/test_inspector.py b/charms/worker/k8s/tests/unit/test_inspector.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Tests for the inspector module."""

diff --git a/charms/worker/k8s/tests/unit/test_k8sd_api_manager.py b/charms/worker/k8s/tests/unit/test_k8sd_api_manager.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 # Ignore Pylint requiring docstring for each test function.
 # pylint: disable=C0116

diff --git a/charms/worker/k8s/tests/unit/test_reschedule.py b/charms/worker/k8s/tests/unit/test_reschedule.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Learn more about testing at: https://juju.is/docs/sdk/testing

diff --git a/charms/worker/k8s/tests/unit/test_snap.py b/charms/worker/k8s/tests/unit/test_snap.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Learn more about testing at: https://juju.is/docs/sdk/testing

diff --git a/charms/worker/k8s/tests/unit/test_token_distributor.py b/charms/worker/k8s/tests/unit/test_token_distributor.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 # Learn more about testing at: https://juju.is/docs/sdk/testing

diff --git a/charms/worker/k8s/tests/unit/test_upgrade.py b/charms/worker/k8s/tests/unit/test_upgrade.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Tests for the upgrade module."""

diff --git a/charms/worker/k8s/tox.ini b/charms/worker/k8s/tox.ini
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 [tox]

diff --git a/charms/worker/terraform/main.tf b/charms/worker/terraform/main.tf
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 resource "juju_application" "k8s_worker" {

diff --git a/charms/worker/terraform/outputs.tf b/charms/worker/terraform/outputs.tf
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 output "app_name" {

diff --git a/charms/worker/terraform/variables.tf b/charms/worker/terraform/variables.tf
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 variable "app_name" {

diff --git a/charms/worker/terraform/versions.tf b/charms/worker/terraform/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  # Copyright 2024 Canonical Ltd.
+  # Copyright 2025 Canonical Ltd.
   # See LICENSE file for licensing details.
 
   required_version = ">= 1.6"

diff --git a/generate-src-docs.sh b/generate-src-docs.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 lazydocs --no-watermark --output-path src-docs src/*
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
@@ -1,2 +1,2 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -1,4 +1,4 @@
-# Copyright 2024 Canonical Ltd.
+# Copyright 2025 Canonical Ltd.
 # See LICENSE file for licensing details.
 
 """Fixtures for charm tests."""