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

Renames kube-dns configure files from skydns* to kubedns* #38523

Merged
merged 1 commit into from
Dec 11, 2016

Conversation

MrHohn
Copy link
Member

@MrHohn MrHohn commented Dec 9, 2016

skydns- prefix and -rc suffix are confusing and misleading. Renaming it to kubedns in existing yaml files and scripts.

@bowei @thockin

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 9, 2016
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-github-robot k8s-github-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-label-needed labels Dec 9, 2016
@thockin thockin assigned thockin and unassigned jbeda Dec 11, 2016
@thockin thockin added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Dec 11, 2016
@@ -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
Copy link
Member

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...

@thockin thockin added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 11, 2016
@thockin
Copy link
Member

thockin commented Dec 11, 2016

LGTM

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 38058, 38523)

@k8s-github-robot k8s-github-robot merged commit d8c9253 into kubernetes:master Dec 11, 2016
@deads2k
Copy link
Contributor

deads2k commented Dec 12, 2016

This broke local-up-cluster.sh. @xilabao this may have been your problem.

@MrHohn
Copy link
Member Author

MrHohn commented Dec 12, 2016

@deads2k I should be more careful. Thanks for fixing the scripts!

k8s-github-robot pushed a commit that referenced this pull request Dec 14, 2016
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
@MrHohn MrHohn deleted the kube-dns-rename branch May 16, 2017 23:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants