-
Notifications
You must be signed in to change notification settings - Fork 38.6k
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
Renames kube-dns configure files from skydns* to kubedns* #38523
Conversation
@@ -41,15 +41,15 @@ function init { | |||
|
|||
function deploy_dns { | |||
echo "Deploying DNS on Kubernetes" | |||
sed -e "s/\\\$DNS_DOMAIN/${DNS_DOMAIN}/g" "${KUBE_ROOT}/cluster/addons/dns/skydns-rc.yaml.sed" > skydns-rc.yaml |
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.
We should also fix the sed file to not use $DNS_DOMAIN
but VAR_DNS_DOMAIN
or __DNS_DOMAIN
or something, so we don't have to double-escape like this...
LGTM |
Automatic merge from submit-queue (batch tested with PRs 38058, 38523) |
This broke |
@deads2k I should be more careful. Thanks for fixing the scripts! |
Automatic merge from submit-queue (batch tested with PRs 38727, 38726, 38347, 38348) Second pass of renaming kube-dns configure files Continue work of #38523. Not sure why cluster/centos/deployAddons.sh was omitted in previous PR. Also deletes the non-use `DNS_REPLICAS` var and changes `-rc` suffix in hack/local-up-cluster.sh. @thockin @bowei @deads2k
skydns-
prefix and-rc
suffix are confusing and misleading. Renaming it tokubedns
in existing yaml files and scripts.@bowei @thockin