Configurable flannel cidr introduction

[ta/caas-kubernetes.git] / ansible / roles / kube_master / templates / cm.yml

diff --git a/ansible/roles/kube_master/templates/cm.yml b/ansible/roles/kube_master/templates/cm.yml
index ddd616a..f9d9d32 100644 (file)
--- a/ansible/roles/kube_master/templates/cm.yml
+++ b/ansible/roles/kube_master/templates/cm.yml
@@ -35,7 +35,7 @@ spec:
         - "--service-account-private-key-file=/etc/kubernetes/ssl/service-account-key.pem"
         - "--root-ca-file=/etc/openssl/ca.pem"
         - "{% if groups['caas_master']|length|int > 1 %}--leader-elect=true{% endif %}"
-        - "--cluster-cidr=10.244.0.0/16"
+        - "--cluster-cidr={{ caas.oam_cidr }}"
         - "--use-service-account-credentials=true"
         - "--allocate-node-cidrs=true"
         - "--cluster-signing-cert-file=/etc/openssl/ca.pem"
@@ -47,7 +47,13 @@ spec:
           port: 10252
         initialDelaySeconds: 15
         timeoutSeconds: 1
+      resources:
+        requests:
+          cpu: "10m"
       volumeMounts:
+        - name: time-mount
+          mountPath: /etc/localtime
+          readOnly: true
         - name: secret-kubernetes
           mountPath: /etc/kubernetes/ssl
           readOnly: true
@@ -61,6 +67,9 @@ spec:
           mountPath: /etc/kubernetes/kubeconfig
           readOnly: true
   volumes:
+    - name: time-mount
+      hostPath:
+        path: /etc/localtime
     - name: secret-kubernetes
       hostPath:
         path: /etc/kubernetes/ssl