Add region param during assign/unassign

Signed-off-by: Harsh Thakur <[email protected]>
civo · Jul 15, 2022 · 3402db4 · 3402db4
1 parent 92d9fcb
commit 3402db4
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 10 deletions.
diff --git a/cloud-controller-manager/civo/loadbalancer.go b/cloud-controller-manager/civo/loadbalancer.go
@@ -155,7 +155,7 @@ func (l *loadbalancer) updateLBConfig(civolb *civogo.LoadBalancer, service *v1.S
 
 		// this is so that we don't try to reassign the reserved IP to the loadbalancer
 		if rip.AssignedTo.ID != civolb.ID {
-			_, err = l.client.civoClient.AssignIP(rip.ID, civolb.ID, "loadbalancer")
+			_, err = l.client.civoClient.AssignIP(rip.ID, civolb.ID, "loadbalancer", Region)
 			if err != nil {
 				klog.Errorf("Unable to assign reserved IP, error: %v", err)
 				return nil, err
@@ -169,7 +169,7 @@ func (l *loadbalancer) updateLBConfig(civolb *civogo.LoadBalancer, service *v1.S
 		}
 
 		if ip != nil {
-			_, err = l.client.civoClient.UnassignIP(ip.ID)
+			_, err = l.client.civoClient.UnassignIP(ip.ID, Region)
 			if err != nil {
 				klog.Errorf("Unable to unassign IP, error: %v", err)
 				return nil, err

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/civo/civo-cloud-controller-manager
 go 1.16
 
 require (
-	github.com/civo/civogo v0.2.93
+	github.com/civo/civogo v0.2.96
 	github.com/emicklei/go-restful v2.11.1+incompatible // indirect
 	github.com/go-openapi/swag v0.19.7 // indirect
 	github.com/google/go-cmp v0.5.6 // indirect

diff --git a/go.sum b/go.sum
@@ -69,6 +69,8 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
 github.com/civo/civogo v0.2.93 h1:HE6p5K9yJ9+I1IlK70aMHHoBRn6VkmMQSnUAPPM+KOo=
 github.com/civo/civogo v0.2.93/go.mod h1:7+GeeFwc4AYTULaEshpT2vIcl3Qq8HPoxA17viX3l6g=
+github.com/civo/civogo v0.2.96 h1:GHaJ5PRH98psA4eBgQQxBGPp5OnWblbGWvL5S1vV1Gc=
+github.com/civo/civogo v0.2.96/go.mod h1:7+GeeFwc4AYTULaEshpT2vIcl3Qq8HPoxA17viX3l6g=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr7kxeODyLWsRMC+OD03aFUH+mW6r2d+MWa5Y=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8=

diff --git a/vendor/github.com/civo/civogo/fake_client.go b/vendor/github.com/civo/civogo/fake_client.go
diff --git a/vendor/github.com/civo/civogo/instance.go b/vendor/github.com/civo/civogo/instance.go
diff --git a/vendor/github.com/civo/civogo/ip.go b/vendor/github.com/civo/civogo/ip.go
diff --git a/vendor/github.com/civo/civogo/loadbalancer.go b/vendor/github.com/civo/civogo/loadbalancer.go
diff --git a/vendor/github.com/civo/civogo/network.go b/vendor/github.com/civo/civogo/network.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -13,7 +13,7 @@ github.com/beorn7/perks/quantile
 github.com/blang/semver
 # github.com/cespare/xxhash/v2 v2.1.1
 github.com/cespare/xxhash/v2
-# github.com/civo/civogo v0.2.93
+# github.com/civo/civogo v0.2.96
 ## explicit
 github.com/civo/civogo
 github.com/civo/civogo/utils