Skip to content

[release-1.13] Set cluster name label for pre-existing kubeconfig #4847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[release-1.13] Set cluster name label for pre-existing kubeconfig #4847

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions controllers/azuremanagedcontrolplane_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"sigs.k8s.io/cluster-api-provider-azure/azure/services/subnets"
"sigs.k8s.io/cluster-api-provider-azure/azure/services/virtualnetworks"
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
"sigs.k8s.io/cluster-api/util/secret"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
Expand Down Expand Up @@ -135,6 +136,15 @@ func (r *azureManagedControlPlaneService) reconcileKubeconfig(ctx context.Contex
kubeConfigSecret.Data = map[string][]byte{
secret.KubeconfigDataName: kubeConfigData,
}

// When upgrading from an older version of CAPI, the kubeconfig secret may not have the required
// cluster name label. Add it here to avoid kubeconfig issues during upgrades.
if _, ok := kubeConfigSecret.Labels[clusterv1.ClusterNameLabel]; !ok {
if kubeConfigSecret.Labels == nil {
kubeConfigSecret.Labels = make(map[string]string)
}
kubeConfigSecret.Labels[clusterv1.ClusterNameLabel] = r.scope.ClusterName()
}
return nil
}); err != nil {
return errors.Wrap(err, "failed to reconcile kubeconfig secret for cluster")
Expand Down