Merge ~jsimpso/autocert-kubernetes-relay-charm:main into autocert-kubernetes-relay-charm:main

Proposed by James Simpson
Status: Merged
Approved by: 🤖 Canonical IS Review Bot
Approved revision: d7c0a68a21f8658a44c6e6ea87ec6cb10a7e9ba0
Merged at revision: 5ab32587b246b4271b222f1db11092b31925d32c
Proposed branch: ~jsimpso/autocert-kubernetes-relay-charm:main
Merge into: autocert-kubernetes-relay-charm:main
Diff against target: 31 lines (+2/-4)
1 file modified
src/charm.py (+2/-4)
Reviewer Review Type Date Requested Status
🤖 Canonical IS Review Bot Approve
Review via email: mp+447607@code.launchpad.net

Commit message

kubeconfig should belong to root, for autocert cron

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Review Bot (canonical-is-reviewbot) wrote :

Proxy approval for barryprice

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 5ab32587b246b4271b222f1db11092b31925d32c

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/charm.py b/src/charm.py
2index b3d8e12..0d4c541 100755
3--- a/src/charm.py
4+++ b/src/charm.py
5@@ -59,8 +59,6 @@ class AutocertKubernetesRelayCharm(ops.CharmBase):
6 self.unit.status = ops.model.MaintenanceStatus("Configuring charm")
7 if not self.kubeconfig_dir.is_dir():
8 self.kubeconfig_dir.mkdir()
9- if not self.kubeconfig_dir.owner() == "ubuntu":
10- shutil.chown(self.kubeconfig_dir, user="ubuntu", group="ubuntu")
11 if not self._config_is_valid():
12 return
13 self._refresh_kubectl_snap()
14@@ -122,7 +120,7 @@ class AutocertKubernetesRelayCharm(ops.CharmBase):
15 @property
16 def kubeconfig_file(self) -> Path:
17 """Kube config file."""
18- return Path("/home/ubuntu/.kube/config")
19+ return Path("/root/.kube/config")
20
21 @property
22 def kubeconfig_content(self) -> str:
23@@ -139,7 +137,7 @@ class AutocertKubernetesRelayCharm(ops.CharmBase):
24 @property
25 def kubeconfig_dir(self) -> Path:
26 """Kubeconfig directory."""
27- return Path("/home/ubuntu/.kube")
28+ return Path("/root/.kube")
29
30
31 if __name__ == "__main__": # pragma: nocover

Subscribers

People subscribed via source and target branches