X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Fkubedns%2Ftemplates%2Fkubedns-deployment.yml;h=65a25ff1585bbdb8c8e44dacfc4096c0d939d9dc;hb=573182a5721498bfdf87f3b24c82ffef151a0058;hp=d60e692968c3fd03444ee14a9135d4ddc088a900;hpb=a02598697ea8f65aa353ff1029aa5b6734c672b1;p=ta%2Fcaas-kubedns.git

diff --git a/ansible/roles/kubedns/templates/kubedns-deployment.yml b/ansible/roles/kubedns/templates/kubedns-deployment.yml
index d60e692..65a25ff 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,13 +35,21 @@ 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
       tolerations:
       - key: "CriticalAddonsOnly"
         operator: "Exists"
+      - key: "node-maintenancemode"
+        value: "enabled"
+        operator: "Equal"
+        effect: "NoExecute"
       volumes:
+      - name: time-mount
+        hostPath:
+          path: /etc/localtime
       - name: secret
         hostPath:
           path: /etc/kubernetes/ssl
@@ -70,11 +78,11 @@ spec:
           limits:
             memory: 170Mi
           requests:
-            cpu: 100m
+            cpu: 10m
             memory: 70Mi
         livenessProbe:
           tcpSocket:
-            port: 53
+            port: 10053
           initialDelaySeconds: 60
           timeoutSeconds: 5
           successThreshold: 1
@@ -105,7 +113,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
@@ -152,6 +167,9 @@ spec:
             cpu: 150m
             memory: 20Mi
         volumeMounts:
+        - name: time-mount
+          mountPath: /etc/localtime
+          readOnly: true
         - name: secret
           mountPath: /etc/kubernetes/ssl
           readOnly: true