Merge pull request #37 from vmware-samples/topic/xudongl/fix-using-av…

…i-as-control-plane-ha Fix avi as control plane ha bootstrap cluster error
vmware-tanzu · Nov 8, 2021 · f155db1 · f155db1
2 parents 1457a10 + 6b736f7
commit f155db1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/haprovider/haprovider.go b/pkg/haprovider/haprovider.go
@@ -134,11 +134,16 @@ func (r *HAProvider) annotateService(ctx context.Context, cluster *clusterv1.Clu
 		akoov1alpha1.TKGClusterNameSpaceLabel: cluster.Namespace,
 	}
 
+	if ako_operator.IsBootStrapCluster() {
+		return serviceAnnotation, nil
+	}
+
 	aviInfraSetting, err := r.getAviInfraSettingFromCluster(ctx, cluster)
 	if err != nil {
 		return serviceAnnotation, err
 	}
-	if aviInfraSetting != nil && !ako_operator.IsBootStrapCluster() {
+
+	if aviInfraSetting != nil {
 		// add AVIInfraSetting annotation when creating HA svc
 		serviceAnnotation[akoov1alpha1.HAAVIInfraSettingAnnotationsKey] = aviInfraSetting.Name
 	}