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

Add Kubernetes host to the no proxy list #1800

Merged
merged 2 commits into from
Jan 18, 2024
Merged

Add Kubernetes host to the no proxy list #1800

merged 2 commits into from
Jan 18, 2024

Conversation

vinokurig
Copy link
Contributor

What does this PR do?

Add Kubernetes host to the no proxy list

Screenshot/screencast of this PR

What issues does this PR fix or reference?

https://issues.redhat.com/browse/CRW-5421

How to test this PR?

  1. Prepare a patch file if needed:
cat > /tmp/cr-patch.yaml <<EOF
apiVersion: org.eclipse.che/v2
kind: CheCluster
spec: {}
EOF
  1. Deploy the operator:

OpenShift

./build/scripts/olm/test-catalog-from-sources.sh --cr-patch-yaml /tmp/cr-patch.yaml

on Minikube

./build/scripts/minikube-tests/test-operator-from-sources.sh --cr-patch-yaml /tmp/cr-patch.yaml
  1. Start a workspace
  2. Open a terminal and run env | grep NO_PROXY

See: 172.30.0.1 is included to the no proxy env variable.

PR Checklist

As the author of this Pull Request I made sure that:

Reviewers

Reviewers, please comment how you tested the PR when approving it.

tolusha
tolusha reviewed Jan 18, 2024
View reviewed changes
controllers/che/proxy.go Outdated
Comment on lines 62 to 63
clusterWideProxyConf.NoProxy = deploy.MergeNonProxy(clusterWideProxyConf.NoProxy, cheClusterProxyConf.NoProxy)
return clusterWideProxyConf, nil
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
clusterWideProxyConf.NoProxy = deploy.MergeNonProxy(clusterWideProxyConf.NoProxy, cheClusterProxyConf.NoProxy)
return clusterWideProxyConf, nil
}
clusterWideProxyConf.NoProxy = deploy.MergeNonProxy(clusterWideProxyConf.NoProxy, cheClusterProxyConf.NoProxy)
}
return clusterWideProxyConf, nil

