X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Fkube_master%2Ftemplates%2Fcm.yml;h=f9d9d3255818c277b6c5b6a8ad26002ccd520919;hb=refs%2Fchanges%2F98%2F1698%2F1;hp=27d6f264a32cadfdf02a74aa9bcf34b139cb631c;hpb=ed93069afc19b80dc0cfc8c518a81b022fde71e5;p=ta%2Fcaas-kubernetes.git diff --git a/ansible/roles/kube_master/templates/cm.yml b/ansible/roles/kube_master/templates/cm.yml index 27d6f26..f9d9d32 100644 --- 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,6 +47,9 @@ spec: port: 10252 initialDelaySeconds: 15 timeoutSeconds: 1 + resources: + requests: + cpu: "10m" volumeMounts: - name: time-mount mountPath: /etc/localtime