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

Support Kubernetes #64

Merged
merged 12 commits into from
Jul 9, 2021
Merged

Support Kubernetes #64

merged 12 commits into from
Jul 9, 2021

Conversation

treydock
Copy link
Contributor

@treydock treydock commented Jun 1, 2021

No description provided.

@treydock treydock requested a review from johrstrom June 1, 2021 12:33
@johrstrom
Copy link
Contributor

Let's simplify the whole "data options for cluster" to just be kubernetes. If a module/option exists on both pizer & owens we'll support it in kubernetes - otherwise we won't. I'll bring this up in our classroom meetings and we'll either support this scheme or backport the modules to owens.

form.yml.erb Outdated Show resolved Hide resolved
@treydock
Copy link
Contributor Author

treydock commented Jul 7, 2021

I made it so the only RStudio Server versions available for kubernetes are ones where they exist for both Pitzer and Owens. That removed a lot of code changes, especially to the form.js.

template/after.sh.erb Outdated Show resolved Hide resolved
@treydock
Copy link
Contributor Author

treydock commented Jul 7, 2021

Should I go ahead and add kubernetes-test and kubernetes-dev clusters to form list? They won't show up if they aren't defined so maybe keep things simpler for people doing app testing and what not so we don't have to maintain a bunch of forks and branches and what not?

@johrstrom
Copy link
Contributor

Yea that'll be fine.

@treydock
Copy link
Contributor Author

treydock commented Jul 7, 2021

Updated with commits so should still work on dev and test instances of our ondemand servers.

@treydock
Copy link
Contributor Author

treydock commented Jul 7, 2021

Testing in test , I missed a few places in Javascript to handle test/dev names.

@treydock
Copy link
Contributor Author

treydock commented Jul 7, 2021

Fix test/dev case to also work, just had to update form fields to account for the 2 non-production Kubernetes cluster names.

form.yml.erb Outdated
@@ -135,52 +197,82 @@ attributes:
- [
"4.0.2", "app_rstudio_server/4.0.2",
data-option-for-owens: true,
data-option-for-pitzer: true
data-option-for-pitzer: true,
data-option-for-kubernetes: true,,
Copy link
Contributor

Choose a reason for hiding this comment

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

I think these extra commas are throwing the yaml parsing off?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I fixed, was likely existing trailing comma and I was copy+paste the items and must have missed.

Copy link
Contributor

@johrstrom johrstrom left a comment

Choose a reason for hiding this comment

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

I think we're good to go.

@johrstrom johrstrom merged commit dfc52ce into master Jul 9, 2021
@johrstrom johrstrom deleted the kubernetes branch July 9, 2021 16:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants