Skip to content

Commit 1e6bbe4

Browse files
committed
Remove GO111MODULE:=on setup
1 parent 0a1254f commit 1e6bbe4

File tree

8 files changed

+4
-11
lines changed

8 files changed

+4
-11
lines changed

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ SCORECARD_PROXY_IMAGE ?= $(SCORECARD_PROXY_BASE_IMAGE)
2727
HELM_ARCHES:="amd64" "ppc64le"
2828

2929
export CGO_ENABLED:=0
30-
export GO111MODULE:=on
3130
export GOPROXY?=https://proxy.golang.org/
3231
.DEFAULT_GOAL:=help
3332

ci/dockerfiles/builder.Dockerfile

Lines changed: 1 addition & 1 deletion
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 GOPROXY=https://proxy.golang.org/
55

66
COPY . .
77

ci/prow.Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Makefile specifically intended for use in prow/api-ci only.
22

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

76
build:

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +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
2726
export GOPROXY=https://proxy.golang.org
2827
operator-sdk migrate
2928

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ 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
16+
export GOPROXY=https://proxy.golang.org
1717
operator-sdk migrate
1818

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

hack/tests/e2e-ansible.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ echo "### Base image testing passed"
169169
echo "### Now testing migrate to hybrid operator"
170170
echo "###"
171171

172-
export GO111MODULE=on
172+
export GOPROXY=https://proxy.golang.org
173173
operator-sdk migrate --repo=github.com/example-inc/memcached-operator
174174

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

hack/tests/e2e-helm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ echo "### Base image testing passed"
150150
echo "### Now testing migrate to hybrid operator"
151151
echo "###"
152152

153-
export GO111MODULE=on
153+
export GOPROXY=https://proxy.golang.org
154154
operator-sdk migrate --repo=github.com/example-inc/nginx-operator
155155

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

hack/tests/scaffolding/scaffold-memcached.go

Lines changed: 0 additions & 4 deletions
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)