Skip to content

Commit 13f4c46

Browse files
authored
*: remove broken and unnecessary Go env (#2135)
1 parent 2445fcd commit 13f4c46

File tree

9 files changed

+1
-15
lines changed

9 files changed

+1
-15
lines changed

Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ SCORECARD_PROXY_IMAGE ?= $(SCORECARD_PROXY_BASE_IMAGE)
2727
HELM_ARCHES:="amd64" "ppc64le"
2828

2929
export CGO_ENABLED:=0
30-
export GO111MODULE:=on
31-
export GOPROXY?=https://proxy.golang.org/
3230
.DEFAULT_GOAL:=help
3331

3432
.PHONY: help

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ Follow the steps in the [installation guide][install_guide] to learn how to inst
6464
$ mkdir -p $HOME/projects/example-inc/
6565
# Create a new app-operator project
6666
$ cd $HOME/projects/example-inc/
67-
$ export GO111MODULE=on
6867
$ operator-sdk new app-operator --repo github.com/example-inc/app-operator
6968
$ cd app-operator
7069

ci/dockerfiles/builder.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM openshift/origin-release:golang-1.13
22

33
WORKDIR /go/src/github.com/operator-framework/operator-sdk
4-
ENV GOPATH=/go PATH=/go/src/github.com/operator-framework/operator-sdk/build:$PATH GOPROXY=https://proxy.golang.org/ GO111MODULE=on
4+
ENV GOPATH=/go PATH=/go/src/github.com/operator-framework/operator-sdk/build:$PATH
55

66
COPY . .
77

ci/prow.Makefile

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# Makefile specifically intended for use in prow/api-ci only.
22

33
export CGO_ENABLED := 0
4-
export GO111MODULE := on
5-
export GOPROXY ?= https://proxy.golang.org/
64

75
build:
86
$(MAKE) -f Makefile build/operator-sdk

ci/tests/scaffolding/e2e-ansible-scaffold-hybrid.sh

-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ pushd memcached-operator
2323
# Add a second Kind to test watching multiple GVKs
2424
operator-sdk add crd --kind=Foo --api-version=ansible.example.com/v1alpha1
2525

26-
export GO111MODULE=on
27-
export GOPROXY=https://proxy.golang.org
2826
operator-sdk migrate
2927

3028
if [[ ! -e build/Dockerfile.sdkold ]];

ci/tests/scaffolding/e2e-helm-scaffold-hybrid.sh

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ pushd "$HELMDIR"
1313
operator-sdk new nginx-operator --api-version=helm.example.com/v1alpha1 --kind=Nginx --type=helm
1414

1515
pushd nginx-operator
16-
export GO111MODULE=on
1716
operator-sdk migrate
1817

1918
if [[ ! -e build/Dockerfile.sdkold ]];

hack/tests/e2e-ansible.sh

-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ echo "### Base image testing passed"
170170
echo "### Now testing migrate to hybrid operator"
171171
echo "###"
172172

173-
export GO111MODULE=on
174173
operator-sdk migrate --repo=github.com/example-inc/memcached-operator
175174

176175
if [[ ! -e build/Dockerfile.sdkold ]];

hack/tests/e2e-helm.sh

-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ echo "### Base image testing passed"
150150
echo "### Now testing migrate to hybrid operator"
151151
echo "###"
152152

153-
export GO111MODULE=on
154153
operator-sdk migrate --repo=github.com/example-inc/nginx-operator
155154

156155
if [[ ! -e build/Dockerfile.sdkold ]];

hack/tests/scaffolding/scaffold-memcached.go

-4
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ func main() {
5858
if localSDKPath == "" {
5959
localSDKPath = sdkTestE2EDir
6060
}
61-
// For go commands in operator projects.
62-
if err = os.Setenv("GO111MODULE", "on"); err != nil {
63-
log.Fatal(err)
64-
}
6561

6662
log.Print("Creating new operator project")
6763
cmdOut, err := exec.Command("operator-sdk",

0 commit comments

Comments
 (0)