Skip to content

Commit 9a252bd

Browse files
Merge pull request #56435 from michaelryanpeter/OCPBUGS-5951-fix-OSDK-code-callouts
OCPBUGS#5951: Fix OSDK project migration code callouts
2 parents c66be26 + 6f0669f commit 9a252bd

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

modules/osdk-updating-v1220-to-v1250.adoc

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,14 +202,16 @@ $(KUSTOMIZE): $(LOCALBIN)
202202
.PHONY: controller-gen
203203
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
204204
$(CONTROLLER_GEN): $(LOCALBIN)
205-
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION) <1>
205+
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION) <2>
206206
207207
.PHONY: envtest
208208
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
209209
$(ENVTEST): $(LOCALBIN)
210-
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest <1>
210+
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest <3>
211211
----
212212
<1> Add `test -s $(LOCALBIN)/<binary-name> ||` before the instruction to download a binary.
213+
<2> Add `test -s $(LOCALBIN)/<binary-name> ||` before the instruction to download a binary.
214+
<3> Add `test -s $(LOCALBIN)/<binary-name> ||` before the instruction to download a binary.
213215

214216
.. Update `controller-tools` to version `v0.9.2` as shown in the following example:
215217
+
@@ -290,16 +292,18 @@ require (
290292
github.com/onsi/ginkgo/v2 v2.1.4 <2>
291293
github.com/onsi/gomega v1.19.0 <3>
292294
k8s.io/api v0.25.0 <4>
293-
k8s.io/apimachinery v0.25.0 <4>
294-
k8s.io/client-go v0.25.0 <4>
295-
sigs.k8s.io/controller-runtime v0.13.0 <5>
295+
k8s.io/apimachinery v0.25.0 <5>
296+
k8s.io/client-go v0.25.0 <6>
297+
sigs.k8s.io/controller-runtime v0.13.0 <7>
296298
)
297299
----
298300
<1> Update version `1.18` to `1.19`.
299301
<2> Update version `v1.16.5` to `v2.1.4`.
300302
<3> Update version `v1.18.1` to `v1.19.0`.
301303
<4> Update version `v0.24.0` to `v0.25.0`.
302-
<5> Update version `v0.12.1` to `v0.13.0`.
304+
<5> Update version `v0.24.0` to `v0.25.0`.
305+
<6> Update version `v0.24.0` to `v0.25.0`.
306+
<7> Update version `v0.12.1` to `v0.13.0`.
303307
304308
. To download the updated versions, clean up the dependencies, and apply the changes in your `go.mod` file, run the following command:
305309
+

0 commit comments

Comments
 (0)