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

add annotation namespace #31

Merged
merged 1 commit into from
May 27, 2020
Merged

add annotation namespace #31

merged 1 commit into from
May 27, 2020

Conversation

like-inspur
Copy link
Contributor

@like-inspur like-inspur commented Oct 15, 2019

1、current deployment only has livenessProbe,but don't have readiness
2、configmap read config form installation config, so it's better to config this variable
3、execurte need ruby env, so tell reader to install ruby first

@yahoocla
Copy link

Thank you for submitting this pull request, however I do not see a valid CLA on file for you. Before we can merge this request please visit https://yahoocla.herokuapp.com/ and agree to the terms. Thanks! 😄

@like-inspur like-inspur changed the title add readinessProbe and default confg add deploy config and docs description Oct 15, 2019
Copy link
Contributor

@byxorna byxorna left a comment

Choose a reason for hiding this comment

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

lgtm, comments inline! Thanks for the PR!

Of note: we are currently in a transition period away from Yahoo's CLA to a new CLA for Automattic. We should have the CLA sorted out in a week or so, so this PR will have to wait to merge until we get that sorted out.

scheme: HTTPS
path: /health
port: https
initialDelaySeconds: 10
Copy link
Contributor

Choose a reason for hiding this comment

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

I do not think theres any reason to delay readiness checks. What do you think?

@@ -64,3 +72,5 @@ spec:
value: "conf/"
- name: "CONFIGMAP_LABELS"
value: "app=k8s-sidecar-injector"
- name: "CONFIGMAP_NAMESPACE"
Copy link
Contributor

Choose a reason for hiding this comment

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

This will work.

I was thinking (in order to provide a smoother out of the box experience) that we could change https://github.com/tumblr/k8s-sidecar-injector/blob/master/entrypoint.sh#L21 to omit the --configmap-namespace flag if CONFIGMAP_NAMESPACE is empty. This will use the namespace the injector is deployed into automatically, removing some config duplication and Doing The Right Thing ™️ in common cases.

@like-inspur
Copy link
Contributor Author

#42

@byxorna
Copy link
Contributor

byxorna commented May 26, 2020

@like-inspur thanks for citing this from the other issue. I dropped comments for things we would like changed before merging this. Would you be able to address them?

Alternatively, if you would like to break your change in 7105418 out into a separate PR, we can merge that easily and keep it uncoupled from the rest of this PR? Thanks in advance!

@like-inspur like-inspur changed the title add deploy config and docs description add annotation namespace May 27, 2020
@like-inspur
Copy link
Contributor Author

@byxorna I have remove other change and only save this, you can merge directly

@byxorna byxorna merged commit 35975e6 into tumblr:master May 27, 2020
@byxorna
Copy link
Contributor

byxorna commented May 27, 2020

@like-inspur thanks for rebasing this PR, and thank you for the contribution! Your changes will be available in the tumblr/k8s-sidecar-injector:latest image in probably 1h (based on docker hub build queue length). https://hub.docker.com/repository/docker/tumblr/k8s-sidecar-injector/builds

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.

3 participants