Skip to content

Commit

Permalink
clustermesh: reset remote clusters configuration upon disconnection
Browse files Browse the repository at this point in the history
cilium/cilium#28763 decoupled the helm settings to enable the
clustermesh-apiserver and provide the list of clusters to connect to.
Let's reflect this change to the 'cilium clustermesh disable' command
as well, explicitly disabling and resetting the remote clusters configs
when invoked, to correctly disconnect from possible leftover clusters.

Fixes: cilium/cilium#32300
Signed-off-by: Marco Iorio <marco.iorio@isovalent.com>
  • Loading branch information
giorio94 authored and michi-covalent committed May 15, 2024
1 parent 955adb5 commit b148800
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions clustermesh/clustermesh.go
Original file line number Diff line number Diff line change
Expand Up @@ -1521,6 +1521,8 @@ func EnableWithHelm(ctx context.Context, k8sClient *k8s.Client, params Parameter
func DisableWithHelm(ctx context.Context, k8sClient *k8s.Client, params Parameters) error {
helmStrValues := []string{
"clustermesh.useAPIServer=false",
"clustermesh.config.enabled=false",
"clustermesh.config.clusters=null",
"externalWorkloads.enabled=false",
}
vals, err := helm.ParseVals(helmStrValues)
Expand Down

0 comments on commit b148800

Please sign in to comment.