Skip to content

K
k3s
Commit 794dcc14 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28040 from ibm-contribs/fixaddons

Automatic merge from submit-queue Tracked addition of federation, sed support in kube DNS [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]() The kube DNS app recently gained support for federation (whatever that is), including a new Salt parameter. This broke the deployAddons.sh script for cluster ubuntu. The DNS app also gained alternate templates, intended to be friendly to `sed`. Fortunately, those do not demand a federation parameter. This PR fixes up the ` cluster/ubuntu/deployAddons.sh` script to track those changes, by switching to the `sed`-friendly templates.
parents 7c355e18 33e176eb
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 2 deletions
cluster/saltbase/salt/kube-dns/README.md
View file @ 794dcc14
...@@ -7,6 +7,14 @@ Due to a varied preference in templating language choices, the transform ...@@ -7,6 +7,14 @@ Due to a varied preference in templating language choices, the transform
Makefile in this directory should be enhanced to generate all required Makefile in this directory should be enhanced to generate all required
formats from the base underscore templates. formats from the base underscore templates.
**NOTE WELL**: Developers, when you add a parameter you should also
update the various scripts that supply values for your new parameter.
Here is one way you might find those scripts:
```
cd kubernetes
find [a-zA-Z0-9]* -type f -exec grep skydns-rc.yaml \{\} \; -print -exec echo \;
```
## Base Template files ## Base Template files
These are the authoritative base templates. These are the authoritative base templates.
......
cluster/ubuntu/deployAddons.sh
View file @ 794dcc14
...@@ -41,8 +41,8 @@ function init { ...@@ -41,8 +41,8 @@ function init {
function deploy_dns { function deploy_dns {
echo "Deploying DNS on Kubernetes" echo "Deploying DNS on Kubernetes"
sed -e "s/{{ pillar\['dns_replicas'\] }}/${DNS_REPLICAS}/g;s/{{ pillar\['dns_domain'\] }}/${DNS_DOMAIN}/g;" "${KUBE_ROOT}/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.in" > skydns-rc.yaml sed -e "s/\\\$DNS_REPLICAS/${DNS_REPLICAS}/g;s/\\\$DNS_DOMAIN/${DNS_DOMAIN}/g;" "${KUBE_ROOT}/cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed" > skydns-rc.yaml
sed -e "s/{{ pillar\['dns_server'\] }}/${DNS_SERVER_IP}/g" "${KUBE_ROOT}/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.in" > skydns-svc.yaml sed -e "s/\\\$DNS_SERVER_IP/${DNS_SERVER_IP}/g" "${KUBE_ROOT}/cluster/saltbase/salt/kube-dns/skydns-svc.yaml.sed" > skydns-svc.yaml
KUBEDNS=`eval "${KUBECTL} get services --namespace=kube-system | grep kube-dns | cat"` KUBEDNS=`eval "${KUBECTL} get services --namespace=kube-system | grep kube-dns | cat"`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment