Configurable flannel cidr introduction

Change-Id: Id36280be18a9b5158f7a20a65ec1d94fd2669daf
Signed-off-by: Balint Varga <balint.varga@nokia.com>

diff --git a/ansible/roles/kube_master/templates/cm.yml b/ansible/roles/kube_master/templates/cm.yml
index 7950af2..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"

diff --git a/caas-kubernetes.spec b/caas-kubernetes.spec
index f364951..6654c79 100644 (file)
--- a/caas-kubernetes.spec
+++ b/caas-kubernetes.spec
@@ -15,7 +15,7 @@
 %define COMPONENT kubernetes
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.16.0
-%define RPM_MINOR_VERSION 1
+%define RPM_MINOR_VERSION 2
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define KUBERNETESPAUSE_VERSION 3.1