Skip to content

Merge proxy configs on start when running in OpenShift - #866

Merged
amisevsk merged 1 commit into
devfile:mainfrom
amisevsk:merge-proxy-configs-on-start
Jun 13, 2022
Merged

Merge proxy configs on start when running in OpenShift#866
amisevsk merged 1 commit into
devfile:mainfrom
amisevsk:merge-proxy-configs-on-start

Conversation

@amisevsk

Copy link
Copy Markdown
Collaborator

What does this PR do?

Make sure we merge both the dwoc proxy config and the cluster proxy config on OpenShift to avoid an issue where we ignore the cluster proxy if the dwoc contains a proxy config on start.

What issues does this PR fix or reference?

Closes#865

Is it tested? How?

Use reproducer in issue.

PR Checklist

  • E2E tests pass (when PR is ready, comment /test v8-devworkspace-operator-e2e, v8-che-happy-path to trigger)
    • v8-devworkspace-operator-e2e: DevWorkspace e2e test
    • v8-che-happy-path: Happy path for verification integration with Che

Make sure we merge both the dwoc proxy config and the cluster proxy
config on OpenShift to avoid an issue where we ignore the cluster
proxy if the dwoc contains a proxy config on start.
Signed-off-by: Angel Misevski <amisevsk@redhat.com>
@openshift-ci

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: amisevsk, ibuziuk

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

The pull request process is described here

Details 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

@amisevsk
amisevsk merged commit 033fa05 into devfile:mainJun 13, 2022
@amisevsk
amisevsk deleted the merge-proxy-configs-on-start branch June 13, 2022 13:28
@amisevskamisevsk mentioned this pull request Jul 4, 2022
3 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Incorrect proxy settings read when proxy specified in dwoc at start

2 participants

@amisevsk@ibuziuk