Merge ~sbparke/juju-lint:bug/1940546 into juju-lint:master

[Steven Parker]

Added operations/kubernetes mandatory charms and optional charms for k8s

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

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

[Drew Freiberger (afreiberger)]

Please fix unit tests like this:

https://pastebin.canonical.com/p/4qFCWm69jM/

review: Needs Fixing

[Drew Freiberger (afreiberger)]

Thanks, tests pass, checks work. Further bugs already exist for checks that may be missing.

Sample output from live k8s env:
https://pastebin.canonical.com/p/cFTyGGNYtK/

review: Approve

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

Change successfully merged at revision b4f4cd742ecba4454c36ca2274c62c672ae8d93c

diff --git a/contrib/canonical-rules.yaml b/contrib/canonical-rules.yaml
index d109037..fcdfdaa 100644
--- a/contrib/canonical-rules.yaml
+++ b/contrib/canonical-rules.yaml
@@ -91,6 +91,23 @@ subordinates:
  logrotated:
   where: all
 
+kubernetes mandatory: &kubernetes-mandatory-charms
+ - containerd
+ - kubeapi-load-balancer
+ - kubernetes-master
+ - kubernetes-worker
+
+kubernetes optional charms: &kubernetes-optional-charms
+ - calico
+ - canal
+ - coredns
+ - easyrsa
+ - etcd
+ - flannel
+ - kubernetes-dashboard
+ - openstack-integrator
+ - vsphere-integrator
+
 operations mandatory: &operations-mandatory-charms
  - elasticsearch
  - grafana
@@ -110,6 +127,9 @@ operations openstack mandatory: &operations-openstack-mandatory-charms
  - prometheus-ceph-exporter
  - prometheus-grok-exporter
 
+operations kubernetes mandatory: &operations-kubernetes-mandatory-charms
+ - kubernetes-service-checks
+
 operations mandatory dependencies: &operations-mandatory-deps
  - postgresql
 
@@ -135,6 +155,7 @@ operations optional subordinates: &operations-optional-subs
  - rsyslog-forwarder-ha
 
 operations charms: &operations-charms
+ - *operations-kubernetes-mandatory-charms
  - *operations-mandatory-charms
  - *operations-mandatory-deps
  - *operations-mandatory-subs
@@ -222,7 +243,12 @@ openstack charms: &openstack-charms
  - *masakari-charms
  - *trilio-charms
 
+kubernetes charms: &kubernetes-charms
+ - *kubernetes-mandatory-charms
+ - *kubernetes-optional-charms
+
 known charms:
  - ubuntu
  - *openstack-charms
  - *operations-charms
+ - *kubernetes-charms
diff --git a/jujulint/lint.py b/jujulint/lint.py
index 4e2f70a..a8ae702 100755
--- a/jujulint/lint.py
+++ b/jujulint/lint.py
@@ -719,6 +719,27 @@ class Linter:
                             "message": "Kubernetes charm '{}' is missing".format(charm),
                         }
                     )
+            for charm in self.lint_rules["operations kubernetes mandatory"]:
+                if charm not in self.model.charms:
+                    self.handle_error(
+                        {
+                            "id": "kubernetes-ops-charm-missing",
+                            "tags": [
+                                "missing",
+                                "openstack",
+                                "ops",
+                                "charm",
+                                "mandatory",
+                                "principal",
+                            ],
+                            "description": "An Kubernetes ops charm is missing",
+                            "charm": charm,
+                            "message": "Kubernetes ops charm '{}' is missing".format(
+                                charm
+                            ),
+                        }
+                    )
+
 
     def results(self):
         """Provide results of the linting process."""
diff --git a/tests/test_jujulint.py b/tests/test_jujulint.py
index 7dacb7d..35c4bbe 100644
--- a/tests/test_jujulint.py
+++ b/tests/test_jujulint.py
@@ -242,10 +242,11 @@ class TestLinter:
         assert errors[0]["id"] == "openstack-ops-charm-missing"
         assert errors[0]["charm"] == "openstack-service-checks"
 
-    def test_openstack_charm_missing(self, linter, juju_status):
+    def test_kubernetes_charm_missing(self, linter, juju_status):
         """Test that missing kubernetes mandatory charms are detected."""
         linter.cloud_type = "kubernetes"
         linter.lint_rules["kubernetes mandatory"] = ["kubernetes-master"]
+        linter.lint_rules["operations kubernetes mandatory"] = []
         linter.do_lint(juju_status)
 
         errors = linter.output_collector["errors"]
@@ -253,6 +254,18 @@ class TestLinter:
         assert errors[0]["id"] == "kubernetes-charm-missing"
         assert errors[0]["charm"] == "kubernetes-master"
 
+    def test_kubernetes_ops_charm_missing(self, linter, juju_status):
+        """Test that missing kubernetes mandatory charms are detected."""
+        linter.cloud_type = "kubernetes"
+        linter.lint_rules["kubernetes mandatory"] = []
+        linter.lint_rules["operations kubernetes mandatory"] = ["ntp"]
+        linter.do_lint(juju_status)
+
+        errors = linter.output_collector["errors"]
+        assert len(errors) == 1
+        assert errors[0]["id"] == "kubernetes-ops-charm-missing"
+        assert errors[0]["charm"] == "ntp"
+
     def test_config_eq(self, linter, juju_status):
         """Test the config condition 'eq'."""
         linter.lint_rules["config"] = {"ubuntu": {"fake-opt": {"eq": False}}}