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

Rebase upstream master #21

Merged
merged 1 commit into from
May 19, 2020
Merged

Rebase upstream master #21

merged 1 commit into from
May 19, 2020

Conversation

vpavlin
Copy link
Contributor

@vpavlin vpavlin commented May 14, 2020 •
edited
Loading

This PR rebases our master to kfctl master, @crobby @LaVLaS PTAL

I think if we select "Rebase and merge" when merging, it will give us clean sync with upstream

@adrian555
tie kfapp directory with kfdef name and namespace (#324)
aaba770 
* tie kfapp directory with kfdef name and namespace

* support multiple kfdefs
@vpavlin vpavlin added this to To Do in ODH 0.6.1 via automation May 14, 2020
@LaVLaS LaVLaS self-requested a review May 14, 2020 14:25
@vpavlin vpavlin moved this from To Do to In Review in ODH 0.6.1 May 15, 2020
@vpavlin vpavlin requested a review from crobby May 15, 2020 15:48
crobby
crobby approved these changes May 15, 2020
View reviewed changes
Copy link

@crobby crobby left a comment

Choose a reason for hiding this comment

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

I have built and ran with this rebasing. It seems to work well. I have tested out the multiple kfdef support and it seems to be working.

LaVLaS
LaVLaS approved these changes May 19, 2020
View reviewed changes
Copy link
Member

@LaVLaS LaVLaS left a comment

Choose a reason for hiding this comment

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

LGTM

Successfully built and deployed the image. Tested by deploying and deleting the odh-manifests kfdef with no issues

@vpavlin vpavlin merged this pull request into opendatahub-io:master May 19, 2020
ODH 0.6.1 automation moved this from In Review to Done May 19, 2020
VaishnaviHire added a commit to VaishnaviHire/opendatahub-operator that referenced this pull request Aug 3, 2023
@VaishnaviHire
Merge pull request opendatahub-io#21 from VaishnaviHire/sync_upstream…
c7adcfe 
…_1_31

[rhods-1.31]DSCInit force update instances
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crobby crobby crobby approved these changes

@LaVLaS LaVLaS LaVLaS approved these changes

Assignees
No one assigned
Labels
None yet
Projects
No open projects
ODH 0.6.1
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@vpavlin @crobby @LaVLaS @adrian555