Merge ~gabrielcocenza/juju-lint:bug/1967325 into juju-lint:master

[Gabriel Cocenza]

fix k8s rules

- add additional import for k8s dependencies for
  operations-openstack-mandatory-series
- changed from kubernetes-master to kubernetes-control-plane

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

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

[Alvaro Uria (aluria)]

+1 from me.

review: Approve

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

Change successfully merged at revision 6e6ba3cb4283fdf5477f70ec3bb0631017787838

diff --git a/contrib/canonical-rules.yaml b/contrib/canonical-rules.yaml
index 9056390..8abd854 100644
--- a/contrib/canonical-rules.yaml
+++ b/contrib/canonical-rules.yaml
@@ -1,7 +1,7 @@
 ---
 # legacy rules file, there are also more specific configurations available
 kubernetes config:
- kubernetes-master:
+ kubernetes-control-plane:
   authorization-mode:
    eq: "RBAC,Node"
  canal:
@@ -97,7 +97,7 @@ subordinates:
 kubernetes mandatory: &kubernetes-mandatory-charms
  - containerd
  - kubeapi-load-balancer
- - kubernetes-master
+ - kubernetes-control-plane
  - kubernetes-worker
 
 kubernetes optional charms: &kubernetes-optional-charms
diff --git a/contrib/includes/kubernetes.yaml b/contrib/includes/kubernetes.yaml
index 02d5fa0..2ade8ed 100644
--- a/contrib/includes/kubernetes.yaml
+++ b/contrib/includes/kubernetes.yaml
@@ -1,5 +1,5 @@
 kubernetes config:
- kubernetes-master:
+ kubernetes-control-plane:
   authorization-mode:
    eq: "RBAC,Node"
  canal:
@@ -9,7 +9,7 @@ kubernetes config:
 kubernetes mandatory: &kubernetes-mandatory-charms
  - containerd
  - kubeapi-load-balancer
- - kubernetes-master
+ - kubernetes-control-plane
  - kubernetes-worker
 
 kubernetes optional charms: &kubernetes-optional-charms
diff --git a/contrib/kubernetes.yaml b/contrib/kubernetes.yaml
index c7460b1..27eeba6 100644
--- a/contrib/kubernetes.yaml
+++ b/contrib/kubernetes.yaml
@@ -1,5 +1,6 @@
 ---
 !include includes/base.yaml
+!include includes/operations/focal.yaml
 !include includes/operations.yaml
 !include includes/kubernetes.yaml
 !include includes/saas.yaml
diff --git a/tests/test_jujulint.py b/tests/test_jujulint.py
index 1ec6cdf..c4c51f3 100644
--- a/tests/test_jujulint.py
+++ b/tests/test_jujulint.py
@@ -437,14 +437,14 @@ applications:
     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["kubernetes mandatory"] = ["kubernetes-control-plane"]
         linter.lint_rules["operations kubernetes mandatory"] = []
         linter.do_lint(juju_status)
 
         errors = linter.output_collector["errors"]
         assert len(errors) == 1
         assert errors[0]["id"] == "kubernetes-charm-missing"
-        assert errors[0]["charm"] == "kubernetes-master"
+        assert errors[0]["charm"] == "kubernetes-control-plane"
 
     def test_kubernetes_ops_charm_missing(self, linter, juju_status):
         """Test that missing kubernetes mandatory charms are detected."""