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

Inject Trusted CA on Notebook CR #252

Merged
merged 5 commits into from
Mar 1, 2024
Merged

Inject Trusted CA on Notebook CR #252

merged 5 commits into from
Mar 1, 2024

Conversation

atheo89
Copy link
Member

@atheo89 atheo89 commented Feb 15, 2024

Related to: https://issues.redhat.com/browse/RHOAIENG-1848

Description

This PR setup odh-notebook-controller to mount the certs set by the odh-operator platform manager and removes the support for cluster proxy. Ref link: #43
OCP Doc

How Has This Been Tested?

  1. Modify odh-notebook-controller deployment yaml with this image: quay.io/opendatahub/odh-notebook-controller:pr-252
  2. Check if your operator DSCI that manages injection of trusted-ca bundle configmap in namepaces is set up with the following. Ref: Add Trusted Bundle Configmap to all namespaces opendatahub-operator#848 has been merged.
spec:
  trustedCABundle:
    managementState: Managed
    customCABundle: ""

If is not created the ConfigMap you may do it manually like bellow:
oc create configmap odh-trusted-ca-bundle
oc label configmap odh-trusted-ca-bundle config.openshift.io/inject-trusted-cabundle="true"

  1. Create a new workbench and check if the ca-bundle has been mounted
    image

Merge criteria:

  • The commits are squashed in a cohesive manner and have meaningful messages.
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has manually tested the changes and verified that the changes work

Copy link

openshift-ci bot commented Feb 15, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@atheo89
Copy link
Member Author

atheo89 commented Feb 15, 2024

/test all

1 similar comment
@atheo89
Copy link
Member Author

atheo89 commented Feb 20, 2024

/test all

@atheo89 atheo89 marked this pull request as ready for review February 20, 2024 09:11
@openshift-ci openshift-ci bot requested review from harshad16 and LaVLaS February 20, 2024 09:11
Copy link

@rkpattnaik780 rkpattnaik780 left a comment

Choose a reason for hiding this comment

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

Thanks a lot for the PR @atheo89 🎉 .
The versification steps work for me. Have dropped few questions/suggestions.

@atheo89
Copy link
Member Author

atheo89 commented Feb 27, 2024

Hey @VaishnaviHire , would you mind casting an eye over this PR? Since you're an OLM expert and x-kbnc dev 🙂

Copy link
Member

@harshad16 harshad16 left a comment

Choose a reason for hiding this comment

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

please take a look at the suggestions
and also i tried this
harshad16@b574862

not successfully tested,
please check with other components users to get the details.

@VaishnaviHire
Copy link
Member

Thanks for the changes @atheo89.

/lgtm

Just one question around validation https://github.com/opendatahub-io/kubeflow/pull/252/files#r1506341414

Copy link
Member

@harshad16 harshad16 left a comment

Choose a reason for hiding this comment

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

require few more changes

@openshift-ci openshift-ci bot removed the lgtm label Feb 29, 2024
Copy link
Member

@harshad16 harshad16 left a comment

Choose a reason for hiding this comment

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

some more change required

@atheo89
Copy link
Member Author

atheo89 commented Feb 29, 2024

/test odh-notebook-controller-unit

Copy link
Member

@harshad16 harshad16 left a comment

Choose a reason for hiding this comment

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

some minor changes

@atheo89
Copy link
Member Author

atheo89 commented Mar 1, 2024

/test odh-notebook-controller-e2e

Copy link

openshift-ci bot commented Mar 1, 2024

@atheo89: The following test 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/odh-notebook-controller-e2e 36e6ea2 link true /test odh-notebook-controller-e2e

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.

Copy link
Member

@harshad16 harshad16 left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

thanks for all the work 💯

@openshift-ci openshift-ci bot added the lgtm label Mar 1, 2024
Copy link

openshift-ci bot commented Mar 1, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: harshad16

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 label Mar 1, 2024
@harshad16 harshad16 merged commit e4ebbb8 into opendatahub-io:v1.7-branch Mar 1, 2024
4 of 6 checks passed
@harshad16
Copy link
Member

/cherrypick stable

@openshift-cherrypick-robot

@harshad16: #252 failed to apply on top of branch "stable":

Applying: Remove cluster proxy support
Using index info to reconstruct a base tree...
M	components/odh-notebook-controller/controllers/notebook_controller.go
M	components/odh-notebook-controller/controllers/notebook_webhook.go
Falling back to patching base and 3-way merge...
Auto-merging components/odh-notebook-controller/controllers/notebook_webhook.go
CONFLICT (content): Merge conflict in components/odh-notebook-controller/controllers/notebook_webhook.go
Auto-merging components/odh-notebook-controller/controllers/notebook_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Remove cluster proxy support
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:

/cherrypick stable

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants