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.

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

Bug 2005805: Clear proxy env variables if go would have #72

Merged

Conversation

derekhiggins
Copy link
Contributor

Clear proxy env variables if go would have

curl interpretes the various proxy related env variables
differently to the golang http library. Add a small utility
to test what golang would have done and clear the proxy
variables if appropriate.

This will better match how proxies are handled in the cluster
and whats documented.

Also cherry-pick of af79eb4 which
changes where the utility if built (so it doesn't break in ART)

curl interpretes the various proxy related env variables
differently to the golang http library. Add a small utility
to test what golang would have done and clear the proxy
variables if appropriate.

This will better match how proxies are handled in the cluster
and whats documented.
The default workdir in the base image is different
to the one in the image used by ART. Set it to '/tmp'
to be consistent in both cases.
@openshift-ci openshift-ci bot added bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Nov 16, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 16, 2021

@derekhiggins: This pull request references Bugzilla bug 2005805, which is invalid:

  • expected Bugzilla bug 2005805 to depend on a bug targeting a release in 4.9.0, 4.9.z and in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE), but no dependents were found

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 2005805: Clear proxy env variables if go would have

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.

@derekhiggins
Copy link
Contributor Author

/bugzilla refresh

@openshift-ci openshift-ci bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Nov 16, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 16, 2021

@derekhiggins: This pull request references Bugzilla bug 2005805, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

6 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.8.z) matches configured target release for branch (4.8.z)
  • bug is in the state NEW, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)
  • dependent bug Bugzilla bug 2020546 is in the state VERIFIED, which is one of the valid states (VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), CLOSED (CURRENTRELEASE))
  • dependent Bugzilla bug 2020546 targets the "4.9.z" release, which is one of the valid target releases: 4.9.0, 4.9.z
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (vvoronko@redhat.com), skipping review request.

In response to this:

/bugzilla refresh

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.

@derekhiggins
Copy link
Contributor Author

Will also need openshift-eng/ocp-build-data#1169

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 16, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekhiggins

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 16, 2021
@dtantsur
Copy link
Member

/lgtm
/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Nov 16, 2021
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 16, 2021
@sosiouxme
Copy link
Member

openshift-eng/ocp-build-data#1169 is followup for ART config

@lshilin-r
Copy link

/label cherry-pick-approved

@openshift-ci openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 13, 2021
@openshift-merge-robot openshift-merge-robot merged commit dceaf13 into openshift:release-4.8 Dec 13, 2021
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Dec 13, 2021

@derekhiggins: All pull requests linked via external trackers have merged:

Bugzilla bug 2005805 has been moved to the MODIFIED state.

In response to this:

Bug 2005805: Clear proxy env variables if go would have

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.

@elfosardo
Copy link
Contributor

/cherry-pick release-4.7

@openshift-cherrypick-robot

@elfosardo: #72 failed to apply on top of branch "release-4.7":

Applying: Clear proxy env variables if go would have
Using index info to reconstruct a base tree...
M	Dockerfile.ocp
M	get-resource.sh
Falling back to patching base and 3-way merge...
Auto-merging get-resource.sh
CONFLICT (content): Merge conflict in get-resource.sh
Auto-merging Dockerfile.ocp
CONFLICT (content): Merge conflict in Dockerfile.ocp
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Clear proxy env variables if go would have
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.7

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.

@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ironic-rhcos-downloader-container-v4.8.0-202311261141.p0.gdceaf13.assembly.stream for distgit ironic-rhcos-downloader.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants