Merge pull request stolostron#373 from elgnay/update-addon-framework

lease compatible
zhiweiyin318 · Jun 21, 2021 · 54a2874 · 54a2874
2 parents 50e9843 + 1f073a0
commit 54a2874
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 23 deletions.
diff --git a/cmd/agent/agent.go b/cmd/agent/agent.go
@@ -160,7 +160,8 @@ func startManager(o *options.AgentOptions, ctx context.Context) {
 			componentNamespace)
 		go resourceCollector.Start(ctx)
 
-		leaseUpdater := lease.NewLeaseUpdater(managedClusterKubeClient, AddonName, componentNamespace)
+		leaseUpdater := lease.NewLeaseUpdater(managedClusterKubeClient, AddonName, componentNamespace).
+			WithHubLeaseConfig(hubConfig, o.ClusterName)
 		go leaseUpdater.Start(ctx)
 
 		// Add controller into manager

diff --git a/deploy/managedcluster/hub/install.sh b/deploy/managedcluster/hub/install.sh
@@ -31,7 +31,7 @@ fi
 for i in {1..7}; do
   echo "############$i  Checking cluster-manager-registration-controller"
   RUNNING_POD=$($KUBECTL -n open-cluster-management-hub get pods | grep cluster-manager-registration-controller | grep -c "Running")
-  if [ "${RUNNING_POD}" -eq 3 ]; then
+  if [ "${RUNNING_POD}" -ge 1 ]; then
     break
   fi
 
@@ -47,7 +47,7 @@ done
 for i in {1..7}; do
   echo "############$i  Checking cluster-manager-registration-webhook"
   RUNNING_POD=$($KUBECTL -n open-cluster-management-hub get pods | grep cluster-manager-registration-webhook | grep -c "Running")
-  if [ "${RUNNING_POD}" -eq 3 ]; then
+  if [ "${RUNNING_POD}" -ge 1 ]; then
     break
   fi
 

diff --git a/deploy/managedcluster/klusterlet/install.sh b/deploy/managedcluster/klusterlet/install.sh
@@ -22,6 +22,7 @@ cd registration-operator || {
 }
 
 echo "############  Deploying klusterlet"
+make cluster-ip
 make deploy-spoke
 if [ $? -ne 0 ]; then
  echo "############  Failed to deploy klusterlet"

diff --git a/go.mod b/go.mod
@@ -46,7 +46,7 @@ require (
 	github.com/metal3-io/baremetal-operator v0.0.0
 	github.com/onsi/ginkgo v1.15.0
 	github.com/onsi/gomega v1.10.5
-	github.com/open-cluster-management/addon-framework v0.0.0-20210423114544-8e08479e80b6
+	github.com/open-cluster-management/addon-framework v0.0.0-20210621074027-a81f712c10c2
 	github.com/open-cluster-management/api v0.0.0-20210409125704-06f2aec1a73f
 	github.com/openshift/api v3.9.1-0.20191111211345-a27ff30ebf09+incompatible
 	github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359

diff --git a/go.sum b/go.sum
@@ -1345,8 +1345,8 @@ github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
 github.com/onsi/gomega v1.10.5 h1:7n6FEkpFmfCoo2t+YYqXH0evK+a9ICQz0xcAy9dYcaQ=
 github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
-github.com/open-cluster-management/addon-framework v0.0.0-20210423114544-8e08479e80b6 h1:J8cd1JyscCgVRxPKRiT3wh2um91XBJguqSaX9vE7kJI=
-github.com/open-cluster-management/addon-framework v0.0.0-20210423114544-8e08479e80b6/go.mod h1:mcpd6pc0j/L+WLFwV2MXHVMr+86ri2iUdTK2M8RHJ7U=
+github.com/open-cluster-management/addon-framework v0.0.0-20210621074027-a81f712c10c2 h1:oHFveB+YtcfOF6zSTkGjgSWEHHkQUkwit7enNj5RRsI=
+github.com/open-cluster-management/addon-framework v0.0.0-20210621074027-a81f712c10c2/go.mod h1:mcpd6pc0j/L+WLFwV2MXHVMr+86ri2iUdTK2M8RHJ7U=
 github.com/open-cluster-management/api v0.0.0-20210409125704-06f2aec1a73f h1:s6z3k0jV0ccoYDPJWMSqVNevO1UoQLYb8f7dYFALSNk=
 github.com/open-cluster-management/api v0.0.0-20210409125704-06f2aec1a73f/go.mod h1:ot+A1DWq+v1IV+e1S7nhIteYAmNByFgtazvzpoeAfRQ=
 github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=

diff --git a/vendor/github.com/open-cluster-management/addon-framework/pkg/lease/lease_controller.go b/vendor/github.com/open-cluster-management/addon-framework/pkg/lease/lease_controller.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -205,7 +205,7 @@ github.com/onsi/gomega/matchers/support/goraph/edge
 github.com/onsi/gomega/matchers/support/goraph/node
 github.com/onsi/gomega/matchers/support/goraph/util
 github.com/onsi/gomega/types
-# github.com/open-cluster-management/addon-framework v0.0.0-20210423114544-8e08479e80b6
+# github.com/open-cluster-management/addon-framework v0.0.0-20210621074027-a81f712c10c2
 ## explicit
 github.com/open-cluster-management/addon-framework/pkg/lease
 # github.com/open-cluster-management/api v0.0.0-20210409125704-06f2aec1a73f