uninstall: remove cilium-config-agent role/rolebinding

This commit adds the removal of the cilium-config-agent role and rolebinding (introduced in cilium/cilium#22656) during the uninstallation process, to ensure that the status of the cluster is properly restored. Signed-off-by: Marco Iorio <[email protected]>
cilium · Feb 10, 2023 · a8bd8f1 · a8bd8f1
1 parent 44acf5a
commit a8bd8f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/defaults/defaults.go b/defaults/defaults.go
@@ -10,6 +10,7 @@ const (
 	AgentServiceAccountName = "cilium"
 	AgentClusterRoleName    = "cilium"
 	AgentSecretsRoleName    = "cilium-secrets"
+	AgentConfigRoleName     = "cilium-config-agent"
 	AgentDaemonSetName      = "cilium"
 	AgentPodSelector        = "k8s-app=cilium"
 	AgentResourceQuota      = "cilium-resource-quota"

diff --git a/install/uninstall.go b/install/uninstall.go
@@ -56,6 +56,9 @@ func (k *K8sUninstaller) Uninstall(ctx context.Context) error {
 	k.client.DeleteServiceAccount(ctx, k.params.Namespace, defaults.OperatorServiceAccountName, metav1.DeleteOptions{})
 	k.Log("🔥 Deleting ConfigMap...")
 	k.client.DeleteConfigMap(ctx, k.params.Namespace, defaults.ConfigMapName, metav1.DeleteOptions{})
+	k.Log("🔥 Deleting Roles...")
+	k.client.DeleteRole(ctx, k.params.Namespace, defaults.AgentConfigRoleName, metav1.DeleteOptions{})
+	k.client.DeleteRoleBinding(ctx, k.params.Namespace, defaults.AgentConfigRoleName, metav1.DeleteOptions{})
 	k.Log("🔥 Deleting Cluster roles...")
 	k.client.DeleteClusterRole(ctx, defaults.AgentClusterRoleName, metav1.DeleteOptions{})
 	k.client.DeleteClusterRoleBinding(ctx, defaults.AgentClusterRoleName, metav1.DeleteOptions{})