Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Merge pull request #13674 from cblecker/revert-13648" #13686

Merged
merged 1 commit into from
Jul 31, 2019
Merged

Revert "Merge pull request #13674 from cblecker/revert-13648" #13686

merged 1 commit into from
Jul 31, 2019

Conversation

cblecker
Copy link
Member

This reverts commit 028b90c, reversing
changes made to a8aa5df.

This re-enables the GOPROXY env var.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 30, 2019
@cblecker
Copy link
Member Author

/hold
Pending kubernetes/kubernetes#80732

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. area/config Issues or PRs related to code in /config area/prow Issues or PRs related to prow sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels Jul 30, 2019
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 30, 2019
@cblecker cblecker mentioned this pull request Jul 30, 2019
Merged
@cblecker cblecker force-pushed the revert-revert-13648 branch from f9b2f97 to 66c39e9 Compare July 31, 2019 19:53
@cblecker
Copy link
Member Author

kubernetes/kubernetes#80732 merged. Should be good to merge this.

@BenTheElder
Copy link
Member

can we verify locally that HEAD has all of the right tags now w/ the proxy enabled locally? that took a while to patch last time

@cblecker
Copy link
Member Author

@BenTheElder I've validated locally at current k/k head: kubernetes/kubernetes@a9a68c5

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 31, 2019
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: df18931deb4c308a5589c065e7573a0a493d7cde

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder, cblecker

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@cblecker
Copy link
Member Author

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 31, 2019
@k8s-ci-robot k8s-ci-robot merged commit 66dc129 into kubernetes:master Jul 31, 2019
@k8s-ci-robot k8s-ci-robot added this to the v1.16 milestone Jul 31, 2019
@k8s-ci-robot
Copy link
Contributor

@cblecker: Updated the following 2 configmaps:

  • job-config configmap in namespace default using the following files:
    • key generated-security-jobs.yaml using file config/jobs/kubernetes-security/generated-security-jobs.yaml
    • key dependencies.yaml using file config/jobs/kubernetes/sig-testing/dependencies.yaml
  • config configmap in namespace default using the following files:
    • key config.yaml using file prow/config.yaml

In response to this:

This reverts commit 028b90c, reversing
changes made to a8aa5df.

This re-enables the GOPROXY env var.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@cblecker cblecker deleted the revert-revert-13648 branch July 31, 2019 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BenTheElder BenTheElder BenTheElder approved these changes

@alvaroaleman alvaroaleman Awaiting requested review from alvaroaleman

@matthyx matthyx Awaiting requested review from matthyx

Assignees

@BenTheElder BenTheElder

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/config Issues or PRs related to code in /config area/prow Issues or PRs related to prow cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.16
Development

Successfully merging this pull request may close these issues.
3 participants
@cblecker @BenTheElder @k8s-ci-robot