Skip to content

Commit 11da34c

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2506 from shiftstack/orc_v2
✨ feat: update ORC to v2
2 parents 49d55d7 + 1b491d8 commit 11da34c

File tree

15 files changed

+44
-43
lines changed

15 files changed

+44
-43
lines changed

‎controllers/openstackserver_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ import (
4848
"sigs.k8s.io/controller-runtime/pkg/predicate"
4949
"sigs.k8s.io/controller-runtime/pkg/reconcile"
5050

51-
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/api/v1alpha1"
52-
"github.com/k-orc/openstack-resource-controller/pkg/predicates"
51+
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/v2/api/v1alpha1"
52+
"github.com/k-orc/openstack-resource-controller/v2/pkg/predicates"
5353

5454
infrav1alpha1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1"
5555
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"

‎docs/book/src/clusteropenstack/configuration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ manage some OpenStack resources. ORC is a separate project and is not part of CA
138138
To install ORC, run the following command:
139139

140140
```bash
141-
ORC_VERSION=v1.0.0
141+
ORC_VERSION=v2.0.3
142142
kubectl apply -f "https://github.com/k-orc/openstack-resource-controller/releases/download/${ORC_VERSION}/install.yaml"
143143
```
144144

‎go.mod

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ require (
99
github.com/google/gofuzz v1.2.0
1010
github.com/google/uuid v1.6.0
1111
github.com/gophercloud/gophercloud/v2 v2.6.0
12-
github.com/gophercloud/utils/v2 v2.0.0-20241209100706-e3a3b7c07d26
12+
github.com/gophercloud/utils/v2 v2.0.0-20241220104409-2e0af06694a1
1313
github.com/hashicorp/go-version v1.7.0
14-
github.com/k-orc/openstack-resource-controller v1.0.1
14+
github.com/k-orc/openstack-resource-controller/v2 v2.0.3
1515
github.com/onsi/ginkgo/v2 v2.23.3
1616
github.com/onsi/gomega v1.36.3
1717
github.com/prometheus/client_golang v1.21.1
@@ -32,7 +32,7 @@ require (
3232
sigs.k8s.io/cluster-api v1.10.0-beta.0
3333
sigs.k8s.io/cluster-api/test v1.10.0-beta.0
3434
sigs.k8s.io/controller-runtime v0.20.4
35-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0
35+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0
3636
sigs.k8s.io/yaml v1.4.0
3737
)
3838

@@ -97,7 +97,6 @@ require (
9797
github.com/mattn/go-isatty v0.0.20 // indirect
9898
github.com/mattn/go-runewidth v0.0.14 // indirect
9999
github.com/mitchellh/copystructure v1.2.0 // indirect
100-
github.com/mitchellh/go-homedir v1.1.0 // indirect
101100
github.com/mitchellh/reflectwalk v1.0.2 // indirect
102101
github.com/moby/docker-image-spec v1.3.1 // indirect
103102
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -134,7 +133,7 @@ require (
134133
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
135134
go.uber.org/multierr v1.11.0 // indirect
136135
go.uber.org/zap v1.27.0 // indirect
137-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
136+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
138137
golang.org/x/mod v0.23.0 // indirect
139138
golang.org/x/net v0.37.0 // indirect
140139
golang.org/x/oauth2 v0.28.0 // indirect

‎go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
142142
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
143143
github.com/gophercloud/gophercloud/v2 v2.6.0 h1:XJKQ0in3iHOZHVAFMXq/OhjCuvvG+BKR0unOqRfG1EI=
144144
github.com/gophercloud/gophercloud/v2 v2.6.0/go.mod h1:Ki/ILhYZr/5EPebrPL9Ej+tUg4lqx71/YH2JWVeU+Qk=
145-
github.com/gophercloud/utils/v2 v2.0.0-20241209100706-e3a3b7c07d26 h1:N65GYmx5LrMeYdeXcxMESDU+2pDyAOXlFNlHl7siUwM=
146-
github.com/gophercloud/utils/v2 v2.0.0-20241209100706-e3a3b7c07d26/go.mod h1:7SHUbtoiSYINNKgAVxse+PMhIio05IK7shHy8DVRaN0=
145+
github.com/gophercloud/utils/v2 v2.0.0-20241220104409-2e0af06694a1 h1:LS70kbNdqoalMwLXEzP9Xb/cYv9UCzWioXaOynxrytc=
146+
github.com/gophercloud/utils/v2 v2.0.0-20241220104409-2e0af06694a1/go.mod h1:qDhuzCRKi90/Yyl/yEqkg8+qABEvK44LhP0D3GWKGtY=
147147
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
148148
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
149149
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
@@ -166,8 +166,8 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
166166
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
167167
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
168168
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
169-
github.com/k-orc/openstack-resource-controller v1.0.1 h1:DU7JpOpF+ucxOQyhssBHwrsEK4YRCl9xOesNK4HU1nw=
170-
github.com/k-orc/openstack-resource-controller v1.0.1/go.mod h1:FZtcH+ld5x1wFM9y4LemtUbGWjnYZWoG4R7dxz1FmdA=
169+
github.com/k-orc/openstack-resource-controller/v2 v2.0.3 h1:Ykd/jO9osa7lUVoAZA+thULfj6tylJKIgPWL2St40vU=
170+
github.com/k-orc/openstack-resource-controller/v2 v2.0.3/go.mod h1:XhIpm8PBxLK/zOGUu30EKSxOOwGER2SQyst8p7fs8Cw=
171171
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
172172
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
173173
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
@@ -193,8 +193,6 @@ github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWV
193193
github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
194194
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
195195
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
196-
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
197-
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
198196
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
199197
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
200198
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
@@ -338,8 +336,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
338336
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
339337
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
340338
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
341-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
342-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
339+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo=
340+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
343341
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
344342
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
345343
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
@@ -453,7 +451,9 @@ sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1
453451
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
454452
sigs.k8s.io/kind v0.27.0 h1:PQ3f0iAWNIj66LYkZ1ivhEg/+Zb6UPMbO+qVei/INZA=
455453
sigs.k8s.io/kind v0.27.0/go.mod h1:RZVFmy6qcwlSWwp6xeIUv7kXCPF3i8MXsEXxW/J+gJY=
456-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 h1:nbCitCK2hfnhyiKo6uf2HxUPTCodY6Qaf85SbDIaMBk=
457-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
454+
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016 h1:kXv6kKdoEtedwuqMmkqhbkgvYKeycVbC8+iPCP9j5kQ=
455+
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
456+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
457+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
458458
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
459459
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

‎hack/tools/go.mod

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,20 @@ require (
5454
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
5555
github.com/google/uuid v1.6.0 // indirect
5656
github.com/gophercloud/gophercloud/v2 v2.6.0 // indirect
57-
github.com/gophercloud/utils/v2 v2.0.0-20241209100706-e3a3b7c07d26 // indirect
57+
github.com/gophercloud/utils/v2 v2.0.0-20241220104409-2e0af06694a1 // indirect
5858
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
5959
github.com/hashicorp/go-version v1.7.0 // indirect
6060
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6161
github.com/itchyny/timefmt-go v0.1.6 // indirect
6262
github.com/josharian/intern v1.0.0 // indirect
6363
github.com/json-iterator/go v1.1.12 // indirect
64-
github.com/k-orc/openstack-resource-controller v1.0.1 // indirect
64+
github.com/k-orc/openstack-resource-controller/v2 v2.0.3 // indirect
6565
github.com/klauspost/compress v1.17.11 // indirect
6666
github.com/kylelemons/godebug v1.1.0 // indirect
6767
github.com/mailru/easyjson v0.7.7 // indirect
6868
github.com/mattn/go-colorable v0.1.13 // indirect
6969
github.com/mattn/go-isatty v0.0.20 // indirect
7070
github.com/mattn/go-runewidth v0.0.15 // indirect
71-
github.com/mitchellh/go-homedir v1.1.0 // indirect
7271
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7372
github.com/modern-go/reflect2 v1.0.2 // indirect
7473
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -98,7 +97,7 @@ require (
9897
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
9998
go.uber.org/multierr v1.11.0 // indirect
10099
go.uber.org/zap v1.27.0 // indirect
101-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
100+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
102101
golang.org/x/mod v0.23.0 // indirect
103102
golang.org/x/net v0.37.0 // indirect
104103
golang.org/x/oauth2 v0.28.0 // indirect
@@ -139,7 +138,7 @@ require (
139138
sigs.k8s.io/kustomize/api v0.19.0 // indirect
140139
sigs.k8s.io/kustomize/cmd/config v0.19.0 // indirect
141140
sigs.k8s.io/kustomize/kyaml v0.19.0 // indirect
142-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
141+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
143142
sigs.k8s.io/yaml v1.4.0 // indirect
144143
)
145144

‎hack/tools/go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
137137
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
138138
github.com/gophercloud/gophercloud/v2 v2.6.0 h1:XJKQ0in3iHOZHVAFMXq/OhjCuvvG+BKR0unOqRfG1EI=
139139
github.com/gophercloud/gophercloud/v2 v2.6.0/go.mod h1:Ki/ILhYZr/5EPebrPL9Ej+tUg4lqx71/YH2JWVeU+Qk=
140-
github.com/gophercloud/utils/v2 v2.0.0-20241209100706-e3a3b7c07d26 h1:N65GYmx5LrMeYdeXcxMESDU+2pDyAOXlFNlHl7siUwM=
141-
github.com/gophercloud/utils/v2 v2.0.0-20241209100706-e3a3b7c07d26/go.mod h1:7SHUbtoiSYINNKgAVxse+PMhIio05IK7shHy8DVRaN0=
140+
github.com/gophercloud/utils/v2 v2.0.0-20241220104409-2e0af06694a1 h1:LS70kbNdqoalMwLXEzP9Xb/cYv9UCzWioXaOynxrytc=
141+
github.com/gophercloud/utils/v2 v2.0.0-20241220104409-2e0af06694a1/go.mod h1:qDhuzCRKi90/Yyl/yEqkg8+qABEvK44LhP0D3GWKGtY=
142142
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
143143
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
144144
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw=
@@ -165,8 +165,8 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
165165
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
166166
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
167167
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
168-
github.com/k-orc/openstack-resource-controller v1.0.1 h1:DU7JpOpF+ucxOQyhssBHwrsEK4YRCl9xOesNK4HU1nw=
169-
github.com/k-orc/openstack-resource-controller v1.0.1/go.mod h1:FZtcH+ld5x1wFM9y4LemtUbGWjnYZWoG4R7dxz1FmdA=
168+
github.com/k-orc/openstack-resource-controller/v2 v2.0.3 h1:Ykd/jO9osa7lUVoAZA+thULfj6tylJKIgPWL2St40vU=
169+
github.com/k-orc/openstack-resource-controller/v2 v2.0.3/go.mod h1:XhIpm8PBxLK/zOGUu30EKSxOOwGER2SQyst8p7fs8Cw=
170170
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
171171
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
172172
github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
@@ -193,8 +193,6 @@ github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZ
193193
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
194194
github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
195195
github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
196-
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
197-
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
198196
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
199197
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
200198
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
@@ -347,8 +345,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
347345
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
348346
golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
349347
golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
350-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
351-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
348+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo=
349+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
352350
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
353351
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
354352
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
@@ -483,8 +481,10 @@ sigs.k8s.io/kustomize/kustomize/v5 v5.6.0 h1:MWtRRDWCwQEeW2rnJTqJMuV6Agy56P53Skb
483481
sigs.k8s.io/kustomize/kustomize/v5 v5.6.0/go.mod h1:XuuZiQF7WdcvZzEYyNww9A0p3LazCKeJmCjeycN8e1I=
484482
sigs.k8s.io/kustomize/kyaml v0.19.0 h1:RFge5qsO1uHhwJsu3ipV7RNolC7Uozc0jUBC/61XSlA=
485483
sigs.k8s.io/kustomize/kyaml v0.19.0/go.mod h1:FeKD5jEOH+FbZPpqUghBP8mrLjJ3+zD3/rf9NNu1cwY=
486-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 h1:nbCitCK2hfnhyiKo6uf2HxUPTCodY6Qaf85SbDIaMBk=
487-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
484+
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016 h1:kXv6kKdoEtedwuqMmkqhbkgvYKeycVbC8+iPCP9j5kQ=
485+
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
486+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
487+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
488488
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
489489
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
490490
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

‎main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import (
4343
"sigs.k8s.io/controller-runtime/pkg/controller"
4444
"sigs.k8s.io/controller-runtime/pkg/webhook"
4545

46-
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/api/v1alpha1"
46+
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/v2/api/v1alpha1"
4747

4848
infrav1alpha1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha1"
4949
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"

‎pkg/cloud/services/compute/instance.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"k8s.io/apimachinery/pkg/util/wait"
3434
"sigs.k8s.io/controller-runtime/pkg/client"
3535

36-
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/api/v1alpha1"
36+
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/v2/api/v1alpha1"
3737

3838
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
3939
"sigs.k8s.io/cluster-api-provider-openstack/pkg/clients"

‎pkg/cloud/services/compute/instance_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ import (
3737
"k8s.io/utils/ptr"
3838
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3939

40-
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/api/v1alpha1"
40+
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/v2/api/v1alpha1"
4141

4242
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
4343
"sigs.k8s.io/cluster-api-provider-openstack/pkg/clients"

‎pkg/utils/orc/identity_ref.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package orc
1818

1919
import (
20-
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/api/v1alpha1"
20+
orcv1alpha1 "github.com/k-orc/openstack-resource-controller/v2/api/v1alpha1"
2121

2222
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
2323
)

0 commit comments

Comments
 (0)