From 2df70d6a3dbaf45dee77c7f35d339f022e103c7c Mon Sep 17 00:00:00 2001
From: ant31 <2t.antoine@gmail.com>
Date: Sat, 26 Dec 2015 19:57:18 +0100
Subject: [PATCH] Docker dnsmasq
---
roles/dnsmasq/tasks/main.yml | 16 --------
roles/dnsmasq/templates/dnsmasq-pod.yml | 49 +++++++++++++++++++++++++
2 files changed, 49 insertions(+), 16 deletions(-)
create mode 100644 roles/dnsmasq/templates/dnsmasq-pod.yml
diff --git a/roles/dnsmasq/tasks/main.yml b/roles/dnsmasq/tasks/main.yml
index 9f4169ace..d044c0885 100644
--- a/roles/dnsmasq/tasks/main.yml
+++ b/roles/dnsmasq/tasks/main.yml
@@ -28,15 +28,6 @@
- '^127\.0\.0\.1(\s+){{ inventory_hostname }}.*'
- '^::1(\s+){{ inventory_hostname }}.*'
-- name: install dnsmasq and bindr9utils
- apt:
- name: "{{ item }}"
- state: present
- update_cache: yes
- with_items:
- - dnsmasq
- - bind9utils
- when: inventory_hostname in groups['kube-master']
- name: ensure dnsmasq.d directory exists
file:
@@ -54,13 +45,6 @@
- restart dnsmasq
when: inventory_hostname in groups['kube-master']
-- name: enable dnsmasq
- service:
- name: dnsmasq
- state: started
- enabled: yes
- when: inventory_hostname in groups['kube-master']
-
- name: update resolv.conf with new DNS setup
template:
src: resolv.conf.j2
diff --git a/roles/dnsmasq/templates/dnsmasq-pod.yml b/roles/dnsmasq/templates/dnsmasq-pod.yml
new file mode 100644
index 000000000..1150e14c7
--- /dev/null
+++ b/roles/dnsmasq/templates/dnsmasq-pod.yml
@@ -0,0 +1,49 @@
+---
+apiVersion: v1
+kind: Pod
+metadata:
+ name: dnsmasq
+ namespace: kube-system
+spec:
+ hostNetwork: true
+ containers:
+ - name: dnsmasq
+ image: andyshinn/dnsmasq:2.72
+ command:
+ - dnsmasq
+ args:
+ - -k
+ - "-7"
+ - /etc/dnsmasq.d
+ - --local-service
+ securityContext:
+ capabilities:
+ add:
+ - NET_ADMIN
+ imagePullPolicy: Always
+ resources:
+ limits:
+ cpu: 100m
+ memory: 256M
+ ports:
+ - name: dns
+ containerPort: 53
+ hostPort: 53
+ protocol: UDP
+ - name: dns-tcp
+ containerPort: 53
+ hostPort: 53
+ protocol: TCP
+ volumeMounts:
+ - name: etcdnsmasqd
+ mountPath: /etc/dnsmasq.d
+ - name: etcdnsmasqdavailable
+ mountPath: /etc/dnsmasq.d-available
+
+ volumes:
+ - name: etcdnsmasqd
+ hostPath:
+ path: /etc/dnsmasq.d
+ - name: etcdnsmasqdavailable
+ hostPath:
+ path: /etc/dnsmasq.d-available
--
GitLab