-
Notifications
You must be signed in to change notification settings - Fork 40k
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 an nginx docker image for use on the master. #6334
Conversation
"readOnly": true}, | ||
{ "name": "passwd", | ||
"mountPath": "/usr/share/nginx", | ||
"readOnly": false} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you need /usr/share/nginx to be writeable ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fixed.
Comments addressed and PR updated. ptal. |
LGTM I didn't test the container with the readonly mounts, but I am guessing that Brendan manually verified it. |
updated, to actually activate the container via Salt. Please wait to merge tomorrow, I want to run e2e. Will ping this PR when I have a passing e2e. |
@@ -1,6 +1,8 @@ | |||
nginx: | |||
{% if grains.cloud in ['gce'] %} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If gce, then nginx should not be installed isn't it ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oops, yes. fixed.
Are you introducing this for gce only as a rollout strategy ? or is this change only for gce ? |
yes, only gce is a rollout strategy. I'll move to AWS and others next. |
4a5154b
to
9c08339
Compare
Ok, this now passes e2e. I actually added back in the install of the nginx .deb since it provides much of the /etc/nginx/... (e.g. mime types) files that we rely on. We should really package all of this except the kubernetes site in the container image, but deferring that to a different PR (or when we eliminate nginx) |
ptal. Thanks! |
LGTM except I wish we have a Makefile introduced, so that we could track the versions of all bundled components including nginx here. To do this, you can simple convert the README file to a Makefile. |
Also have you make sure cluster upgrade works too? |
@brendanburns You would need to disable service explicitly for gce so that nginx in a pod, can start successfully. |
9bbf2e1
to
6e8e735
Compare
@dchen1107
And validate that the cluster came up ok in both cases. @ArtfulCoder nginx disabled by salt. ptal. |
Fixed after problems pointed out by @ArtfulCoder over IM. |
LGTM |
1 similar comment
LGTM |
Add an nginx docker image for use on the master.
Great! one more step move forward for #5011. |
@brendanburns can we roll this out for other cloud providers too ? |
never mind. |
@ArtfulCoder @zmerlynn