Skip to content

K
k3s
Commit 878d2b2f authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #26625 from sttts/sttts-fix-kube-dns-sed-transform

Automatic merge from submit-queue Fix sed transformation for new kube-dns yaml <!-- Checklist for submitting a Pull Request Please remove this comment block before submitting. 1. Please read our [contributor guidelines](https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md). 2. See our [developer guide](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md). 3. If you want this PR to automatically close an issue when it is merged, add `fixes #<issue number>` or `fixes #<issue number>, fixes #<issue number>` to close multiple issues (see: https://github.com/blog/1506-closing-issues-via-pull-requests). 4. Follow the instructions for [labeling and writing a release note for this PR](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes) in the block below. --> ```release-note * Use the release-note-* labels to set the release note state * Clear this block to use the PR title as the release note -OR- * Enter your extended release note here ``` [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
parents 0274e72d 391ff02e
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
cluster/saltbase/salt/kube-dns/skydns-rc.yaml.sed
View file @ 878d2b2f
......@@ -73,7 +73,7 @@ spec:
timeoutSeconds: 5
args:
# command = "/kube-dns"
- --domain=$DNS_DOMAIN}}.
- --domain=$DNS_DOMAIN.
- --dns-port=10053
ports:
- containerPort: 10053
......@@ -106,7 +106,7 @@ spec:
cpu: 10m
memory: 20Mi
args:
- -cmd=nslookup kubernetes.default.svc.$DNS_DOMAIN}} 127.0.0.1 >/dev/null
- -cmd=nslookup kubernetes.default.svc.$DNS_DOMAIN 127.0.0.1 >/dev/null
- -port=8080
ports:
- containerPort: 8080
......
cluster/saltbase/salt/kube-dns/transforms2sed.sed
View file @ 878d2b2f
s/__PILLAR__DNS__SERVER__/$DNS_SERVER_IP/g
s/__PILLAR__DNS__REPLICAS__/$DNS_REPLICAS/g
s/__PILLAR__DNS__DOMAIN__/$DNS_DOMAIN}}/g
s/__PILLAR__DNS__DOMAIN__/$DNS_DOMAIN/g
s/__MACHINE_GENERATED_WARNING__/Warning: This is a file generated from the base underscore template file: __SOURCE_FILENAME__/g
\ No newline at end of file
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