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.

Sign up for GitHub

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

Use explicit dns config #541

Merged
merged 4 commits into from
Jan 22, 2021
Merged

Use explicit dns config #541

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd02a05
Use explicit dns config
stephen-soltesz Jan 21, 2021
c78c2db
Use default dnsConfig and policy
stephen-soltesz Jan 21, 2021
0bddfff
Restore dns override
stephen-soltesz Jan 22, 2021
f73cba2
Restore first line
stephen-soltesz Jan 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 7 additions & 13 deletions k8s/daemonsets/templates.jsonnet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,19 +480,13 @@ local Experiment(name, index, bucket, anonMode, datatypes=[]) = ExperimentNoInde
},
},
spec+: {
initContainers+: [
// TODO: this is a hack. Remove the hack by fixing
// contents of resolv.
{
name: 'fix-resolv-conf',
image: 'busybox',
command: [
'sh',
'-c',
'echo "nameserver 8.8.8.8" > /etc/resolv.conf',
],
},
],
// NOTE(github.com/m-lab/k8s-support/issues/542): this overrides the
// default kube-dns configuration because M-Lab pod networks bypass
// kubernetes Services iptables rules.
dnsPolicy: 'None',
dnsConfig: {
nameservers: ['8.8.8.8'],
},
// Only enable extended grace period where production traffic is possible.
[if std.extVar('PROJECT_ID') != 'mlab-sandbox' then 'terminationGracePeriodSeconds']: terminationGracePeriodSeconds,
},
Expand Down