Skip to content

Commit ad720fa

Browse files
revert 1.9.0 changes on 1.8.0 branch (#140)
* revert 1.9.0 changes Signed-off-by: Xudong Liu <[email protected]> * Revert "fix management cluster endpoint vip provision race condition (#139)" This reverts commit 3774b4e. --------- Signed-off-by: Xudong Liu <[email protected]>
1 parent 3774b4e commit ad720fa

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ PUBLISH?=publish
1313
BUILD_VERSION ?= $(shell git describe --always --match "v*" | sed 's/v//')
1414

1515
# TKG Version
16-
TKG_VERSION ?= v1.9.0+vmware.1
16+
TKG_VERSION ?= v1.8.0+vmware.1
1717

1818
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
1919
ifeq (,$(shell go env GOBIN))

pkg/haprovider/haprovider.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,6 @@ func (r *HAProvider) annotateService(ctx context.Context, cluster *clusterv1.Clu
163163
}
164164
//no adc is selected for cluster, no annotation is needed.
165165
if adcForCluster == nil {
166-
// for the management cluster, it needs to requeue until the install-ako-for-management-cluster AKODeploymentConfig created
167-
if _, ok := cluster.Labels[akoov1alpha1.TKGManagememtClusterRoleLabel]; ok {
168-
return serviceAnnotation, errors.New("management cluster's AKODeploymentConfig didn't find, requeue to wait for AKODeploymentConfig created")
169-
}
170166
return serviceAnnotation, nil
171167
}
172168

0 commit comments

Comments
 (0)