1
0
mirror of https://github.com/openshift/openshift-docs.git synced 2026-02-05 12:46:18 +01:00

OCPBUGS-5951: Fix OSDK project migration code callouts

This commit is contained in:
Michael Ryan Peter
2023-02-23 15:54:59 -05:00
committed by openshift-cherrypick-robot
parent 87936440cb
commit 4eaebff5d2

View File

@@ -202,14 +202,16 @@ $(KUSTOMIZE): $(LOCALBIN)
.PHONY: controller-gen
controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary.
$(CONTROLLER_GEN): $(LOCALBIN)
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION) <1>
test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION) <2>
.PHONY: envtest
envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
$(ENVTEST): $(LOCALBIN)
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest <1>
test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest <3>
----
<1> Add `test -s $(LOCALBIN)/<binary-name> ||` before the instruction to download a binary.
<2> Add `test -s $(LOCALBIN)/<binary-name> ||` before the instruction to download a binary.
<3> Add `test -s $(LOCALBIN)/<binary-name> ||` before the instruction to download a binary.
.. Update `controller-tools` to version `v0.9.2` as shown in the following example:
+
@@ -290,16 +292,18 @@ require (
github.com/onsi/ginkgo/v2 v2.1.4 <2>
github.com/onsi/gomega v1.19.0 <3>
k8s.io/api v0.25.0 <4>
k8s.io/apimachinery v0.25.0 <4>
k8s.io/client-go v0.25.0 <4>
sigs.k8s.io/controller-runtime v0.13.0 <5>
k8s.io/apimachinery v0.25.0 <5>
k8s.io/client-go v0.25.0 <6>
sigs.k8s.io/controller-runtime v0.13.0 <7>
)
----
<1> Update version `1.18` to `1.19`.
<2> Update version `v1.16.5` to `v2.1.4`.
<3> Update version `v1.18.1` to `v1.19.0`.
<4> Update version `v0.24.0` to `v0.25.0`.
<5> Update version `v0.12.1` to `v0.13.0`.
<5> Update version `v0.24.0` to `v0.25.0`.
<6> Update version `v0.24.0` to `v0.25.0`.
<7> Update version `v0.12.1` to `v0.13.0`.
. To download the updated versions, clean up the dependencies, and apply the changes in your `go.mod` file, run the following command:
+