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

connect: update content images and enable quarto by default #486

Merged
merged 13 commits into from
Apr 30, 2024

Conversation

tnederlof
Copy link
Contributor

@tnederlof tnederlof commented Apr 26, 2024

  • Adds in the new content-base and content-pro images in the default-runtime.yaml and default-runtime-pro.yaml files created via this PR: modernize content image versions rstudio-docker-products#737
  • Enables Quarto and Python in the default values.yaml config section so Python and Quarto content will work out of the box for local execution or off-host execution (closes Add quarto to default Connect config #463). Previously Python was automatically enabled only when launcher was enabled. This conditional is removed now that its in the values.

Testing

Deployed Connect into EKS using base and pro, they show up as expected and content can be deployed from R and Python (tested on the content-pro:r4.2.3-py3.11.9-ubuntu2204 image).

Base env list:
env list base

Pro env list:
env list pro

@tnederlof
Copy link
Contributor Author

@aronatkins, I think enabling Quarto by default in the config is not breaking anything, but I wanted to check with you. Without it the environments all show Quarto as None by default.

@aronatkins
Copy link
Contributor

Quarto is currently different from R/Python in that it can be enabled without a configured executable. At some point, we probably want all three R/Python/Quarto to behave more similarly (warn if enabled without executable).

@tnederlof tnederlof changed the title connect: update content images connect: update content images and enable quarto by default Apr 26, 2024
@tnederlof
Copy link
Contributor Author

@dbkegley I am nervous to put in hardcoded paths for Python and Quarto for non OHE since they need to be updated. When it was in PPM like that and they didn't get updated when the images changed, the charts would break. If the Connect team has a process to update when the images changed then it would make sense but want to make sure that is in place first.

@dbkegley
Copy link
Contributor

If the Connect team has a process to update when the images changed then it would make sense but want to make sure that is in place first.

Appreciate the caution. I'll create a followup for the Connect team to find a way to flag this. I think having an GHA in this repo would be a nice addition to our pre-release testing

@tnederlof
Copy link
Contributor Author

tnederlof commented Apr 30, 2024

@dbkegley Okay I made the changes, now setting Python and Quarto directly in the default config section of the values.yaml and removed the conditional launcher only logic.

One thing I wanted to check on is whether the Executables defined for Quarto and Python are ignored in OHE (is there any harm in having them in there in the values?). Or do you think its cleaner to still have conditional logic where when in OHE we omit those Executable lines?

@dbkegley
Copy link
Contributor

One thing I wanted to check on is whether the Executables defined for Quarto and Python are ignored in OHE (is there any harm in having them in there in the values?). Or do you think its cleaner to still have conditional logic where when in OHE we omit those Executable lines?

Good point. If OHE is enabled then any executables defined in the default values.yaml will be ignored so everything should work as expected, but it might confuse folks. Maybe we should add a comment in the values noting that these are the defaults for local execution only and the defaults for off-host are defined in the default runtimes.yaml

@tnederlof
Copy link
Contributor Author

@dbkegley I changed the comments in values.yaml to make it clear that the executables do not apply for OHE and linked to the docs. I retested and things look good to me. I think this is ready when you want to merge (not sure who else should take a look).

Copy link
Contributor

@dbkegley dbkegley left a comment

Choose a reason for hiding this comment

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

LGTM, I think this is good to merge anytime.

I'll be updating the quarto version during the next Connect release which is happening.. soon ™️ so we'll get some mileage out of the new GHA right away. The new checks should fail when we update the image during the release.

@dbkegley dbkegley merged commit 07c5143 into main Apr 30, 2024
6 checks passed
@dbkegley dbkegley deleted the connect-updated-content-images branch April 30, 2024 18:44
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.

Add quarto to default Connect config
4 participants