From 2fdd9cc7a1346dba09f34aee6b2bbb1b7efba792 Mon Sep 17 00:00:00 2001 From: Christoph Blecker Date: Mon, 29 Jul 2019 18:59:17 -0700 Subject: [PATCH] Revert "Merge pull request #13648 from cblecker/default-goproxy" This reverts commit b84ad085016ff1d420adfcde826e41e0ae64e5fc, reversing changes made to 57a4dc63b456fffea2d515c3ee28afd56ae8e785. --- config/jobs/kubernetes-security/generated-security-jobs.yaml | 4 ++++ config/jobs/kubernetes/sig-testing/dependencies.yaml | 4 ++++ prow/config.yaml | 4 ---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/jobs/kubernetes-security/generated-security-jobs.yaml b/config/jobs/kubernetes-security/generated-security-jobs.yaml index 031277d8598d..2770bb5ac171 100644 --- a/config/jobs/kubernetes-security/generated-security-jobs.yaml +++ b/config/jobs/kubernetes-security/generated-security-jobs.yaml @@ -3784,6 +3784,10 @@ presubmits: env: - name: WHAT value: vendor vendor-licenses + - name: GOPROXY + value: https://proxy.golang.org + - name: GOSUMDB + value: sum.golang.org image: gcr.io/k8s-testimages/kubekins-e2e:v20190726-d319b3f-master name: main resources: {} diff --git a/config/jobs/kubernetes/sig-testing/dependencies.yaml b/config/jobs/kubernetes/sig-testing/dependencies.yaml index fb33be8c7c08..69d452b1f43f 100644 --- a/config/jobs/kubernetes/sig-testing/dependencies.yaml +++ b/config/jobs/kubernetes/sig-testing/dependencies.yaml @@ -83,6 +83,10 @@ presubmits: # Space separated list of the checks to run - name: WHAT value: "vendor vendor-licenses" + - name: GOPROXY + value: https://proxy.golang.org + - name: GOSUMDB + value: sum.golang.org annotations: testgrid-create-test-group: 'true' - name: pull-kubernetes-godeps diff --git a/prow/config.yaml b/prow/config.yaml index a5fe738bb6f3..2c4c308d3cfc 100644 --- a/prow/config.yaml +++ b/prow/config.yaml @@ -635,7 +635,3 @@ presets: hostPath: path: /sys/fs/cgroup type: Directory -# enable GOPROXY by default -- env: - - name: GOPROXY - value: "https://proxy.golang.org"