Update odh-manifests 9/17-3 #98
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tmckayus
requested review from
anishasthana and
crobby
and removed request for
vpavlin and
nakfour
|
This should supersede #97 |
crobby
approved these changes
Sep 17, 2021
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: crobby, tmckayus 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 |
zdtsw
added a commit
to zdtsw/opendatahub-operator
that referenced
this pull request
Feb 20, 2024
…s#129) * [cherry-pick]: split workbenches image into 2 params.env file Signed-off-by: Wen Zhou <wenzhou@redhat.com> * Update opendatahub label (cherry picked from commit 3e975f9) (cherry picked from commit 9f8b649) * Update Codeflare manifests path (cherry picked from commit 014396c) (cherry picked from commit 5f1c0d4) * Move creation of default DSC (cherry picked from commit ab33109) (cherry picked from commit 00ddd6c) * update(manifests): enable kserve, modelmesh and workbenches - dashboard and modelmesh-monitoring still from odh-manifests Signed-off-by: Wen Zhou <wenzhou@redhat.com> * Fix cherry-pick for dsci * fix(mm): set the new logic for modelmesh Signed-off-by: Wen Zhou <wenzhou@redhat.com> * Fix the KF deployment: * fix(monitoring): do the switch for dev mode to not send alert Signed-off-by: Wen Zhou <wenzhou@redhat.com> (cherry picked from commit 001cad1) * refactor: reduce alert level for codeflare operator * Update(manifests): for monitoring - remove https:// for dashbaord target - add nwp from odh-deployer - fix: wrong service name for operator, this is defined in CSV - port: do not use https but 8080 Signed-off-by: Wen Zhou <wenzhou@redhat.com> * Fix manifests for monitoring (cherry picked from commit 85883f102bc15f2343c0f6afe253a29a4ff3f64f) * Revert changes to prometheus port Changes to prometheus port makes the route inaccessible * fix rebase * fix(dsci): missing label on namespaces (red-hat-data-services#98) - add SM which is in modelmesh-monitroing into operator monitoring - add roles which are in modelmesh-monitoring into ours too - apply 3 labels to both monitoring and application namespace (which is v1 doing) Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix(monitoring): typo (red-hat-data-services#101) Signed-off-by: Wen Zhou <wenzhou@redhat.com> * update(monitoring) - remove hardcoded app. namespace in segment manifests - remove hardcoded monitoring. namepsace in base manifests - add placeholder to inject monitoring namespace in Servicemonitor Signed-off-by: Wen Zhou <wenzhou@redhat.com> * uplift: package version - github.com/operator-framework/operator-lifecycle-manager/releases/tag/v0.26.0 - github.com/openshift/api to latest v0.0.0 Signed-off-by: Wen Zhou <wenzhou@redhat.com> * Remove odh csv * fix(crd): do not set ownerreference on CRD (opendatahub-io#725) - we covered the case when set component from Managed to Remvoe - this is to cover the case when set have component as Managed and delete DSC CR - so if we do not set at first it wont get deleted Signed-off-by: Wen Zhou <wenzhou@redhat.com> (cherry picked from commit e9461e0) * Fix DSCI Patch * update(monitoring): metrics (red-hat-data-services#107) * update(monitoring): - add log in pod for QE to see it is dev mode cluster - add two metrics: i do not think they are used in this config but they are presented in v1 config , so i add back - move recording for workbench to correct rule file - remove operator-alerting.rules it is not used in v1 to keep it simple - fix: openshift-monitoring is using web as port name and our port - add more comments for the config and comments out not needed config - add egress for odh monitoring and add cluster monitoring NS for ingress - keep rhdos_aggerate_avaiablity from proemtehusrules along with 2 users reason for this is: PSI does not get non openshift-* or kube-* NS metrics to cluster-monitoring prometheus. as cluster-monitoring prometheus-k8s only use prometheusrule not serivcemonitor ? - from test result: if our monitoring ns not set cluster-monitoring, there is no targets on federation2 and no rhods_aggreated_in metrics - fix(monitoring): removed duplicated alerts of dashboard in workbenches - add UWM ns for operator ingress - according to doc: when enable UWM should not have custom Prometheus, this might be the conflicts why we cannot see metrics from odh monitoring in cluster-monitoring prometheus? Signed-off-by: Wen Zhou <wenzhou@redhat.com> * Remove DSCI explicit naming * Fix regression in Prometheus Deployment * Remove os.exit for custom functions * Delete legacy blackbox exporter * fix(monitoring): add missing role and rolebinding for prometheus (red-hat-data-services#112) Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix(monitoring): missing add new files into kustomization (red-hat-data-services#113) Signed-off-by: Wen Zhou <wenzhou@redhat.com> * cleanup(monitoring): after previous 2 commits this is not needed/useful (red-hat-data-services#114) Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix(monitoring): do not set odh monitoring namespace when apply for manifests in "monitoring/base" (red-hat-data-services#115) * fix(monitoring): not set our monitoring when apply to monitoring/base folder - hardcode our monitoring namespace for all needed manifests Signed-off-by: Wen Zhou <wenzhou@redhat.com> * revert: label changes made in upgrade PR Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix(monitoring): cannot load dashbaord record rules (red-hat-data-services#123) Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix(monitoring): when DSC is removed entry in rule_files should be cleanedup - match does not work with * in the string need to use (.*) - add (-) in the front for diffientiate the rule_file or the real rules Signed-off-by: Wen Zhou <wenzhou@redhat.com> * cherry-pick: edson's rhods-12939 from odh + debug + timeout tuning comnent out ExpointialBackoffWithContext for now to test not add v2 into markedDeletion list Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix(upgrade): modelmesh monitoring deployment need deletion as well Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix: add statefulset Signed-off-by: Wen Zhou <wenzhou@redhat.com> * cherrypick: upstream 748 fix no reconcile when no error return Signed-off-by: Wen Zhou <wenzhou@redhat.com> * RHODS-12956: removing CR update from the operator reconciliation loop to avoid infinite loop (red-hat-data-services#128) * chore Signed-off-by: Wen Zhou <wenzhou@redhat.com> --------- Signed-off-by: Wen Zhou <wenzhou@redhat.com> Co-authored-by: Vaishnavi Hire <vhire@redhat.com> Co-authored-by: Dimitri Saridakis <dimitri.saridakis@gmail.com> Co-authored-by: Edson Tirelli <ed.tirelli@gmail.com> (cherry picked from commit 81ebc87)
Jooho
pushed a commit
to Jooho/opendatahub-operator
that referenced
this pull request
Mar 28, 2024
* fix(oauth-dashboard): update APIversion when patch oauth-client (red-hat-data-services#136) add more comment and error message Signed-off-by: Wen Zhou <wenzhou@redhat.com> (cherry picked from commit d688f25) * Update kube-aggregator version (cherry picked from commit a0c7864) * fix(kserve): check on multiple depends operators if all pre-installed (opendatahub-io#744) (red-hat-data-services#119) Signed-off-by: Wen Zhou <wenzhou@redhat.com> (cherry picked from commit 57c4b82) * [backport]: changes from rhods_2.4 to rhods_2.5 (red-hat-data-services#129) * [cherry-pick]: split workbenches image into 2 params.env file Signed-off-by: Wen Zhou <wenzhou@redhat.com> * Update opendatahub label (cherry picked from commit 3e975f9) (cherry picked from commit 9f8b649) * Update Codeflare manifests path (cherry picked from commit 014396c) (cherry picked from commit 5f1c0d4) * Move creation of default DSC (cherry picked from commit ab33109) (cherry picked from commit 00ddd6c) * update(manifests): enable kserve, modelmesh and workbenches - dashboard and modelmesh-monitoring still from odh-manifests Signed-off-by: Wen Zhou <wenzhou@redhat.com> * Fix cherry-pick for dsci * fix(mm): set the new logic for modelmesh Signed-off-by: Wen Zhou <wenzhou@redhat.com> * Fix the KF deployment: * fix(monitoring): do the switch for dev mode to not send alert Signed-off-by: Wen Zhou <wenzhou@redhat.com> (cherry picked from commit 001cad1) * refactor: reduce alert level for codeflare operator * Update(manifests): for monitoring - remove https:// for dashbaord target - add nwp from odh-deployer - fix: wrong service name for operator, this is defined in CSV - port: do not use https but 8080 Signed-off-by: Wen Zhou <wenzhou@redhat.com> * Fix manifests for monitoring (cherry picked from commit 85883f102bc15f2343c0f6afe253a29a4ff3f64f) * Revert changes to prometheus port Changes to prometheus port makes the route inaccessible * fix rebase * fix(dsci): missing label on namespaces (red-hat-data-services#98) - add SM which is in modelmesh-monitroing into operator monitoring - add roles which are in modelmesh-monitoring into ours too - apply 3 labels to both monitoring and application namespace (which is v1 doing) Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix(monitoring): typo (red-hat-data-services#101) Signed-off-by: Wen Zhou <wenzhou@redhat.com> * update(monitoring) - remove hardcoded app. namespace in segment manifests - remove hardcoded monitoring. namepsace in base manifests - add placeholder to inject monitoring namespace in Servicemonitor Signed-off-by: Wen Zhou <wenzhou@redhat.com> * uplift: package version - github.com/operator-framework/operator-lifecycle-manager/releases/tag/v0.26.0 - github.com/openshift/api to latest v0.0.0 Signed-off-by: Wen Zhou <wenzhou@redhat.com> * Remove odh csv * fix(crd): do not set ownerreference on CRD (opendatahub-io#725) - we covered the case when set component from Managed to Remvoe - this is to cover the case when set have component as Managed and delete DSC CR - so if we do not set at first it wont get deleted Signed-off-by: Wen Zhou <wenzhou@redhat.com> (cherry picked from commit e9461e0) * Fix DSCI Patch * update(monitoring): metrics (red-hat-data-services#107) * update(monitoring): - add log in pod for QE to see it is dev mode cluster - add two metrics: i do not think they are used in this config but they are presented in v1 config , so i add back - move recording for workbench to correct rule file - remove operator-alerting.rules it is not used in v1 to keep it simple - fix: openshift-monitoring is using web as port name and our port - add more comments for the config and comments out not needed config - add egress for odh monitoring and add cluster monitoring NS for ingress - keep rhdos_aggerate_avaiablity from proemtehusrules along with 2 users reason for this is: PSI does not get non openshift-* or kube-* NS metrics to cluster-monitoring prometheus. as cluster-monitoring prometheus-k8s only use prometheusrule not serivcemonitor ? - from test result: if our monitoring ns not set cluster-monitoring, there is no targets on federation2 and no rhods_aggreated_in metrics - fix(monitoring): removed duplicated alerts of dashboard in workbenches - add UWM ns for operator ingress - according to doc: when enable UWM should not have custom Prometheus, this might be the conflicts why we cannot see metrics from odh monitoring in cluster-monitoring prometheus? Signed-off-by: Wen Zhou <wenzhou@redhat.com> * Remove DSCI explicit naming * Fix regression in Prometheus Deployment * Remove os.exit for custom functions * Delete legacy blackbox exporter * fix(monitoring): add missing role and rolebinding for prometheus (red-hat-data-services#112) Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix(monitoring): missing add new files into kustomization (red-hat-data-services#113) Signed-off-by: Wen Zhou <wenzhou@redhat.com> * cleanup(monitoring): after previous 2 commits this is not needed/useful (red-hat-data-services#114) Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix(monitoring): do not set odh monitoring namespace when apply for manifests in "monitoring/base" (red-hat-data-services#115) * fix(monitoring): not set our monitoring when apply to monitoring/base folder - hardcode our monitoring namespace for all needed manifests Signed-off-by: Wen Zhou <wenzhou@redhat.com> * revert: label changes made in upgrade PR Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix(monitoring): cannot load dashbaord record rules (red-hat-data-services#123) Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix(monitoring): when DSC is removed entry in rule_files should be cleanedup - match does not work with * in the string need to use (.*) - add (-) in the front for diffientiate the rule_file or the real rules Signed-off-by: Wen Zhou <wenzhou@redhat.com> * cherry-pick: edson's rhods-12939 from odh + debug + timeout tuning comnent out ExpointialBackoffWithContext for now to test not add v2 into markedDeletion list Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix(upgrade): modelmesh monitoring deployment need deletion as well Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix: add statefulset Signed-off-by: Wen Zhou <wenzhou@redhat.com> * cherrypick: upstream 748 fix no reconcile when no error return Signed-off-by: Wen Zhou <wenzhou@redhat.com> * RHODS-12956: removing CR update from the operator reconciliation loop to avoid infinite loop (red-hat-data-services#128) * chore Signed-off-by: Wen Zhou <wenzhou@redhat.com> --------- Signed-off-by: Wen Zhou <wenzhou@redhat.com> Co-authored-by: Vaishnavi Hire <vhire@redhat.com> Co-authored-by: Dimitri Saridakis <dimitri.saridakis@gmail.com> Co-authored-by: Edson Tirelli <ed.tirelli@gmail.com> (cherry picked from commit 81ebc87) (cherry picked from commit 7525f99) * fix(rebase): in previous commits (red-hat-data-services#131) Signed-off-by: Wen Zhou <wenzhou@redhat.com> (cherry picked from commit 15b2db8) (cherry picked from commit 0062ba3) * [rhods-2.5] Add Predicate for Prometheus Configmap (red-hat-data-services#134) * Add Predicate for Prometheus Configmap (cherry picked from commit 35f4136) * fix(linter) Signed-off-by: Wen Zhou <wenzhou@redhat.com> --------- Signed-off-by: Wen Zhou <wenzhou@redhat.com> Co-authored-by: Wen Zhou <wenzhou@redhat.com> (cherry picked from commit 6ecf2b5) (cherry picked from commit deeccb7) * fix(monitoring): only set prometheus as part-of label from component (red-hat-data-services#135) this will reduced necessary updates on configmap Signed-off-by: Wen Zhou <wenzhou@redhat.com> (cherry picked from commit 13c28ec) (cherry picked from commit b809260) * update: set kserve as Managed by default DSC (red-hat-data-services#130) - keep modelmesh in clean install removed(flip from previous managed) - keep modelmesh from old version as-was set OSSM and serving both as default Managaed - update docs with default status and missing new components - fix nilpointer in DSCI Signed-off-by: Wen Zhou <wenzhou@redhat.com> (cherry picked from commit f7c2713) (cherry picked from commit 4f3cd66) * fix(monitoring): do not add component rules till service is up (red-hat-data-services#137) Signed-off-by: Wen Zhou <wenzhou@redhat.com> (cherry picked from commit d85efc5) (cherry picked from commit 8cca478) * fix(secret): do not delete secret if cannot find (red-hat-data-services#140) Signed-off-by: Wen Zhou <wenzhou@redhat.com> (cherry picked from commit 60f0419) (cherry picked from commit 5e3731b) * chore: typo (red-hat-data-services#141) Signed-off-by: Wen Zhou <wenzhou@redhat.com> (cherry picked from commit 0f9fe32) (cherry picked from commit b8926f7) * Add defaults for Kserve for new install (cherry picked from commit 8bd2782) (cherry picked from commit 81433ba) * Revert "Update defaults for modelmesh" (red-hat-data-services#146) (cherry picked from commit e5a27c4) (cherry picked from commit 7389619) * fix(mm-monitoring): revert the code logic but set to disable as delete (red-hat-data-services#153) Signed-off-by: Wen Zhou <wenzhou@redhat.com> fix(dsc): stop watching validationwebhook for non-create/delete events (red-hat-data-services#150) * fix(dsc): stop watching validationwebhook for non-create/delete events * update: remove CRD in the DSC watch and cleanup debug * fix: add more ignore on the label changes --------- Signed-off-by: Wen Zhou <wenzhou@redhat.com> Revert "Remove modelmesh monitoring" This reverts commit 91dd78f. fix(modelmesh): remove wrong check on the deployment of modelmesh (red-hat-data-services#148) Signed-off-by: Wen Zhou <wenzhou@redhat.com> Retain existing DSCI values Explicilty add Servicemesh in default dsci Update defaults for modelmesh (cherry picked from commit 6eb6d4a) (cherry picked from commit a4788f3) * fix: update default name for DSC in initialization-resource - add missing default config for serving of kserve in sample - set modelmesh in sample and init as Managed Signed-off-by: Wen Zhou <wenzhou@redhat.com> (cherry picked from commit 633d9f6) * fix: do not force check if servicemesh is set to managed in DSCI (red-hat-data-services#154) * fix: do not force check if servicemesh is set to managed in DSCI Signed-off-by: Wen Zhou <wenzhou@redhat.com> * update: add supported value for serverless and servicemesh - currently removed and unmanaged are the same logic Signed-off-by: Wen Zhou <wenzhou@redhat.com> * update: do not remove resources if it has label Signed-off-by: Wen Zhou <wenzhou@redhat.com> --------- Signed-off-by: Wen Zhou <wenzhou@redhat.com> (cherry picked from commit 3a672d4) * Fix lint * fix: rebase incubation Signed-off-by: Wen Zhou <wenzhou@redhat.com> * cherry-pick: red-hat-data-services#157 Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix: for ODH to resolve https://issues.redhat.com/browse/RHOAIENG-157 Signed-off-by: Wen Zhou <wenzhou@redhat.com> * update: CSV Signed-off-by: Wen Zhou <wenzhou@redhat.com> * fix: linter Signed-off-by: Wen Zhou <wenzhou@redhat.com> --------- Signed-off-by: Wen Zhou <wenzhou@redhat.com> Co-authored-by: Wen Zhou <wenzhou@redhat.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
[UPSTREAM]has been prepended to the commit message