tolusha
tolusha reviewed Jan 18, 2024
View reviewed changes
pkg/deploy/proxy.go Outdated
Comment on lines 125 to 127
if noProxy1 == "" && noProxy2 == "" {
return ""
} else if noProxy1 == "" {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My mistake, pls revert.
Everything looks good here.

@vinokurig vinokurig force-pushed the CRW-5421 branch 2 times, most recently from c16a638 to 1359043 Compare January 18, 2024 15:26
@openshift-ci openshift-ci bot added the lgtm label Jan 18, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jan 18, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: tolusha, vinokurig

The full list of commands accepted by this bot can be found 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
Copy link

openshift-ci bot commented Jan 18, 2024

@vinokurig: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/v14-devworkspace-happy-path 23d6fb3 link true /test v14-devworkspace-happy-path
ci/prow/v14-upgrade-stable-to-next 23d6fb3 link true /test v14-upgrade-stable-to-next
ci/prow/v14-che-behind-proxy 23d6fb3 link true /test v14-che-behind-proxy
ci/prow/v14-operator-test 23d6fb3 link true /test v14-operator-test

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@vinokurig vinokurig merged commit 7c7bd4f into main Jan 18, 2024
17 of 21 checks passed
@vinokurig vinokurig deleted the CRW-5421 branch January 18, 2024 18:06
@devstudio-release
Copy link

Build 3.12 :: operator_3.x/339: Console, Changes, Git Data

vinokurig added a commit that referenced this pull request Jan 18, 2024
@vinokurig
Add Kubernetes host to the no proxy list (#1800)
52ef393 
Add Kubernetes host to the no proxy list
@devstudio-release
Copy link

Build 3.12 :: sync-to-downstream_3.x/5992: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: get-sources-rhpkg-container-build_3.x/5859: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: push-latest-container-to-quay_3.x/4187: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: get-sources-rhpkg-container-build_3.x/5859: SUCCESS

devspaces-operator : 3.x :: Build 58193016 : quay.io/devspaces/devspaces-rhel8-operator:3.12-10
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.x/4187 triggered

@devstudio-release
Copy link

Build 3.12 :: update-digests_3.x/5593: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: operator_3.x/339: SUCCESS

Upstream sync done; /DS_CI/sync-to-downstream_3.x/5992 triggered

@devstudio-release
Copy link

Build 3.12 :: operator-bundle_3.x/2557: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: sync-to-downstream_3.x/5993: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: get-sources-rhpkg-container-build_3.x/5860: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: get-sources-rhpkg-container-build_3.x/5879: SUCCESS

devspaces-operator-bundle : 3.x :: Build 58246893 : quay.io/devspaces/devspaces-operator-bundle:3.12-118
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.x/4197 triggered;
Bundle CSV related images:
- quay.io/devspaces/code-rhel8:3.12-38
- quay.io/devspaces/configbump-rhel8:3.12-6
- quay.io/devspaces/dashboard-rhel8:3.12-22
- quay.io/devspaces/devfileregistry-rhel8:3.12-59
- quay.io/devspaces/devspaces-rhel8-operator:3.12-10
- quay.io/devspaces/idea-rhel8:3.12-6
- quay.io/devspaces/pluginregistry-rhel8:3.12-13
- quay.io/devspaces/server-rhel8:3.12-26
- quay.io/devspaces/traefik-rhel8:3.12-9
- quay.io/devspaces/udi-rhel8:3.12-9
= registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.12.0-202401101650.p0.gb17014f.assembly.stream
= registry.redhat.io/openshift4/ose-oauth-proxy:v4.12.0-202401101650.p0.g03e5b13.assembly.stream
= registry.redhat.io/rhscl/mongodb-36-rhel7:1-50
= registry.redhat.io/ubi8/ubi-minimal:8.8-1072.1697626218

@devstudio-release
Copy link

Build 3.12 :: sync-to-downstream_3.x/6010: SUCCESS

Build container: devspaces-operator-bundle synced; /DS_CI/get-sources-rhpkg-container-build_3.x/5879 triggered; /job/DS_CI/job/dsc_3.x triggered;

@devstudio-release
Copy link

Build 3.12 :: operator-bundle_3.x/2561: SUCCESS

Upstream sync done; /DS_CI/sync-to-downstream_3.x/6010 triggered

@devstudio-release
Copy link

Build 3.12 :: dsc_3.x/1757: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: operator_3.x/340: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: sync-to-downstream_3.x/6017: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: get-sources-rhpkg-container-build_3.x/5886: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: push-latest-container-to-quay_3.x/4202: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: get-sources-rhpkg-container-build_3.x/5886: SUCCESS

devspaces-operator : 3.x :: Build 58249613 : quay.io/devspaces/devspaces-rhel8-operator:3.12-11
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.x/4202 triggered

@devstudio-release
Copy link

Build 3.12 :: operator_3.x/340: SUCCESS

Upstream sync done; /DS_CI/sync-to-downstream_3.x/6017 triggered

@devstudio-release
Copy link

Build 3.12 :: update-digests_3.x/5618: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: update-digests_3.x/5618: UNSTABLE

No new images detected: nothing to do!

@devstudio-release
Copy link

Build 3.12 :: operator-bundle_3.x/2564: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: sync-to-downstream_3.x/6023: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: get-sources-rhpkg-container-build_3.x/5893: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: push-latest-container-to-quay_3.x/4210: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: get-sources-rhpkg-container-build_3.x/5893: SUCCESS

devspaces-operator-bundle : 3.x :: Build 58250058 : quay.io/devspaces/devspaces-operator-bundle:3.12-121
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.x/4210 triggered;
Bundle CSV related images:
- quay.io/devspaces/code-rhel8:3.12-38
- quay.io/devspaces/configbump-rhel8:3.12-7
- quay.io/devspaces/dashboard-rhel8:3.12-23
- quay.io/devspaces/devfileregistry-rhel8:3.12-60
- quay.io/devspaces/devspaces-rhel8-operator:3.12-11
- quay.io/devspaces/idea-rhel8:3.12-6
- quay.io/devspaces/pluginregistry-rhel8:3.12-14
- quay.io/devspaces/server-rhel8:3.12-27
- quay.io/devspaces/traefik-rhel8:3.12-10
- quay.io/devspaces/udi-rhel8:3.12-10
= registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.12.0-202401101650.p0.gb17014f.assembly.stream
= registry.redhat.io/openshift4/ose-oauth-proxy:v4.12.0-202401101650.p0.g03e5b13.assembly.stream
= registry.redhat.io/rhscl/mongodb-36-rhel7:1-50
= registry.redhat.io/ubi8/ubi-minimal:8.8-1072.1697626218

@devstudio-release
Copy link

Build 3.12 :: sync-to-downstream_3.x/6023: SUCCESS

Build container: devspaces-operator-bundle synced; /DS_CI/get-sources-rhpkg-container-build_3.x/5893 triggered; /job/DS_CI/job/dsc_3.x triggered;

@devstudio-release
Copy link

Build 3.12 :: operator-bundle_3.x/2564: SUCCESS

Upstream sync done; /DS_CI/sync-to-downstream_3.x/6023 triggered

@devstudio-release
Copy link

Build 3.12 :: copyIIBsToQuay/2431: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: dsc_3.x/1760: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: operator-bundle_3.x/2566: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: sync-to-downstream_3.x/6028: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: get-sources-rhpkg-container-build_3.x/5898: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: push-latest-container-to-quay_3.x/4214: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: copyIIBsToQuay/2433: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.12 :: get-sources-rhpkg-container-build_3.x/5898: SUCCESS

devspaces-operator-bundle : 3.x :: Build 58252601 : quay.io/devspaces/devspaces-operator-bundle:3.12-123
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.x/4214 triggered;
Bundle CSV related images:
- quay.io/devspaces/code-rhel8:3.12-38
- quay.io/devspaces/configbump-rhel8:3.12-7
- quay.io/devspaces/dashboard-rhel8:3.12-23
- quay.io/devspaces/devfileregistry-rhel8:3.12-61
- quay.io/devspaces/devspaces-rhel8-operator:3.12-11
- quay.io/devspaces/idea-rhel8:3.12-7
- quay.io/devspaces/pluginregistry-rhel8:3.12-14
- quay.io/devspaces/server-rhel8:3.12-27
- quay.io/devspaces/traefik-rhel8:3.12-10
- quay.io/devspaces/udi-rhel8:3.12-10
= registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.12.0-202401101650.p0.gb17014f.assembly.stream
= registry.redhat.io/openshift4/ose-oauth-proxy:v4.12.0-202401101650.p0.g03e5b13.assembly.stream
= registry.redhat.io/rhscl/mongodb-36-rhel7:1-50
= registry.redhat.io/ubi8/ubi-minimal:8.8-1072.1697626218

@devstudio-release
Copy link

Build 3.12 :: sync-to-downstream_3.x/6028: SUCCESS

Build container: devspaces-operator-bundle synced; /DS_CI/get-sources-rhpkg-container-build_3.x/5898 triggered; /job/DS_CI/job/dsc_3.x triggered;

@devstudio-release
Copy link

Build 3.12 :: operator-bundle_3.x/2566: SUCCESS

Upstream sync done; /DS_CI/sync-to-downstream_3.x/6028 triggered

@devstudio-release
Copy link

Build 3.12 :: dsc_3.x/1762: Console, Changes, Git Data

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tolusha tolusha tolusha approved these changes

@nickboldt nickboldt Awaiting requested review from nickboldt

@ibuziuk ibuziuk Awaiting requested review from ibuziuk ibuziuk is a code owner

@l0rd l0rd Awaiting requested review from l0rd

Assignees

@tolusha tolusha

Labels
lgtm
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@vinokurig @devstudio-release @tolusha