RHOAIENG-8450: feat(odh-notebook-controller): add back notebook container envs var from central proxy configs #326
Conversation
|
Hi @shalberd. Thanks for your PR. I'm waiting for a opendatahub-io member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. 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. |
|
/ok-to-test |
Agreed, for tracking, I created issue kubeflow#344 |
|
Hi @shalberd could you rebase your PR when you get a chance please? There have been many changes since it was opened :) Current built image of this implementation is here: |
|
Hi @atheo89 I don't get the message that my forked branch is out of date compared to base branch, so I cannot rebase via GUI https://stackoverflow.com/questions/69839124/update-branch-with-rebase-instead-of-merge Also, changes since April upstream in v1.7 branch (your odh-io/kubeflow commits ahead shown here: shalberd/kubeflow@add_back_default_proxy_env_vars_from_openshift_central_proxy_config...opendatahub-io:kubeflow:v1.7-branch Is a rebase really necessary here? If yes, then yes, I'll rebase via command line and in a home network this evening. |
|
/retest |
shalberd
force-pushed
the
add_back_default_proxy_env_vars_from_openshift_central_proxy_config
branch
from
7401baf to
83f0f33
Compare
@atheo89 ok, I see where you're coming from ... the whole pull request image build process and so on. https://quay.io/repository/opendatahub/odh-notebook-controller?tab=tags&tag=pr-326 Current built image by digest:
i.e. when used by kustomization.yaml, replace newTag line with
there are a couple of golang x/net vulnerabilities related to http2, but that is best done and looked at in a separately. Ah, I guess depend-a-bot already created a PR #324 |
|
Here's a tracking jira for it, https://issues.redhat.com/browse/RHOAIENG-8450 /lgtm |
|
@harshad16 ready to merge? This PR here is exclusively about proxy env var and value injection |
Hey @shalberd , i will get this prioritized for next week 👍 |
|
/cherrypick v1.9-branch |
|
@jiridanek: once the present PR merges, I will cherry-pick it on top of v1.9-branch in a new PR and assign it to you. In response to this:
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-sigs/prow repository. |
|
/cherrypick stable |
|
@jiridanek: once the present PR merges, I will cherry-pick it on top of stable in a new PR and assign it to you. In response to this:
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-sigs/prow repository. |
|
/retitle RHOAIENG-8450: feat(odh-notebook-controller): add back notebook container envs var from central proxy configs |
openshift-ci
bot
changed the title
|
shall I change this PR to v1.9 branch? |
|
no, against the i don't have any news about the odh/rhoai version this will be scheduled for, still |
No problem, just wanted to prepare, given that you work with 2 branches now and cherry-picking. |
…o notebook containers have HTTP_PROXY, HTTPS_PROXY, NO_PROXY env vars injected if central cluster proxy config exists
shalberd
force-pushed
the
add_back_default_proxy_env_vars_from_openshift_central_proxy_config
branch
from
83f0f33 to
8fce111
Compare
|
New changes are detected. LGTM label has been removed. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jiridanek 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 |
|
@jiridanek @atheo89 @harshad16 this is a little related to the notebook-images R studio env var PR opendatahub-io/notebooks/issues/795 I rebased this PR to be up to date with the latest main branch changes in kubeflow itself. new image is Like I think you took care of the notebook restart concern with this commit a few weeks ago: This controller feature, adding proxy env vars to workbenches / notebooks if so specified at cluster-level proxy config, is one of the issues that is keeping me from upgrading from ODH 1.x to 2.x :-) |
| // Create the mutated notebook object | ||
| } | ||
| // Create the mutated notebook object |
There was a problem hiding this comment.
@jiridanek no idea why the diff tools thinks there is a diff here ... all I did was rebase with main and resolve some merge conflicts
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #326 +/- ##
===========================================
+ Coverage 55.27% 68.29% +13.02%
===========================================
Files 9 7 -2
Lines 2276 1394 -882
===========================================
- Hits 1258 952 -306
+ Misses 922 376 -546
+ Partials 96 66 -30 ☔ View full report in Codecov by Sentry. |
|
Woot! Coverage! 🎉 |
very nice, I will have to make myself more familiar with the findings. From your perspective, did I leave out anything by error in this PR when resolving diffs, or is all ok? I only took, like ClusterWideProxyIsEnabled, what someone else wrote wayyy back then ;-) Just Management Information Systems major, no code geek (yet) :-) Sven |
/fixes #291
notebook containers have HTTP_PROXY, HTTPS_PROXY, NO_PROXY env vars injected if central cluster proxy config exists
Description
During the last round of updates related to CA trust, code was removed that looks for an openshift central proxy config and adds the centrally configured values for HTTP_PROXY, HTTPS_PROXY, NO_PROXY
How Has This Been Tested?
not tested yet, I'd take the built image from quay.io and test whether the three variables appear in my notebooks / workbench containers.
Merge criteria: