Skip to content

Commit 9689a5b

Browse files
Update cluster-api-provider-openstack to v0.10.3
* Upgrade from v0.10.0 to v0.10.3 * Depend on the upstream provider, as the downstream carry-patch that reverted to Go v1.21 is no longer useful
1 parent c84151a commit 9689a5b

File tree

30 files changed

+58
-165
lines changed

30 files changed

+58
-165
lines changed

cluster-api/providers/openstack/go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module openshift/installer/cluster-api/providers/openstack
22

33
go 1.22
44

5-
require sigs.k8s.io/cluster-api-provider-openstack v0.10.0
5+
require sigs.k8s.io/cluster-api-provider-openstack v0.10.3
66

77
require (
88
github.com/NYTimes/gziphandler v1.1.1 // indirect
@@ -114,5 +114,3 @@ require (
114114
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
115115
sigs.k8s.io/yaml v1.4.0 // indirect
116116
)
117-
118-
replace sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.9.1-0.20240426092531-c42a4659d6c0

cluster-api/providers/openstack/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,6 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
203203
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
204204
github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM=
205205
github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
206-
github.com/openshift/cluster-api-provider-openstack v0.9.1-0.20240426092531-c42a4659d6c0 h1:e/o1uQYyapM0e/+R4HUB4Y+efEkRu1qWqn5sHeW9dck=
207-
github.com/openshift/cluster-api-provider-openstack v0.9.1-0.20240426092531-c42a4659d6c0/go.mod h1:PX3pVY7IPC/zmKJksYuvz779eyYHeP2ZW7PfnOllng8=
208206
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
209207
github.com/pelletier/go-toml/v2 v2.1.0 h1:FnwAJ4oYMvbT/34k9zzHuZNrhlz48GB3/s6at6/MHO4=
210208
github.com/pelletier/go-toml/v2 v2.1.0/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
@@ -451,6 +449,8 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2S
451449
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
452450
sigs.k8s.io/cluster-api v1.6.0 h1:2bhVSnUbtWI8taCjd9lGiHExsRUpKf7Z1fXqi/IwYx4=
453451
sigs.k8s.io/cluster-api v1.6.0/go.mod h1:LB7u/WxiWj4/bbpHNOa1oQ8nq0MQ5iYlD0pGfRSBGLI=
452+
sigs.k8s.io/cluster-api-provider-openstack v0.10.3 h1:nVIIOHVbMfvcI6buc4MTqiRtkzZIjZkxixbYNN49rYU=
453+
sigs.k8s.io/cluster-api-provider-openstack v0.10.3/go.mod h1:/3VAIzFoAxX77QykzyE6tnHD9aC8lYiQVKbfKPoX20w=
454454
sigs.k8s.io/cluster-api/test v1.6.0 h1:hvqUpSYxXCvs4FiEfsDpFZAfZ7i4kkP/59mVdFHlzSI=
455455
sigs.k8s.io/cluster-api/test v1.6.0/go.mod h1:DJtbkrnrH77cd3PnXeKCQDMtCGVCrHZHPOjMvEsLB2U=
456456
sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4=

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,16 +1212,15 @@ sigs.k8s.io/cluster-api/util/patch
12121212
sigs.k8s.io/cluster-api/util/predicates
12131213
sigs.k8s.io/cluster-api/util/topology
12141214
sigs.k8s.io/cluster-api/util/version
1215-
# sigs.k8s.io/cluster-api-provider-openstack v0.10.0 => github.com/openshift/cluster-api-provider-openstack v0.9.1-0.20240426092531-c42a4659d6c0
1216-
## explicit; go 1.21
1215+
# sigs.k8s.io/cluster-api-provider-openstack v0.10.3
1216+
## explicit; go 1.22
12171217
sigs.k8s.io/cluster-api-provider-openstack
12181218
sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1
12191219
sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha5
12201220
sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha6
12211221
sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha7
12221222
sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1
12231223
sigs.k8s.io/cluster-api-provider-openstack/controllers
1224-
sigs.k8s.io/cluster-api-provider-openstack/internal/futures
12251224
sigs.k8s.io/cluster-api-provider-openstack/pkg/clients
12261225
sigs.k8s.io/cluster-api-provider-openstack/pkg/clients/mock
12271226
sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/services/compute
@@ -1301,4 +1300,3 @@ sigs.k8s.io/structured-merge-diff/v4/value
13011300
## explicit; go 1.12
13021301
sigs.k8s.io/yaml
13031302
sigs.k8s.io/yaml/goyaml.v2
1304-
# sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack v0.9.1-0.20240426092531-c42a4659d6c0

cluster-api/providers/openstack/vendor/sigs.k8s.io/cluster-api-provider-openstack/.ci-operator.yaml

Lines changed: 0 additions & 4 deletions
This file was deleted.

cluster-api/providers/openstack/vendor/sigs.k8s.io/cluster-api-provider-openstack/.gitignore

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

cluster-api/providers/openstack/vendor/sigs.k8s.io/cluster-api-provider-openstack/.snyk

Lines changed: 0 additions & 10 deletions
This file was deleted.

cluster-api/providers/openstack/vendor/sigs.k8s.io/cluster-api-provider-openstack/DOWNSTREAM_OWNERS

Lines changed: 0 additions & 6 deletions
This file was deleted.

cluster-api/providers/openstack/vendor/sigs.k8s.io/cluster-api-provider-openstack/DOWNSTREAM_OWNERS_ALIASES

Lines changed: 0 additions & 10 deletions
This file was deleted.

cluster-api/providers/openstack/vendor/sigs.k8s.io/cluster-api-provider-openstack/Dockerfile.rhel

Lines changed: 0 additions & 51 deletions
This file was deleted.

cluster-api/providers/openstack/vendor/sigs.k8s.io/cluster-api-provider-openstack/Makefile

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

0 commit comments

Comments
 (0)