Merge "Remove DANM TenantConfig creation"

diff --git a/SPECS/caas-flannel.spec b/SPECS/caas-flannel.spec
index 12ca7f0..31273c2 100644 (file)
--- a/SPECS/caas-flannel.spec
+++ b/SPECS/caas-flannel.spec
@@ -15,7 +15,7 @@
 %define COMPONENT flannel
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 0.11.0
-%define RPM_MINOR_VERSION 6
+%define RPM_MINOR_VERSION 8
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 
 Name:           %{RPM_NAME}

diff --git a/ansible/roles/flannel/templates/flannel-cm.yaml b/ansible/roles/flannel/templates/flannel-cm.yaml
index 840d093..367af85 100644 (file)
--- a/ansible/roles/flannel/templates/flannel-cm.yaml
+++ b/ansible/roles/flannel/templates/flannel-cm.yaml
@@ -25,7 +25,7 @@ metadata:
 data:
   net-conf.json: |
     {
-      "Network": "10.244.0.0/16",
+      "Network": "{{ caas.oam_cidr }}",
       "Backend": {
         "Type": "vxlan"
       }

diff --git a/ansible/roles/flannel/templates/flannel-ds.yaml b/ansible/roles/flannel/templates/flannel-ds.yaml
index eb0c571..e50f855 100644 (file)
--- a/ansible/roles/flannel/templates/flannel-ds.yaml
+++ b/ansible/roles/flannel/templates/flannel-ds.yaml
@@ -39,7 +39,7 @@ spec:
      #securityContext:
      #     runAsUser: {{ caas.uid.flannel }}
       tolerations:
-      - key: node-role.kubernetes.io/master
+      - key: node.kubernetes.io/master
         operator: Exists
         effect: NoSchedule
       containers: