Merge pull request #4582 from csrwng/remove_workspace

OCPBUGS-38755: Remove go workspaces from source control
openshift · Aug 27, 2024 · 0cc82f7 · 0cc82f7
2 parents 18bbdb4 + d7e15e0
commit 0cc82f7
Show file tree

Hide file tree

Showing 505 changed files with 49,841 additions and 43,385 deletions.
diff --git a/HACKING.md b/HACKING.md
@@ -111,3 +111,31 @@ Then update the associated CRD files:
 ```shell
 $ make api
 ```
+
+### How to use go workspaces
+
+Create a directory that will be the parent of the hypershift
+code repository:
+
+```shell
+$ mkdir hypershift_ws
+```
+
+Under that directory, either move an existing hypershift repository or just clone hypershift again
+
+```shell
+$ cd hypershift_ws
+$ git clone git@github.com:openshift/hypershift
+```
+
+Initialize the go workspace
+```shell
+go work init
+go work use ./hypershift
+go work use ./hypershift/api
+go work sync
+go work vendor
+```
+
+Now when running vscode, open the workspace directory to work
+with hypershift code.
diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ GENAPIDOCS := $(abspath $(TOOLS_BIN_DIR)/gen-crd-api-reference-docs)
 PROMTOOL=$(abspath $(TOOLS_BIN_DIR)/promtool)
 
 GO_GCFLAGS ?= -gcflags=all='-N -l'
-GO=GO111MODULE=on GOFLAGS=-mod=vendor go
+GO=GO111MODULE=on GOWORK=off GOFLAGS=-mod=vendor go
 GO_BUILD_RECIPE=CGO_ENABLED=1 $(GO) build $(GO_GCFLAGS)
 GO_E2E_RECIPE=CGO_ENABLED=1 $(GO) test $(GO_GCFLAGS) -tags e2e -c
 
@@ -47,12 +47,8 @@ pre-commit: all verify test
 
 build: hypershift-operator control-plane-operator control-plane-pki-operator hypershift product-cli
 
-.PHONY: sync
-sync:
-	$(GO) work sync
-
 .PHONY: update
-update: sync api-deps api api-docs deps clients
+update: api-deps api api-docs deps clients
 
 .PHONY: verify
 verify: update staticcheck fmt vet
@@ -205,16 +201,16 @@ vet:
 .PHONY: deps
 deps:
 	$(GO) mod tidy
-	$(GO) work vendor
+	$(GO) mod vendor
 	$(GO) mod verify
 	$(GO) list -m -mod=readonly -json all > /dev/null
-	(cd hack/tools && $(GO) mod tidy && $(GO) work vendor && $(GO) mod verify && $(GO) list -m -mod=readonly -json all > /dev/null)
+	(cd hack/tools && $(GO) mod tidy && $(GO) mod vendor && $(GO) mod verify && $(GO) list -m -mod=readonly -json all > /dev/null)
 
 .PHONY: api-deps
 api-deps:
 	cd api && \
 	  $(GO) mod tidy && \
-	  $(GO) work vendor && \
+	  $(GO) mod vendor && \
 	  $(GO) mod verify && \
 	  $(GO) list -m -mod=readonly -json all > /dev/null
 

diff --git a/api/vendor/github.com/go-logr/logr/README.md b/api/vendor/github.com/go-logr/logr/README.md
diff --git a/....com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml b/....com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml