Skip to content

Commit d6251bd

Browse files
committed
DNM: Update go mod
DO NOT MERGE: Update the go mod for BYOK support. Replace with proper upstream releases, rather than personal branches.
1 parent 4736f28 commit d6251bd

File tree

78 files changed

+74347
-42649
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+74347
-42649
lines changed

go.mod

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ require (
1919
github.com/IBM-Cloud/bluemix-go v0.0.0-20211102075456-ffc4e11dfb16
2020
github.com/IBM-Cloud/power-go-client v1.5.3
2121
github.com/IBM/go-sdk-core/v5 v5.14.1
22+
github.com/IBM/keyprotect-go-client v0.12.2
2223
github.com/IBM/networking-go-sdk v0.42.2
23-
github.com/IBM/platform-services-go-sdk v0.42.0
24-
github.com/IBM/vpc-go-sdk v0.20.0
24+
github.com/IBM/platform-services-go-sdk v0.52.1
25+
github.com/IBM/vpc-go-sdk v0.42.0
2526
github.com/aliyun/alibaba-cloud-sdk-go v1.61.1264
2627
github.com/aliyun/aliyun-oss-go-sdk v2.1.8+incompatible
2728
github.com/apparentlymart/go-cidr v1.1.0
@@ -59,18 +60,18 @@ require (
5960
github.com/microsoftgraph/msgraph-sdk-go v0.47.0
6061
github.com/nutanix-cloud-native/prism-go-client v0.2.1-0.20220804130801-c8a253627c64
6162
github.com/onsi/gomega v1.28.1
62-
github.com/openshift/api v0.0.0-20231120222239-b86761094ee3
63+
github.com/openshift/api v0.0.0-20231128111040-e1845c5a7acd
6364
github.com/openshift/assisted-image-service v0.0.0-20230829160050-0b98ec74397b
6465
github.com/openshift/assisted-service/api v0.0.0
6566
github.com/openshift/assisted-service/client v0.0.0
6667
github.com/openshift/assisted-service/models v0.0.0
67-
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
68+
github.com/openshift/client-go v0.0.0-20230503144108-75015d2347cb
6869
github.com/openshift/cloud-credential-operator v0.0.0-20200316201045-d10080b52c9e
6970
github.com/openshift/cluster-api-provider-baremetal v0.0.0-20220408122422-7a548effc26e
7071
github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20230308152226-83c0473d4429
7172
github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20220323121149-e3f2850dd519
7273
github.com/openshift/hive/apis v0.0.0-20220222213051-def9088fdb5a
73-
github.com/openshift/library-go v0.0.0-20220920133651-093893cf326b
74+
github.com/openshift/library-go v0.0.0-20230508110756-9b7abe2c9cbf
7475
github.com/openshift/machine-api-provider-ibmcloud v0.0.0-20230124105206-50aa171a52e1
7576
github.com/openshift/machine-config-operator v0.0.0
7677
github.com/ovirt/go-ovirt v0.0.0-20210809163552-d4276e35d3db
@@ -175,7 +176,6 @@ require (
175176
github.com/googleapis/gax-go/v2 v2.11.0 // indirect
176177
github.com/hashicorp/errwrap v1.0.0 // indirect
177178
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
178-
github.com/hashicorp/go-hclog v1.2.0 // indirect
179179
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
180180
github.com/hashicorp/go-uuid v1.0.3 // indirect
181181
github.com/hashicorp/terraform-json v0.14.0 // indirect
@@ -263,6 +263,9 @@ replace (
263263
// sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20210626224711-5d94c794092f // Indirect dependency through MAO from cluster API providers
264264
)
265265

266+
// TODO(cjschaef): Remove before merge
267+
replace github.com/openshift/machine-api-provider-ibmcloud => github.com/cjschaef/machine-api-provider-ibmcloud v0.0.0-20231125212514-e4de41aba4e9
268+
266269
replace sigs.k8s.io/cluster-api-provider-aws/v2 => sigs.k8s.io/cluster-api-provider-aws/v2 v2.0.0-20231024062453-0bf78b04b305
267270

268271
replace sigs.k8s.io/cluster-api-provider-azure => sigs.k8s.io/cluster-api-provider-azure v1.11.1-0.20231026140308-a3f4914170d9

go.sum

Lines changed: 19 additions & 24 deletions
Large diffs are not rendered by default.

pkg/destroy/ibmcloud/iam.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func (o *ClusterUninstaller) listIAMAuthorizations() (cloudResources, error) {
4141

4242
// policyMatches returns true if the IAM Policy matches the one set up to allow
4343
// the VPC service to read from the COS bucket containing the uploaded RHCOS image.
44-
func (o *ClusterUninstaller) policyMatches(policy iampolicymanagementv1.Policy) bool {
44+
func (o *ClusterUninstaller) policyMatches(policy iampolicymanagementv1.PolicyTemplateMetaData) bool {
4545
// Ideally we would match using the description field of the Policy type. However,
4646
// this is not currently supported in the IBM Terraform Provider. An issue has
4747
// been opened for this: https://github.com/IBM-Cloud/terraform-provider-ibm/issues/2894

vendor/github.com/IBM/keyprotect-go-client/.bumpversion.cfg

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

vendor/github.com/IBM/keyprotect-go-client/.gitattributes

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

vendor/github.com/IBM/keyprotect-go-client/.gitignore

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

vendor/github.com/IBM/keyprotect-go-client/.npmrc

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

vendor/github.com/IBM/keyprotect-go-client/.releaserc

Lines changed: 23 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)