Skip to content

Commit 6372dde

Browse files
Merge pull request #8212 from hamzy/PowerVS-fix-image-service-instance
no-jira: PowerVS: Fix CAPI created service instance case
2 parents 4e5fe0d + 95e3101 commit 6372dde

File tree

27 files changed

+6285
-3929
lines changed

27 files changed

+6285
-3929
lines changed

cluster-api/providers/ibmcloud/go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ go 1.21
44

55
toolchain go1.21.4
66

7-
require sigs.k8s.io/cluster-api-provider-ibmcloud v0.8.0-alpha.0.0.20240325184642-34a293918247
7+
require sigs.k8s.io/cluster-api-provider-ibmcloud v0.8.0-alpha.0.0.20240327041652-384c1894c61e
88

99
require (
1010
github.com/IBM-Cloud/power-go-client v1.6.0 // indirect
1111
github.com/IBM/go-sdk-core/v5 v5.16.3 // indirect
1212
github.com/IBM/ibm-cos-sdk-go v1.10.2 // indirect
1313
github.com/IBM/networking-go-sdk v0.45.0 // indirect
14-
github.com/IBM/platform-services-go-sdk v0.61.3 // indirect
15-
github.com/IBM/vpc-go-sdk v0.49.1 // indirect
14+
github.com/IBM/platform-services-go-sdk v0.62.0 // indirect
15+
github.com/IBM/vpc-go-sdk v0.50.0 // indirect
1616
github.com/NYTimes/gziphandler v1.1.1 // indirect
1717
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
1818
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect

cluster-api/providers/ibmcloud/go.sum

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ github.com/IBM/ibm-cos-sdk-go v1.10.2 h1:IlG7ruBNp10u03FIYvY1qeLoNNHAAAdpFP8h+Wm
66
github.com/IBM/ibm-cos-sdk-go v1.10.2/go.mod h1:h+IwNGkLJWCUOyCM9tj2rBCIf1tsckfe+DrJwzHx2PI=
77
github.com/IBM/networking-go-sdk v0.45.0 h1:tYgDhVDpgKvELNY7tcodbZ4ny9fatpEWM6PwtQcDe20=
88
github.com/IBM/networking-go-sdk v0.45.0/go.mod h1:NnJPA1e5GWr5opJe+5Hs6e1G6RcBIFz64TrkZsdnSp8=
9-
github.com/IBM/platform-services-go-sdk v0.61.3 h1:Us2fDckodXFI3NA67BerMVFKEai0MOL2vMqzut6qiik=
10-
github.com/IBM/platform-services-go-sdk v0.61.3/go.mod h1:fd7gUOmsuQYhYLTZVLL+posObT/ISxVV+6JzsfDs5qE=
11-
github.com/IBM/vpc-go-sdk v0.49.1 h1:VIkZ8iJMBHqBulUXcPtN0ifxsa0xwlBtaLslU2V9HsY=
12-
github.com/IBM/vpc-go-sdk v0.49.1/go.mod h1:iBg9UJY1y/XpkweyP6YH7G6guzKPV8BYDoBMTdPupH4=
9+
github.com/IBM/platform-services-go-sdk v0.62.0 h1:IA7kerhjqHHCSirXsLveX6Bk6DnUOA7Z9zaMqLZ5iBY=
10+
github.com/IBM/platform-services-go-sdk v0.62.0/go.mod h1:fd7gUOmsuQYhYLTZVLL+posObT/ISxVV+6JzsfDs5qE=
11+
github.com/IBM/vpc-go-sdk v0.50.0 h1:+vnXYK0FXFXYqaS/5/X1XEqH0bbRotkzkerRk21ZEjE=
12+
github.com/IBM/vpc-go-sdk v0.50.0/go.mod h1:iBg9UJY1y/XpkweyP6YH7G6guzKPV8BYDoBMTdPupH4=
1313
github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
1414
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
1515
github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
@@ -427,8 +427,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2S
427427
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
428428
sigs.k8s.io/cluster-api v1.6.2 h1:ruUi4q/9jXFuI+hmnDjo9izHgrBk4bjfQXLKx678PQE=
429429
sigs.k8s.io/cluster-api v1.6.2/go.mod h1:Anm4cA6R/AIP6KdIuVje8CdFc/TdGl+382bi5oPawRc=
430-
sigs.k8s.io/cluster-api-provider-ibmcloud v0.8.0-alpha.0.0.20240325184642-34a293918247 h1:XUd5ZfsZRiL9xiH5U1AdIfjjt9mW10bsiAUGk6fokkQ=
431-
sigs.k8s.io/cluster-api-provider-ibmcloud v0.8.0-alpha.0.0.20240325184642-34a293918247/go.mod h1:Zo/3APj8Ji0SsAYv7wnaUr4ulL3dlyoyGF9SXFRkMbM=
430+
sigs.k8s.io/cluster-api-provider-ibmcloud v0.8.0-alpha.0.0.20240327041652-384c1894c61e h1:HZO/r9l4B3DMoj1y5/j1AaQX41DaFMBdt//jGH1L1Aw=
431+
sigs.k8s.io/cluster-api-provider-ibmcloud v0.8.0-alpha.0.0.20240327041652-384c1894c61e/go.mod h1:y7Dj0vBUvq6PjNz5PYGEWyHSn5eOAULgMCfXiSzgKxY=
432432
sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0=
433433
sigs.k8s.io/controller-runtime v0.17.2/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
434434
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

cluster-api/providers/ibmcloud/vendor/github.com/IBM/platform-services-go-sdk/common/version.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cluster-api/providers/ibmcloud/vendor/github.com/IBM/vpc-go-sdk/common/version.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cluster-api/providers/ibmcloud/vendor/github.com/IBM/vpc-go-sdk/vpcv1/vpc_v1.go

Lines changed: 1721 additions & 1283 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cluster-api/providers/ibmcloud/vendor/modules.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ github.com/IBM/ibm-cos-sdk-go/service/s3
9696
## explicit; go 1.19
9797
github.com/IBM/networking-go-sdk/common
9898
github.com/IBM/networking-go-sdk/transitgatewayapisv1
99-
# github.com/IBM/platform-services-go-sdk v0.61.3
99+
# github.com/IBM/platform-services-go-sdk v0.62.0
100100
## explicit; go 1.20
101101
github.com/IBM/platform-services-go-sdk/common
102102
github.com/IBM/platform-services-go-sdk/resourcecontrollerv2
103103
github.com/IBM/platform-services-go-sdk/resourcemanagerv2
104-
# github.com/IBM/vpc-go-sdk v0.49.1
104+
# github.com/IBM/vpc-go-sdk v0.50.0
105105
## explicit; go 1.18
106106
github.com/IBM/vpc-go-sdk/common
107107
github.com/IBM/vpc-go-sdk/vpcv1
@@ -1070,7 +1070,7 @@ sigs.k8s.io/cluster-api/util/flags
10701070
sigs.k8s.io/cluster-api/util/labels
10711071
sigs.k8s.io/cluster-api/util/patch
10721072
sigs.k8s.io/cluster-api/util/predicates
1073-
# sigs.k8s.io/cluster-api-provider-ibmcloud v0.8.0-alpha.0.0.20240325184642-34a293918247
1073+
# sigs.k8s.io/cluster-api-provider-ibmcloud v0.8.0-alpha.0.0.20240327041652-384c1894c61e
10741074
## explicit; go 1.21
10751075
sigs.k8s.io/cluster-api-provider-ibmcloud
10761076
sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta1

cluster-api/providers/ibmcloud/vendor/sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2/ibmpowervscluster_webhook.go

Lines changed: 0 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cluster-api/providers/ibmcloud/vendor/sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2/types.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cluster-api/providers/ibmcloud/vendor/sigs.k8s.io/cluster-api-provider-ibmcloud/cloud/scope/powervs_cluster.go

Lines changed: 25 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cluster-api/providers/ibmcloud/vendor/sigs.k8s.io/cluster-api-provider-ibmcloud/cloud/scope/powervs_image.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)