From 4eaebff5d2786461c37824bfa7af0897118bf1e1 Mon Sep 17 00:00:00 2001 From: Michael Ryan Peter Date: Thu, 23 Feb 2023 15:54:59 -0500 Subject: [PATCH] OCPBUGS-5951: Fix OSDK project migration code callouts --- modules/osdk-updating-v1220-to-v1250.adoc | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/osdk-updating-v1220-to-v1250.adoc b/modules/osdk-updating-v1220-to-v1250.adoc index 78af3f63a8..10259bac94 100644 --- a/modules/osdk-updating-v1220-to-v1250.adoc +++ b/modules/osdk-updating-v1220-to-v1250.adoc @@ -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)/ ||` before the instruction to download a binary. +<2> Add `test -s $(LOCALBIN)/ ||` before the instruction to download a binary. +<3> Add `test -s $(LOCALBIN)/ ||` 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: +