Merge ~sudeephb/charm-kubernetes-service-checks:release/2210 into charm-kubernetes-service-checks:master

[Sudeep Bhandari]

Added jammy support

Unit tests run: https://pastebin.ubuntu.com/p/CzpTYhXFcR/
Lint tests run: https://pastebin.ubuntu.com/p/3V7qW2zkcz/
Functional tests run: https://pastebin.ubuntu.com/p/zyc8kbPBsH/

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Eric Chen (eric-chen)]

some inline comment

review: Needs Information

[Eric Chen (eric-chen)]

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision dd278b8b7c7145776e85abef2bca7a39f46d8523

diff --git a/charmcraft.yaml b/charmcraft.yaml
index f0b71dd..900390b 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -7,10 +7,14 @@ parts:
 bases:
     - build-on:
         - name: ubuntu
-          channel: "20.04"
+          channel: "22.04"
           architectures: ["amd64"]
       run-on:
         - name: ubuntu
+          channel: "22.04"
+          architectures:
+              - amd64
+        - name: ubuntu
           channel: "20.04"
           architectures:
               - amd64
diff --git a/metadata.yaml b/metadata.yaml
index ec0b730..714a4c8 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -10,6 +10,7 @@ tags:
     - ops
     - monitoring
 series:
+    - jammy
     - focal
     - bionic
 requires:
diff --git a/tests/functional/tests/bundles/base.yaml b/tests/functional/tests/bundles/base.yaml
index 4061cc7..785ae42 100644
--- a/tests/functional/tests/bundles/base.yaml
+++ b/tests/functional/tests/bundles/base.yaml
@@ -2,62 +2,31 @@ applications:
     kubernetes-service-checks:
         num_units: 1
     containerd:
-        charm: cs:~containers/containerd
+        charm: ch:containers-containerd
         options:
             gpu_driver: none
         resources: {}
     easyrsa:
-        charm: cs:~containers/easyrsa
+        charm: ch:containers-easyrsa
         num_units: 1
-        resources:
-          easyrsa: 5
     etcd:
-        charm: cs:~containers/etcd
+        charm: ch:etcd
         num_units: 1
-        options:
-          channel: 3.3/stable
-        resources:
-          core: 0
-          etcd: 3
-          snapshot: 0
     flannel:
-        charm: cs:~containers/flannel
-        resources:
-          flannel-amd64: 625
-          flannel-arm64: 622
-          flannel-s390x: 609
+        charm: ch:containers-flannel
     kubernetes-master:
-        charm: cs:~containers/kubernetes-master
+        charm: ch:kubernetes-control-plane
         num_units: 1
         constraints: cores=4 mem=4G root-disk=16G
-        options:
-          channel: 1.18/stable
-        resources:
-          cdk-addons: 0
-          core: 0
-          kube-apiserver: 0
-          kube-controller-manager: 0
-          kube-proxy: 0
-          kube-scheduler: 0
-          kubectl: 0
     kubernetes-worker:
-        charm: cs:~containers/kubernetes-worker
+        charm: ch:containers-kubernetes-worker
         expose: true
         num_units: 3
         constraints: cores=4 mem=4G root-disk=16G
         options:
-            channel: 1.18/stable
             kubelet-extra-config: '{protectKernelDefaults: false}'
-        resources:
-          cni-amd64: 645
-          cni-arm64: 636
-          cni-s390x: 648
-          core: 0
-          kube-proxy: 0
-          kubectl: 0
-          kubelet: 0
     nrpe:
-        charm: cs:nrpe
+        charm: ch:nrpe
 relations:
     - - kubernetes-master:kube-api-endpoint
       - kubernetes-worker:kube-api-endpoint
diff --git a/tests/functional/tests/bundles/jammy.yaml b/tests/functional/tests/bundles/jammy.yaml
new file mode 100644
index 0000000..64a2617
--- /dev/null
+++ b/tests/functional/tests/bundles/jammy.yaml
@@ -0,0 +1,65 @@
+# Note(sudeephb): The charms which are not supported in jammy, or 
+# cause errors on other related charms are deployed in focal
+applications:
+    kubernetes-service-checks:
+        num_units: 1
+    containerd:
+        charm: ch:containers-containerd
+        series: focal
+        options:
+            gpu_driver: none
+        resources: {}
+    easyrsa:
+        charm: ch:containers-easyrsa
+        num_units: 1
+        series: focal
+    etcd:
+        charm: ch:etcd
+        num_units: 1
+    flannel:
+        charm: ch:containers-flannel
+        series: focal
+    kubernetes-master:
+        charm: ch:kubernetes-control-plane
+        num_units: 1
+        constraints: cores=4 mem=4G root-disk=16G
+        series: focal
+    kubernetes-worker:
+        charm: ch:kubernetes-worker
+        expose: true
+        num_units: 3
+        constraints: cores=4 mem=4G root-disk=16G
+        series: focal
+        options:
+            kubelet-extra-config: '{protectKernelDefaults: false}'
+    nrpe:
+        charm: ch:nrpe
+relations:
+    - - kubernetes-master:kube-api-endpoint
+      - kubernetes-worker:kube-api-endpoint
+    - - kubernetes-service-checks:nrpe-external-master
+      - nrpe:nrpe-external-master
+    - - kubernetes-master:kube-control
+      - kubernetes-worker:kube-control
+    - - kubernetes-master:certificates
+      - easyrsa:client
+    - - etcd:certificates
+      - easyrsa:client
+    - - kubernetes-master:etcd
+      - etcd:db
+    - - kubernetes-worker:certificates
+      - easyrsa:client
+    - - flannel:etcd
+      - etcd:db
+    - - flannel:cni
+      - kubernetes-master:cni
+    - - flannel:cni
+      - kubernetes-worker:cni
+    - - containerd:containerd
+      - kubernetes-worker:container-runtime
+    - - containerd:containerd
+      - kubernetes-master:container-runtime
+    - - kubernetes-service-checks:kube-control
+      - kubernetes-master:kube-control
+    - - kubernetes-service-checks:kube-api-endpoint
+      - kubernetes-master:kube-api-endpoint
diff --git a/tests/functional/tests/bundles/overlays/jammy.yaml.j2 b/tests/functional/tests/bundles/overlays/jammy.yaml.j2
new file mode 100644
index 0000000..bc860fa
--- /dev/null
+++ b/tests/functional/tests/bundles/overlays/jammy.yaml.j2
@@ -0,0 +1 @@
+series: jammy
diff --git a/tests/functional/tests/tests.yaml b/tests/functional/tests/tests.yaml
index 1abf43c..f1fea00 100644
--- a/tests/functional/tests/tests.yaml
+++ b/tests/functional/tests/tests.yaml
@@ -8,7 +8,7 @@ target_deploy_status:
         workload-status-message: "missing kube-api-endpoint relation"
     kubernetes-master:
         workload-status: active
-        workload-status-message: "Kubernetes master running."
+        workload-status-message: "Kubernetes control-plane running."
     kubernetes-worker:
         workload-status: active
         workload-status-message: "Kubernetes worker running."
@@ -28,7 +28,8 @@ target_deploy_status:
         workload-status: blocked
         workload-status-message: Nagios server not configured or related
 gate_bundles:
-    - bionic
+    - jammy
     - focal
+    - bionic
 smoke_bundles:
     - focal