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

manifest readiness update for odh-operator v2 #92

Merged

Conversation

VedantMahabaleshwarkar
Copy link
Contributor

@VedantMahabaleshwarkar VedantMahabaleshwarkar commented Sep 28, 2023

Description

  • copied over the latest odh-model-controller manifests from odh-manifests/odh-model-controller and put them in config/
  • created overlays/odh and overlays/dev to handle the ODH overlays and also have an overlay option for local development
  • removed the need to have 2 copies of odh-model-controller manifests for kserve and modelmesh
    • this is done by removing the need to have a kserve-enabled flag, thus the same set of manifests can be used by both serving stacks

Testing

Follow testing instructions on opendatahub-io/modelmesh-serving#237

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 28, 2023

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

@VedantMahabaleshwarkar
Copy link
Contributor Author

/retest

@heyselbi
Copy link
Contributor

heyselbi commented Oct 1, 2023

Tested using instructions with Vedant's images in operator and in odh-model-controller:

  • modelmesh: passed
  • kserve: passed

@heyselbi
Copy link
Contributor

heyselbi commented Oct 1, 2023

/lgtm

@openshift-ci openshift-ci bot removed the lgtm label Oct 2, 2023
@VedantMahabaleshwarkar
Copy link
Contributor Author

/retest

@heyselbi
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Oct 10, 2023
@heyselbi heyselbi linked an issue Oct 10, 2023 that may be closed by this pull request
Signed-off-by: Vedant Mahabaleshwarkar <vmahabal@redhat.com>
Signed-off-by: Vedant Mahabaleshwarkar <vmahabal@redhat.com>
Copy link
Contributor

@israel-hdez israel-hdez left a comment

Choose a reason for hiding this comment

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

I'm seeing two main differences, when comparing to odh-manifests:

  • Here, there is a new kserve-prometheus-k8s ClusterRole. Is it correct to be creating this resources?
  • In this PR, there is no ServiceMonitor. Is it OK to omit this resource?
  • $(monitoring-namespace) variable is not being replaced correctly.

@VedantMahabaleshwarkar
Copy link
Contributor Author

@israel-hdez

Here, there is a new kserve-prometheus-k8s ClusterRole. Is it correct to be creating this resources?

This clusterrole was created for kserve, it was added in the kserve copy of odh-model-controller manifests, you can find it here

In this PR, there is no ServiceMonitor. Is it OK to omit this resource?

ServiceMonitor was already in config/prometheus/monitor.yaml so did not need to add it in this PR again

$(monitoring-namespace) variable is not being replaced correctly

will take a look

@israel-hdez
Copy link
Contributor

ServiceMonitor was already in config/prometheus/monitor.yaml so did not need to add it in this PR again

I was meaning that it is missing in the resulting manifests, not that is missing in the code.

@VedantMahabaleshwarkar
Copy link
Contributor Author

I was meaning that it is missing in the resulting manifests, not that is missing in the code.

@israel-hdez I see the servicemonitor being generated when I run kustomize build . in config/base. You can see it in the generated output here

@israel-hdez
Copy link
Contributor

@israel-hdez I see the servicemonitor being generated when I run kustomize build . in config/base. You can see it in the generated output here

OK, so config/base is the entrypoint. I was using another entrypoint.

With this, I'm seeing only 2 issues:

  • $(monitoring-namespace) variable is not being replaced correctly (which I mentioned earlier)
  • A ClusterRoleBinding has a diffferent name:
    • odh-manifests: odh-model-controller-rolebinding-opendatahub
    • here: odh-model-controller-rolebinding (i.e. no suffix)

Signed-off-by: Vedant Mahabaleshwarkar <vmahabal@redhat.com>
@VedantMahabaleshwarkar
Copy link
Contributor Author

@israel-hdez

$(monitoring-namespace) variable is not being replaced correctly (which I mentioned earlier)
A ClusterRoleBinding has a diffferent name:
odh-manifests: odh-model-controller-rolebinding-opendatahub
here: odh-model-controller-rolebinding (i.e. no suffix)

Should be fixed now

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 18, 2023

@VedantMahabaleshwarkar: 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/fvt 0c6c385 link true /test fvt

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
Contributor

@Jooho Jooho left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 19, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: heyselbi, Jooho, VedantMahabaleshwarkar

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:
  • OWNERS [Jooho,VedantMahabaleshwarkar,heyselbi]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@Jooho
Copy link
Contributor

Jooho commented Oct 19, 2023

I will merge this manually because we need to update openshift-ci with this issue

@Jooho
Copy link
Contributor

Jooho commented Oct 19, 2023

image is manually updated too.

  • quay.io/opendatahub/odh-model-controller:fast-0c6c385
  • quay.io/opendatahub/odh-model-controller:fast

@Jooho Jooho merged commit d8bc8ff into opendatahub-io:main Oct 19, 2023
4 of 6 checks passed
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.

Merge kserve and modelmesh deployment modes for odh-model-controller
4 participants