starlingx/update
Code Issues Proposed changes

Merge "Adjust k8s symlink remove hook to run only in controllers"

Browse Source
This commit is contained in:
Zuul
2024-08-28 20:53:22 +00:00
committed by Gerrit Code Review
parent 0c35e8f2f2 5286850d7f
commit eedcb377fd
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
software/software/agent_hooks.py
View File

@@ -188,12 +188,15 @@ class RemoveKubernetesConfigSymlinkHook(BaseHook):
K8S_ENCRYPTION_PROVIDER_FILE = "/etc/kubernetes/encryption-provider.yaml"
def run(self):
try:
os.unlink(self.K8S_ENCRYPTION_PROVIDER_FILE)
LOG.info("%s symlink removed" % self.K8S_ENCRYPTION_PROVIDER_FILE)
except Exception as e:
LOG.exception("Failed to remove symlink: %s" % str(e))
raise
nodetype = utils.get_platform_conf("nodetype")
if nodetype == constants.CONTROLLER:
try:
if os.path.exists(self.K8S_ENCRYPTION_PROVIDER_FILE):
os.unlink(self.K8S_ENCRYPTION_PROVIDER_FILE)
LOG.info("%s symlink removed" % self.K8S_ENCRYPTION_PROVIDER_FILE)
except Exception as e:
LOG.exception("Failed to remove symlink: %s" % str(e))
raise
class RemoveCephMonHook(BaseHook):