Consume updated common-core to fix issues around ip spaces (#651)

Recently two bugs related to ip-spaces were fixed in CPI (common core). viz. * CPI not supporting data center group org vdc networks for ip space related operations * CPI erroring out while processing org vdc networks that have more than one uplink Fix for both bugs were committed to common-core. This PR updates the version of common-core consumed by CAPVCD, to get the fixes. Testing Done: Setup a CSE testbed where the following VCD objects were present * A data center group org vdc network * An Ip Space that is powering the org vdc network * An external network connected to the same org vdc network * Built CPI and CAPVCD images with the fix and hosted them on a private registry. * Updated CSE server config to consume the updated dev images. * Created a cluster from CSE UI. Outcome: * CSE cluster was created successfully along with the load balancer. * Verified IP was reserved for the cluster load balancer properly in the IP space. --------- Signed-off-by: Aritra Sen <[email protected]> Co-authored-by: Aritra Sen <[email protected]>
vmware · Jul 30, 2024 · 3edc024 · 3edc024
1 parent 1560f5b
commit 3edc024
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 26 deletions.
diff --git a/go.mod b/go.mod
@@ -12,7 +12,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.14.0
 	github.com/onsi/gomega v1.30.0
 	github.com/pkg/errors v0.9.1
-	github.com/vmware/cloud-provider-for-cloud-director v0.0.0-20240214001708-af504c145ad5
+	github.com/vmware/cloud-provider-for-cloud-director v0.0.0-20240725204714-a0a0e916a5ed
 	github.com/vmware/go-vcloud-director/v2 v2.21.0
 	go.uber.org/zap v1.26.0
 	gopkg.in/yaml.v2 v2.4.0

diff --git a/go.sum b/go.sum
@@ -341,8 +341,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
-github.com/vmware/cloud-provider-for-cloud-director v0.0.0-20240214001708-af504c145ad5 h1:wLY7YYIgfOroVF+R158smilg1Aw1Kbzo8ez1Dh5FlwM=
-github.com/vmware/cloud-provider-for-cloud-director v0.0.0-20240214001708-af504c145ad5/go.mod h1:aZDliFAerzbmI6pL3bd1R53CEXJkNKkWgdM5q337rAw=
+github.com/vmware/cloud-provider-for-cloud-director v0.0.0-20240725204714-a0a0e916a5ed h1:JTJVcpsOFI4VaHfPiHKZPepgMU+up9gidp7yRDy2/rs=
+github.com/vmware/cloud-provider-for-cloud-director v0.0.0-20240725204714-a0a0e916a5ed/go.mod h1:aZDliFAerzbmI6pL3bd1R53CEXJkNKkWgdM5q337rAw=
 github.com/vmware/go-vcloud-director/v2 v2.21.0 h1:zIONrJpM+Fj+rDyXmsRfMAn1sP5WAP87USL0T9GS4DY=
 github.com/vmware/go-vcloud-director/v2 v2.21.0/go.mod h1:QPxGFgrUcSyzy9IlpwDE4UNT3tsOy2047tJOPEJ4nlw=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=

diff --git a/release/version b/release/version
@@ -1 +1 @@
-v1.3.0
+v1.3.1
diff --git a/vendor/github.com/vmware/cloud-provider-for-cloud-director/pkg/vcdsdk/auth.go b/vendor/github.com/vmware/cloud-provider-for-cloud-director/pkg/vcdsdk/auth.go
diff --git a/vendor/github.com/vmware/cloud-provider-for-cloud-director/pkg/vcdsdk/gateway.go b/vendor/github.com/vmware/cloud-provider-for-cloud-director/pkg/vcdsdk/gateway.go
diff --git a/...client_37_2/model_access_control_grant.go → ..._2/model_access_control_grant_modified.go b/...client_37_2/model_access_control_grant.go → ..._2/model_access_control_grant_modified.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -267,7 +267,7 @@ github.com/spf13/cast
 # github.com/spf13/pflag v1.0.5
 ## explicit; go 1.12
 github.com/spf13/pflag
-# github.com/vmware/cloud-provider-for-cloud-director v0.0.0-20240214001708-af504c145ad5
+# github.com/vmware/cloud-provider-for-cloud-director v0.0.0-20240725204714-a0a0e916a5ed
 ## explicit; go 1.20
 github.com/vmware/cloud-provider-for-cloud-director/pkg/testingsdk
 github.com/vmware/cloud-provider-for-cloud-director/pkg/util