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.

Sign up for GitHub

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

Jump to bottom

Unset Tech Preview components by default #708

Merged
merged 2 commits into from
Nov 9, 2023
Merged

Unset Tech Preview components by default #708

merged 2 commits into from
Nov 9, 2023

Conversation

VaishnaviHire
Copy link
Member

Fixes #706

Description

How Has This Been Tested?

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

VaishnaviHire
VaishnaviHire commented Nov 7, 2023
View reviewed changes
pkg/upgrade/upgrade.go
fmt.Printf("DataScienceCluster resource already exists. It will not be updated with default DSC.")
return nil
}
// Do not update the DSC if it already exists
Copy link
Member Author

Choose a reason for hiding this comment

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

@etirelli Can you confirm for Managed service, we would not be patching with default DSC if the instance is already created?

Copy link
Member

Choose a reason for hiding this comment

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

i am fine with the PR as long as we can confirm ^

Copy link
Contributor

Choose a reason for hiding this comment

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

@VaishnaviHire correct, that is my understanding. If a DSC already exists, we should preserve it.

@VaishnaviHire VaishnaviHire requested review from zdtsw and removed request for LaVLaS November 7, 2023 08:16
@VaishnaviHire VaishnaviHire force-pushed the update_defaults branch 3 times, most recently from ea06557 to 2ae4caf Compare November 7, 2023 11:51
zdtsw
zdtsw approved these changes Nov 7, 2023
View reviewed changes
Copy link
Member

@zdtsw zdtsw left a comment

Choose a reason for hiding this comment

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

/lgtm

etirelli
etirelli reviewed Nov 7, 2023
View reviewed changes
pkg/upgrade/upgrade.go Outdated
// Set the default DSC name depending on the platform
var DSCName string
if platform == deploy.ManagedRhods || platform == deploy.SelfManagedRhods {
DSCName = "rhods"
Copy link
Contributor

Choose a reason for hiding this comment

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

sorry, now I understand what you said in the meeting. I don't think this should be named "rhods". Can we keep it as "default" as well? Otherwise, we might want to use a name that is more resilient to change, like "default-dsc" or similar.

@openshift-ci openshift-ci bot added the lgtm label Nov 7, 2023
@zdtsw zdtsw added the odh-2.4 label Nov 7, 2023
@openshift-ci openshift-ci bot removed the lgtm label Nov 8, 2023
zdtsw
zdtsw reviewed Nov 8, 2023
View reviewed changes
bundle/manifests/opendatahub-operator.clusterserviceversion.yaml
@@ -15,7 +15,7 @@ metadata:
"app.kubernetes.io/name": "datasciencecluster",
"app.kubernetes.io/part-of": "opendatahub-operator"
},
"name": "default"
"name": "default-dsc"
Copy link
Member

Choose a reason for hiding this comment

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

should we update line 13 as well? but can be done in "config" first

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed

pkg/upgrade/upgrade.go Outdated
APIVersion: "dscinitialization.opendatahub.io/v1",
},
ObjectMeta: metav1.ObjectMeta{
Name: "default-dsc",
Copy link
Member

Choose a reason for hiding this comment

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

or default-dsci ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed

main.go
// Check if user opted for disabling DSC configuration
_, disableDSCConfig := os.LookupEnv("DISABLE_DSC_CONFIG")
if !disableDSCConfig {
if err = upgrade.CreateDefaultDSCI(setupClient, platform, dscApplicationsNamespace, dscMonitoringNamespace); err != nil {
Copy link
Member

Choose a reason for hiding this comment

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

to call it as part of upgrade package is a bit confusion but i understand it is calling the CreateDefaultDSCI function

Copy link
Member Author

Choose a reason for hiding this comment

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

Yeah I kept the function in same package as createDefaultDSC

@VaishnaviHire VaishnaviHire force-pushed the update_defaults branch 2 times, most recently from ff13d28 to abb9182 Compare November 9, 2023 09:25
zdtsw
zdtsw approved these changes Nov 9, 2023
View reviewed changes
Copy link
Member

@zdtsw zdtsw 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 openshift-ci bot added the lgtm label Nov 9, 2023
@openshift-ci openshift-ci bot removed the lgtm label Nov 9, 2023
etirelli
etirelli approved these changes Nov 9, 2023
View reviewed changes
Copy link
Contributor

@etirelli etirelli 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 openshift-ci bot added the lgtm label Nov 9, 2023
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Nov 9, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: etirelli, zdtsw

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 Nov 9, 2023
@VaishnaviHire VaishnaviHire merged commit 1ccbe05 into opendatahub-io:incubation Nov 9, 2023
6 of 7 checks passed
@spolti spolti mentioned this pull request Nov 10, 2023
Merged
3 tasks
VaishnaviHire added a commit to VaishnaviHire/opendatahub-operator that referenced this pull request Nov 12, 2023
@VaishnaviHire
Unset Tech Preview components by default (opendatahub-io#708)
fee7d1f 
* Unset Tech Preview components by default

* Update default DSC and DSCI name

(cherry picked from commit 1ccbe05)
VaishnaviHire added a commit to VaishnaviHire/opendatahub-operator that referenced this pull request Nov 15, 2023
@VaishnaviHire
Unset Tech Preview components by default (opendatahub-io#708)
856cc1d 
* Unset Tech Preview components by default

* Update default DSC and DSCI name

(cherry picked from commit 1ccbe05)
@VaishnaviHire VaishnaviHire mentioned this pull request Nov 15, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@etirelli etirelli etirelli approved these changes

@zdtsw zdtsw zdtsw approved these changes

Assignees

@etirelli etirelli

@zdtsw zdtsw

Labels
approved lgtm odh-2.4 rhods-2.4
Projects
ODH Platform Planning
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Set Tech Preview components to Removed for default DSC
4 participants
@VaishnaviHire @etirelli @zdtsw @openshift-merge-robot