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

Enabling specifying annotations for service accounts in helm chart #1106

Merged
merged 2 commits into from
Jun 9, 2022

Conversation

afaytelson
Copy link
Contributor

No description provided.

@welcome
Copy link

welcome bot commented Jun 8, 2022

Thanks for submitting your first pull request! You are awesome! 🤗

If you haven't done so already, check out Jupyter's Code of Conduct. Also, please make sure you followed the pull request template, as this will help us review your contribution more quickly.
welcome
You can meet the other Jovyans by joining our Discourse forum. There is also a intro thread there where you can stop by and say Hi! 👋

Welcome to the Jupyter community! 🎉

Copy link
Member

@lresende lresende left a comment

Choose a reason for hiding this comment

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

LGTM, @kevin-bates what is your take on the chart version? particular for the one in dev mode (main branch)? Do we have the release script bumping the version when we perform the release?

Copy link
Member

@kevin-bates kevin-bates left a comment

Choose a reason for hiding this comment

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

The changes look good to me, although we should probably talk about the chart version.

In #1106 (review) @lresende asks:

@kevin-bates what is your take on the chart version? particular for the one in dev mode (main branch)? Do we have the release script bumping the version when we perform the release?

My immediate response is, yes, the release script handles this as of #1102. See:

# Update Kubernetes Helm chart and values files (tbump will handle appVersion in Chart.yaml)
# We need to inject "-" prior to pre-release suffices for 'version:' since it follows strict semantic version rules.
# For example 3.0.0rc1 -> 3.0.0-rc1
k8s_version=`echo $RELEASE_VERSION | sed 's/\([0-9]\)\([a-z]\)/\1-\2/'`
sed -i .bak "s@version: [0-9,\.,a-z]*@version: $k8s_version@g" etc/kubernetes/helm/enterprise-gateway/Chart.yaml

But my question is whether we really need to increment this version string on every change within a release or is just tracking it to the release sufficient? If the former then it would need to ALWAYS be a manual operation and I would argue that we move to a version string that is completely detached from the EG version - although (IMHO) that would be unfortunate. I would prefer that we only update this string on releases and ensure it's a syntactically correct semVer (which was the intention of #1102).

@afaytelson
Copy link
Contributor Author

@kevin-bates To reiterate your point - I can change back the Chart version to 3.0.0 and we can use the release script for a pre-release. Then once the Chart is ready for a release then it should be updated manually.

@lresende
Copy link
Member

lresende commented Jun 9, 2022

@afaytelson Could we leave the version here matching the release version? Thank you.

@lresende lresende merged commit 30dc0c5 into jupyter-server:main Jun 9, 2022
@welcome
Copy link

welcome bot commented Jun 9, 2022

Congrats on your first merged pull request in this project! 🎉
congrats
Thank you for contributing, we are very proud of you! ❤️

@kevin-bates
Copy link
Member

Then once the Chart is ready for a release then it should be updated manually.

So at that point we'll remove the automation performed in release.sh and it will diverge from the EG release number?

Are charts viewed as their own deliverable packages (separate from EG)? Why would you increment the Chart version within a release when the Chart should not be delivered until the release is complete?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants