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

fix: populate entire dscispec #597

Merged
merged 1 commit into from
Oct 4, 2023

Conversation

bartoszmajsak
Copy link
Contributor

Description

This ensures DSCISpec kept as field in reconciler struct has all the fields propagated so components can use it.

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

@bartoszmajsak bartoszmajsak requested review from zdtsw and removed request for LaVLaS October 4, 2023 10:02
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

tested as work indeed

@openshift-ci openshift-ci bot added the lgtm label Oct 4, 2023
@openshift-ci
Copy link

openshift-ci bot commented Oct 4, 2023

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: zdtsw
Once this PR has been reviewed and has the lgtm label, please assign vaishnavihire for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@zdtsw zdtsw merged commit bcc14a0 into opendatahub-io:incubation Oct 4, 2023
1 of 2 checks passed
@zdtsw
Copy link
Member

zdtsw commented Oct 4, 2023

/cherrypick main

@zdtsw
Copy link
Member

zdtsw commented Oct 4, 2023

/cherrypick main

grrrrrrr, forgot the bot has not been merged yet

zdtsw added a commit to zdtsw-forking/rhods-operator that referenced this pull request Oct 4, 2023
- rename file
- wrong variable names
- cherrypick: opendatahub-io#597

Signed-off-by: Wen Zhou <[email protected]>
zdtsw added a commit to zdtsw-forking/rhods-operator that referenced this pull request Oct 4, 2023
- rename file
- wrong variable names
- cherrypick: opendatahub-io#597

Signed-off-by: Wen Zhou <[email protected]>
@zdtsw
Copy link
Member

zdtsw commented Oct 5, 2023

/cherry-pick main

@openshift-cherrypick-robot

@zdtsw: only opendatahub-io org members may request cherry picks. You can still do the cherry-pick manually.

In response to this:

/cherry-pick main

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.

@VaishnaviHire
Copy link
Member

/cherry-pick main

@openshift-cherrypick-robot

@VaishnaviHire: #597 failed to apply on top of branch "main":

Applying: fix: populate entire dscispec
Using index info to reconstruct a base tree...
M	controllers/datasciencecluster/datasciencecluster_controller.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/datasciencecluster/datasciencecluster_controller.go
CONFLICT (content): Merge conflict in controllers/datasciencecluster/datasciencecluster_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 fix: populate entire dscispec
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:

/cherry-pick main

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.

VaishnaviHire pushed a commit to VaishnaviHire/opendatahub-operator that referenced this pull request Oct 10, 2023
zdtsw added a commit that referenced this pull request Oct 12, 2023
* fix: adds missing CRDs and installs them for testenv

- introduces make func to download needed CRDs to config/crd/external when running make manifests target
- adds missing scheme installation in test setup
- marks one test as Pending due to NetworkPolicies being disabled right now

* fix: passes ns when creating UserGroup resource

* chore: updates CRD download func

* Linter: add golangci-linter and fix issues (#540)

- Update Makefile
- Add linter in GH action and make target to download binary
 - set timeout for 5m for GH aciton when cache is not hit
 - set to use 1.54.0 of golangci-lint
 - add lll linter and set to 180, skip lines out of range
 - set max-complicity back to default 30, skip lines out of scope
 - disable degarud linter
Fix linter after adding function test on DSCI

Signed-off-by: Wen Zhou <[email protected]>
Co-authored-by: Bartosz Majsak <[email protected]>

* feat(manifests): allows configuring manifest repositories using flags (#585)

* feat(manifests): allows configuring manifest repos using flags
* feat(docs): extended section about usage of get_all_manifests script
* chore: prints available components when key does not match
* chore(docs): updates manifests customization

* Feature: add networkpolicy in dsci (#590)

Signed-off-by: Wen Zhou <[email protected]>

* fix(crds): updates docs after godoc fixes (#594)

* Enable test case after networkpolicy is added (#592)

* fix(make): removes duplicated e2e flag declaration (#595)

* chore: removes GetComponentDevFlags as it is exported field of the struct (#591)

and it is already accessed this way.

* fix: populate entire dscispec (#597)

* Update Dashboard branch in incubation (#598)

* Remove sync dashboard CRD since we do not have CRD any more (#599)

Signed-off-by: Wen Zhou <[email protected]>

* feat: uses reflect to reconcile defined components (#593)

* feat: uses reflect to reconcile defined components

This way we do not have to add call in reconcile for newly created component as it will be handled automatically.

* chore: reworks component collection to return slice

* chore: organizes code in dashboard component (#589)

* chore: organizes code in dashboard component

extracts certain config/deployment work to their own funcs for better readability

* fix: removes unused directive

* fix: removes duplicated interface conformance check

* fix(lint): removes extra line

* Auto Add Issues to Tracking boards (#601)

* Add check on the replace image on the component level overwrite (#583)

Signed-off-by: Wen Zhou <[email protected]>

* Fix autoadd issues (#611)

* Add github workflows (#564)

* add github workflows
* update make cmd for unit-test

* fix(make): test is renamed to unit-test (#624)

Signed-off-by: Wen Zhou <[email protected]>

* Update common monitoring config

* Add feature/functional tests in DSCInitialization

---------

Signed-off-by: Wen Zhou <[email protected]>
Co-authored-by: bartoszmajsak <[email protected]>
Co-authored-by: Wen Zhou <[email protected]>
Co-authored-by: Ajay Pratap <[email protected]>
Co-authored-by: AJAY_JAGANATHAN <[email protected]>
VaishnaviHire pushed a commit to VaishnaviHire/opendatahub-operator that referenced this pull request Oct 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants