diff --git a/Makefile b/Makefile index 59b7c94a..8f6ab249 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ PUBLISH?=publish BUILD_VERSION ?= $(shell git describe --always --match "v*" | sed 's/v//') # TKG Version -TKG_VERSION ?= v1.9.0+vmware.1 +TKG_VERSION ?= v1.8.0+vmware.1 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) diff --git a/pkg/haprovider/haprovider.go b/pkg/haprovider/haprovider.go index 631273dc..80182672 100644 --- a/pkg/haprovider/haprovider.go +++ b/pkg/haprovider/haprovider.go @@ -163,10 +163,6 @@ func (r *HAProvider) annotateService(ctx context.Context, cluster *clusterv1.Clu } //no adc is selected for cluster, no annotation is needed. if adcForCluster == nil { - // for the management cluster, it needs to requeue until the install-ako-for-management-cluster AKODeploymentConfig created - if _, ok := cluster.Labels[akoov1alpha1.TKGManagememtClusterRoleLabel]; ok { - return serviceAnnotation, errors.New("management cluster's AKODeploymentConfig didn't find, requeue to wait for AKODeploymentConfig created") - } return serviceAnnotation, nil }