Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

feat: Global HTTP proxy support #2858

Merged
merged 31 commits into from
Jan 12, 2022
Merged

feat: Global HTTP proxy support #2858

merged 31 commits into from
Jan 12, 2022

Conversation

astefanutti
Copy link
Member

@astefanutti astefanutti commented Jan 7, 2022 •
edited
Loading

This PR applies the HTTP proxy configuration, provided by users, or system-wide controllers, via the HTTP_PROXY, HTTPS_PROXY and NO_PROXY environment variables, to all the workloads managed by the Camel K operator.

In order to configure the Maven processes accordingly, this PR rationalises the management of the user vs. platform Maven settings. The later is now generated from the IntegrationPlatform and other environment variables, into global settings, while the user settings are left untouched. The merging of both settings is delegated to Maven, thus relying on its de-facto standard mechanism.

Fixes #2777
Fixes #1402

Release Note

feat: Global HTTP proxy support

@astefanutti astefanutti added the kind/feature New feature or request label Jan 7, 2022
squakez
squakez reviewed Jan 10, 2022
View reviewed changes
Copy link
Contributor

@squakez squakez left a comment

Choose a reason for hiding this comment

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

Great work! I've added some minor comments to the review. One last thing, I'd like to see some little documentation reflected. This is a nice user feature and we should not miss to document how to use it.

@astefanutti astefanutti added the status/wip Work in progress label Jan 10, 2022
@squakez
Copy link
Contributor

squakez commented Jan 10, 2022

Great work! I've added some minor comments to the review. One last thing, I'd like to see some little documentation reflected. This is a nice user feature and we should not miss to document how to use it.

Sorry, I did not read the TODO list :) I'll have a further look when complete

@astefanutti
feat(maven): Support platform Maven settings
2be1371
@astefanutti
feat(maven): Honor proxy environment variables
510eda9
@astefanutti
chore(maven): Default to standard HTTP and HTTPS port numbers
54719cc
@astefanutti
chore(maven): Set Maven proxy ID in global settings
fe4173b
@astefanutti
chore(maven): Convert NO_PROXY to http.nonProxyHosts JVM system prope…
71d68eb 
…rty format
@astefanutti
feat(maven): HTTP proxy e2e tests
f21e5e7
@astefanutti
fix(proxy): HTTPS proxy can use HTTP scheme
0a0ab99
@astefanutti
chore(e2e): Set NO_PROXY with the Kubernetes service cluster IPs
6b990c5
@astefanutti
chore(maven): Add default Maven repositories to global settings
9897d35
@astefanutti
chore(maven): Separate user and platform Maven settings
d17b584
@astefanutti
chore(api): Remove Maven repositories from the platform API
80c7045
@astefanutti
chore: Fix lints
d82ef74
@astefanutti
chore(maven): Unify settings API
daa85f2
@astefanutti
chore(e2e): Add extra RBAC permissions for the HTTP proxy tests
72a5ab8
@astefanutti
feat(trait): Propagate HTTP proxy env variables to integration Pods
9481320
@astefanutti
chore(e2e): Add environment trait e2e tests
dc95f05
@astefanutti
feat(jvm): Translate HTTP proxy env variables into system properties
113c835
@astefanutti
chore(jvm): Fail fast when no integration container is found
92b0700
@astefanutti
chore(jvm): Rely on default JVM HTTP proxy port numbers
a10e962
@astefanutti
fix(jvm): NO_PROXY translates to -Dhttp.nonProxyHosts
fb364c1
@astefanutti
fix(jvm): Quote HTTP proxy system property values
8c6a508
@astefanutti
fix(e2e): Add Maven repositories to NO_PROXY
756ab3c
@astefanutti
fix(e2e): Add container registry to NO_PROXY
71ad098
@astefanutti
feat: Propagate HTTP proxy environment to build Pods
f12f0f3
@astefanutti
fix(e2e): assert downward API in environment trait tests
cd342a9
@astefanutti
chore(api): Remove HTTP proxy Secret
f4db1a1
@astefanutti astefanutti removed the status/wip Work in progress label Jan 12, 2022
@astefanutti
Copy link
Member Author

Great work! I've added some minor comments to the review. One last thing, I'd like to see some little documentation reflected. This is a nice user feature and we should not miss to document how to use it.

Sorry, I did not read the TODO list :) I'll have a further look when complete

@squakez this is ready in case you want to have another look.

@astefanutti astefanutti mentioned this pull request Jan 12, 2022
Closed
squakez
squakez approved these changes Jan 12, 2022
View reviewed changes
Copy link
Contributor

@squakez squakez left a comment

Choose a reason for hiding this comment

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

Great work! Good to go for me!

@astefanutti astefanutti merged commit 863887e into apache:main Jan 12, 2022
@astefanutti astefanutti deleted the pr-360 branch January 12, 2022 13:51
This was referenced Jan 18, 2022
Merged
Merged
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@squakez squakez squakez approved these changes

Assignees
No one assigned
Labels
kind/feature New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

user provided maven setting are overridden by the camel-k operator Honor cluster PROXY settings
2 participants
@astefanutti @squakez