X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Fkubedns%2Ftemplates%2Fkubedns-deployment.yml;h=265295d1b317646621582687f7d24516ec5589e4;hb=9067b216d8c6cc2fb3213e288dde3cb4e79188d3;hp=e95c78fec49da9b8796d8e2b14ecf6c0439864b9;hpb=251c73c758e867507450126a19c703e4ab9052b0;p=ta%2Fcaas-kubedns.git

diff --git a/ansible/roles/kubedns/templates/kubedns-deployment.yml b/ansible/roles/kubedns/templates/kubedns-deployment.yml
index e95c78f..265295d 100644
--- a/ansible/roles/kubedns/templates/kubedns-deployment.yml
+++ b/ansible/roles/kubedns/templates/kubedns-deployment.yml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 #}
 ---
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: kube-dns
@@ -35,6 +35,7 @@ spec:
         scheduler.alpha.kubernetes.io/critical-pod: ''
         scheduler.alpha.kubernetes.io/tolerations: '[{"key":"CriticalAddonsOnly", "operator":"Exists"}]'
     spec:
+      priorityClassName: "system-cluster-critical"
       hostNetwork: true
       nodeSelector:
         nodetype: caas_master
@@ -42,6 +43,9 @@ spec:
       - key: "CriticalAddonsOnly"
         operator: "Exists"
       volumes:
+      - name: time-mount
+        hostPath:
+          path: /etc/localtime
       - name: secret
         hostPath:
           path: /etc/kubernetes/ssl
@@ -70,11 +74,11 @@ spec:
           limits:
             memory: 170Mi
           requests:
-            cpu: 100m
+            cpu: 10m
             memory: 70Mi
         livenessProbe:
           tcpSocket:
-            port: 53
+            port: 10053
           initialDelaySeconds: 60
           timeoutSeconds: 5
           successThreshold: 1
@@ -91,7 +95,7 @@ spec:
         command:
         - /usr/bin/kube-dns
         args:
-        - --domain=nokia.net.
+        - --domain={{ caas.dns_domain }}.
         - --dns-port=10053
         - --config-dir=/etc/dns_config
         - --v=2
@@ -105,7 +109,14 @@ spec:
         - containerPort: 10055
           name: metrics
           protocol: TCP
+        resources:
+          requests:
+            cpu: 10m
+            memory: 70Mi
         volumeMounts:
+        - name: time-mount
+          mountPath: /etc/localtime
+          readOnly: true
         - name: secret
           mountPath: /etc/kubernetes/ssl
           readOnly: true
@@ -145,13 +156,16 @@ spec:
         - --bind-interfaces
         - --dns-forward-max=1000
         - --cache-size=10000
-        - --server=/nokia.net/127.0.0.1#10053
+        - --server=/{{ caas.dns_domain }}/127.0.0.1#10053
         # see: https://github.com/kubernetes/kubernetes/issues/29055 for details
         resources:
           requests:
             cpu: 150m
             memory: 20Mi
         volumeMounts:
+        - name: time-mount
+          mountPath: /etc/localtime
+          readOnly: true
         - name: secret
           mountPath: /etc/kubernetes/ssl
           readOnly: true