From c2e77de80632e95430e278e7ede18d4eda513f1c Mon Sep 17 00:00:00 2001 From: Adam Dyess Date: Fri, 20 Dec 2024 08:25:42 -0600 Subject: [PATCH 1/3] chore: update charm libraries (#218) --- charms/worker/k8s/lib/charms/operator_libs_linux/v2/snap.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index d84b7d8d..d14f864f 100644 --- 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": From 2391efd624657c322c8910b4a0c1b056590f8231 Mon Sep 17 00:00:00 2001 From: Adam Dyess Date: Fri, 20 Dec 2024 09:54:59 -0600 Subject: [PATCH 2/3] Provide tag-prefix when promoting charms (#226) --- .github/workflows/promote-charms.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/promote-charms.yaml b/.github/workflows/promote-charms.yaml index 963d7367..c033e548 100644 --- 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 From 673cdaa1f0cd04d2d95dce0efe3048892596528c Mon Sep 17 00:00:00 2001 From: Homayoon Alimohammadi Date: Wed, 8 Jan 2025 03:35:02 +0400 Subject: [PATCH 3/3] Change year to 2025 (#235) --- .github/workflows/download-charm.yaml | 2 +- .github/workflows/update-snap-revision.py | 2 +- .licenserc.yaml | 2 +- LICENSE | 2 +- charms/worker/charmcraft.yaml | 2 +- charms/worker/k8s/build-snap-installation.sh | 4 ++-- charms/worker/k8s/charmcraft.yaml | 2 +- charms/worker/k8s/lib/charms/k8s/v0/k8sd_api_manager.py | 2 +- charms/worker/k8s/lib/charms/kubernetes_libs/v0/etcd.py | 2 +- .../worker/k8s/scripts/rules-patches/core-alert-rules.patch | 2 +- charms/worker/k8s/scripts/update_alert_rules.py | 4 ++-- charms/worker/k8s/scripts/update_dashboards.py | 2 +- charms/worker/k8s/src/charm.py | 2 +- charms/worker/k8s/src/cloud_integration.py | 2 +- charms/worker/k8s/src/config/extra_args.py | 2 +- charms/worker/k8s/src/containerd.py | 2 +- charms/worker/k8s/src/cos_integration.py | 2 +- charms/worker/k8s/src/events/update_status.py | 2 +- charms/worker/k8s/src/inspector.py | 2 +- charms/worker/k8s/src/kube_control.py | 2 +- charms/worker/k8s/src/literals.py | 2 +- .../prometheus_alert_rules/kubePrometheus-prometheusRule.yaml | 2 +- .../kubeStateMetrics-prometheusRule.yaml | 2 +- .../kubernetesControlPlane-prometheusRule.yaml | 2 +- charms/worker/k8s/src/protocols.py | 2 +- charms/worker/k8s/src/reschedule.py | 2 +- charms/worker/k8s/src/snap.py | 2 +- charms/worker/k8s/src/token_distributor.py | 2 +- charms/worker/k8s/src/upgrade.py | 2 +- charms/worker/k8s/templates/cos_roles.yaml | 2 +- charms/worker/k8s/templates/ksm.yaml | 2 +- charms/worker/k8s/templates/snap_installation.yaml | 2 +- charms/worker/k8s/terraform/main.tf | 2 +- charms/worker/k8s/terraform/outputs.tf | 2 +- charms/worker/k8s/terraform/variables.tf | 2 +- charms/worker/k8s/terraform/versions.tf | 2 +- charms/worker/k8s/tests/unit/test_base.py | 2 +- charms/worker/k8s/tests/unit/test_cloud_integration.py | 2 +- charms/worker/k8s/tests/unit/test_config_options.py | 2 +- charms/worker/k8s/tests/unit/test_containerd.py | 2 +- charms/worker/k8s/tests/unit/test_inspector.py | 2 +- charms/worker/k8s/tests/unit/test_k8sd_api_manager.py | 2 +- charms/worker/k8s/tests/unit/test_reschedule.py | 2 +- charms/worker/k8s/tests/unit/test_snap.py | 2 +- charms/worker/k8s/tests/unit/test_token_distributor.py | 2 +- charms/worker/k8s/tests/unit/test_upgrade.py | 2 +- charms/worker/k8s/tox.ini | 2 +- charms/worker/terraform/main.tf | 2 +- charms/worker/terraform/outputs.tf | 2 +- charms/worker/terraform/variables.tf | 2 +- charms/worker/terraform/versions.tf | 2 +- generate-src-docs.sh | 2 +- tests/integration/__init__.py | 2 +- tests/integration/conftest.py | 2 +- tests/integration/cos_substrate.py | 2 +- tests/integration/data/cos-offers-overlay.yaml | 2 +- tests/integration/data/k8s.profile | 2 +- tests/integration/data/microk8s.profile | 2 +- tests/integration/data/static-proxy-config.yaml | 2 +- tests/integration/data/test-bundle-ceph.yaml | 2 +- tests/integration/data/test-bundle-etcd.yaml | 2 +- tests/integration/data/test-bundle.yaml | 2 +- tests/integration/data/test_ceph/ceph-xfs-pvc.yaml | 2 +- tests/integration/data/test_ceph/pv-reader-pod.yaml | 2 +- tests/integration/data/test_ceph/pv-writer-pod.yaml | 2 +- tests/integration/grafana.py | 2 +- tests/integration/helpers.py | 2 +- tests/integration/prometheus.py | 2 +- tests/integration/test_ceph.py | 2 +- tests/integration/test_etcd.py | 2 +- tests/integration/test_k8s.py | 2 +- tests/integration/test_upgrade.py | 2 +- tox.ini | 2 +- 73 files changed, 75 insertions(+), 75 deletions(-) diff --git a/.github/workflows/download-charm.yaml b/.github/workflows/download-charm.yaml index 03fc35b5..f66cdec5 100644 --- 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/update-snap-revision.py b/.github/workflows/update-snap-revision.py index 329bddde..094c4ad6 100644 --- 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 index 05121671..d73987b4 100644 --- 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 index c4a371b8..4b8b005b 100644 --- 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 index b73516e0..ef688494 100644 --- 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 index e54a426f..d51df5f9 100755 --- 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}" \ No newline at end of file +touch "${1}" diff --git a/charms/worker/k8s/charmcraft.yaml b/charms/worker/k8s/charmcraft.yaml index cf24b0bb..025316fa 100644 --- 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 index a57ca43a..96bb7e87 100644 --- 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 index 686a4332..8f33bfd8 100644 --- 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/scripts/rules-patches/core-alert-rules.patch b/charms/worker/k8s/scripts/rules-patches/core-alert-rules.patch index cefa225a..55aab6f3 100644 --- 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 index 36fb77a8..a03b5b1b 100644 --- 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 index 81e04eec..9e80e3c6 100644 --- 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 index 382c22de..25cf4cb1 100755 --- 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 index 87b1a5e4..d8a88ec9 100644 --- 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 index 0166a05e..9f433687 100644 --- 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 index 2f2fbb7c..8fa01127 100644 --- 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 index 4e78891e..2aeac513 100644 --- 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 index 4e051519..98bedc60 100644 --- 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 index 1a73b4de..83a0f405 100644 --- 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 index 02c8ea2f..9e47fa98 100644 --- 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 index 03ad8ce2..c3df30f1 100644 --- 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 index 94b98b79..007aa63b 100644 --- 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 index 17809b37..55638325 100644 --- 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 index b582e631..026e50ff 100644 --- 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 index 69d5a925..c0141e4c 100644 --- 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 index 3b0b2918..6d135b2e 100644 --- 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 index c1cbbe74..bc020fea 100644 --- 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 index d51d91bb..eb38c917 100644 --- 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 index f45ccb5b..4d3c46e3 100644 --- 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 index 4111191c..356dcc23 100644 --- 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 index 6fb4e9ac..3e676482 100644 --- 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 index 7a689219..890e8a12 100644 --- 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 index 30cb8187..fccc1f15 100644 --- 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 index f38d2d66..6c28c21c 100644 --- 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 index 4585b9a2..216fde31 100644 --- 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 index 269e8508..18aa8a09 100644 --- 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 index a0ee2daa..5c8e5cc3 100644 --- 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 index a8e53ec2..0c4ad6c6 100644 --- 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 index 58ca5c1c..25115b2c 100644 --- 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 index 07f126ed..2765fc61 100644 --- 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 index cb3c76eb..294a6804 100644 --- 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 index ea4ccd3f..31fd7ef0 100644 --- 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 index 752e1604..2c0194c9 100644 --- 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 index 9d0bb8a5..891aa1ae 100644 --- 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 index 2fbce2f9..b807f245 100644 --- 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 index ddb1631c..23f94506 100644 --- 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 index 1d95f71e..04050690 100644 --- 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 index 1e0ca267..eb061d89 100644 --- 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 index a4ce7759..244abc17 100644 --- 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 index d60a1c1f..4a6939d8 100644 --- 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 index 269e8508..18aa8a09 100644 --- 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 index d13066a1..4e96bc21 100644 --- 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 index e3979c0f..dddb292a 100644 --- 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 index 337ca5bb..d760dc86 100644 --- 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.""" diff --git a/tests/integration/cos_substrate.py b/tests/integration/cos_substrate.py index 8e99238b..d1e3b704 100644 --- a/tests/integration/cos_substrate.py +++ b/tests/integration/cos_substrate.py @@ -1,4 +1,4 @@ -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. """Aids in testing COS substrate on LXD.""" diff --git a/tests/integration/data/cos-offers-overlay.yaml b/tests/integration/data/cos-offers-overlay.yaml index 40b3a951..a61f4058 100644 --- a/tests/integration/data/cos-offers-overlay.yaml +++ b/tests/integration/data/cos-offers-overlay.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. applications: diff --git a/tests/integration/data/k8s.profile b/tests/integration/data/k8s.profile index 861f529e..c502aaf6 100644 --- a/tests/integration/data/k8s.profile +++ b/tests/integration/data/k8s.profile @@ -1,4 +1,4 @@ -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. description: "LXD profile for Canonical Kubernetes" config: diff --git a/tests/integration/data/microk8s.profile b/tests/integration/data/microk8s.profile index a20569aa..6ae6b477 100644 --- a/tests/integration/data/microk8s.profile +++ b/tests/integration/data/microk8s.profile @@ -1,4 +1,4 @@ -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. name: microk8s diff --git a/tests/integration/data/static-proxy-config.yaml b/tests/integration/data/static-proxy-config.yaml index 766f7ebb..a672617e 100644 --- a/tests/integration/data/static-proxy-config.yaml +++ b/tests/integration/data/static-proxy-config.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. juju-http-proxy: http://squid.internal:3128 diff --git a/tests/integration/data/test-bundle-ceph.yaml b/tests/integration/data/test-bundle-ceph.yaml index dc015b6f..c7338c41 100644 --- a/tests/integration/data/test-bundle-ceph.yaml +++ b/tests/integration/data/test-bundle-ceph.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. name: integration-test-ceph diff --git a/tests/integration/data/test-bundle-etcd.yaml b/tests/integration/data/test-bundle-etcd.yaml index 30c947b9..9bd99725 100644 --- a/tests/integration/data/test-bundle-etcd.yaml +++ b/tests/integration/data/test-bundle-etcd.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. name: integration-test-etcd diff --git a/tests/integration/data/test-bundle.yaml b/tests/integration/data/test-bundle.yaml index e35e10db..62d3f3db 100644 --- a/tests/integration/data/test-bundle.yaml +++ b/tests/integration/data/test-bundle.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. name: integration-test diff --git a/tests/integration/data/test_ceph/ceph-xfs-pvc.yaml b/tests/integration/data/test_ceph/ceph-xfs-pvc.yaml index ae5c5685..fbb74d30 100755 --- a/tests/integration/data/test_ceph/ceph-xfs-pvc.yaml +++ b/tests/integration/data/test_ceph/ceph-xfs-pvc.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. apiVersion: v1 diff --git a/tests/integration/data/test_ceph/pv-reader-pod.yaml b/tests/integration/data/test_ceph/pv-reader-pod.yaml index 9f75c946..4ab2a301 100755 --- a/tests/integration/data/test_ceph/pv-reader-pod.yaml +++ b/tests/integration/data/test_ceph/pv-reader-pod.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. apiVersion: v1 diff --git a/tests/integration/data/test_ceph/pv-writer-pod.yaml b/tests/integration/data/test_ceph/pv-writer-pod.yaml index 7b659add..5d843d0b 100755 --- a/tests/integration/data/test_ceph/pv-writer-pod.yaml +++ b/tests/integration/data/test_ceph/pv-writer-pod.yaml @@ -1,4 +1,4 @@ -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. apiVersion: v1 diff --git a/tests/integration/grafana.py b/tests/integration/grafana.py index 14c6f20c..f5673a4d 100644 --- a/tests/integration/grafana.py +++ b/tests/integration/grafana.py @@ -1,4 +1,4 @@ -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. """Aid for connecting to grafana instance.""" diff --git a/tests/integration/helpers.py b/tests/integration/helpers.py index 94ad2610..371e5688 100644 --- a/tests/integration/helpers.py +++ b/tests/integration/helpers.py @@ -1,4 +1,4 @@ -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. """Additions to tools missing from juju library.""" diff --git a/tests/integration/prometheus.py b/tests/integration/prometheus.py index 3d34134f..41b8f823 100644 --- a/tests/integration/prometheus.py +++ b/tests/integration/prometheus.py @@ -1,4 +1,4 @@ -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. """Aid for testing promtheus.""" diff --git a/tests/integration/test_ceph.py b/tests/integration/test_ceph.py index 02caa7a6..74d09729 100644 --- a/tests/integration/test_ceph.py +++ b/tests/integration/test_ceph.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. # pylint: disable=duplicate-code diff --git a/tests/integration/test_etcd.py b/tests/integration/test_etcd.py index 800af23a..554ee2b1 100644 --- a/tests/integration/test_etcd.py +++ b/tests/integration/test_etcd.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. """Integration tests.""" diff --git a/tests/integration/test_k8s.py b/tests/integration/test_k8s.py index f1b44880..3c99edd4 100644 --- a/tests/integration/test_k8s.py +++ b/tests/integration/test_k8s.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. """Integration tests.""" diff --git a/tests/integration/test_upgrade.py b/tests/integration/test_upgrade.py index 1850262f..a0907974 100644 --- a/tests/integration/test_upgrade.py +++ b/tests/integration/test_upgrade.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. """Upgrade Integration tests.""" diff --git a/tox.ini b/tox.ini index 283da91b..0621c291 100644 --- a/tox.ini +++ b/tox.ini @@ -1,4 +1,4 @@ -# Copyright 2024 Canonical Ltd. +# Copyright 2025 Canonical Ltd. # See LICENSE file for licensing details. [tox]