X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Fhelm%2Ftemplates%2Ftiller.yml;h=5762d816118b7c8ba59d3c3894f167a9685b94c1;hb=refs%2Fchanges%2F50%2F1750%2F2;hp=507a6da83885b2bb56db03b28602e69dd56eab6d;hpb=cf9e279cdad75e3bacaa71fb0323f1284288b73a;p=ta%2Fcaas-helm.git

diff --git a/ansible/roles/helm/templates/tiller.yml b/ansible/roles/helm/templates/tiller.yml
index 507a6da..5762d81 100644
--- a/ansible/roles/helm/templates/tiller.yml
+++ b/ansible/roles/helm/templates/tiller.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: Deployment
 metadata:
   name: tiller
@@ -26,19 +26,13 @@ spec:
       {{ caas.kubernetes_component_label }}: tiller
   template:
     metadata:
-      annotations:
-        danm.k8s.io/interfaces: |
-          [
-            {
-              "network":"flannel"
-            }
-          ]
       labels:
         {{ caas.kubernetes_component_label }}: tiller
     spec:
+      priorityClassName: "system-cluster-critical"
       dnsPolicy: ClusterFirst
       nodeSelector:
-        nodename: caas_master1
+        nodetype: caas_master
       securityContext:
         runAsUser: {{ caas.uid.kube }}
       containers:
@@ -49,4 +43,15 @@ spec:
               value: "{{ caas.internal_flannel_interface }}"
             - name: TILLER_PORT
               value: "{{ caas.tiller_port }}"
+          resources:
+            requests:
+              cpu: "10m"
+          volumeMounts:
+            - name: time-mount
+              mountPath: /etc/localtime
+              readOnly: true
+      volumes:
+        - name: time-mount
+          hostPath:
+            path: /etc/localtime
       serviceAccountName: tiller