From: Krisztian Lengyel <krisztian.lengyel@nokia.com>
Date: Tue, 8 Oct 2019 13:19:20 +0000 (+0200)
Subject: Schedule pods by nodetype
X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fcaas-helm.git;a=commitdiff_plain;h=aa795c01743537abf71f6bd20303c1320ac63888

Schedule pods by nodetype

Change-Id: If549047e55a7eb4108a4167b173d68a766ce42e9
Signed-off-by: Krisztian Lengyel <krisztian.lengyel@nokia.com>
---

diff --git a/SPECS/caas-chartrepo.spec b/SPECS/caas-chartrepo.spec
index 9bc2b66..d021788 100644
--- a/SPECS/caas-chartrepo.spec
+++ b/SPECS/caas-chartrepo.spec
@@ -15,7 +15,7 @@
 %define COMPONENT chartrepo
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 1.0.0
-%define RPM_MINOR_VERSION 11
+%define RPM_MINOR_VERSION 12
 %define go_version 1.12.10
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
diff --git a/SPECS/caas-helm.spec b/SPECS/caas-helm.spec
index b68aa28..6cd384f 100644
--- a/SPECS/caas-helm.spec
+++ b/SPECS/caas-helm.spec
@@ -15,7 +15,7 @@
 %define COMPONENT helm
 %define RPM_NAME caas-%{COMPONENT}
 %define RPM_MAJOR_VERSION 2.14.3
-%define RPM_MINOR_VERSION 4
+%define RPM_MINOR_VERSION 5
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define go_version 1.12.10
 %define binary_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/binary-save
diff --git a/ansible/roles/chart_repo/templates/chart-repo.yml b/ansible/roles/chart_repo/templates/chart-repo.yml
index cef7bbd..580adb2 100644
--- a/ansible/roles/chart_repo/templates/chart-repo.yml
+++ b/ansible/roles/chart_repo/templates/chart-repo.yml
@@ -32,7 +32,7 @@ spec:
       priorityClassName: "system-cluster-critical"
       dnsPolicy: ClusterFirst
       nodeSelector:
-        nodename: caas_master1
+        nodetype: caas_master
       securityContext:
         runAsUser: {{ caas.uid.chartrepo }}
       containers:
diff --git a/ansible/roles/helm/templates/tiller.yml b/ansible/roles/helm/templates/tiller.yml
index 3f914c9..5762d81 100644
--- a/ansible/roles/helm/templates/tiller.yml
+++ b/ansible/roles/helm/templates/tiller.yml
@@ -32,7 +32,7 @@ spec:
       priorityClassName: "system-cluster-critical"
       dnsPolicy: ClusterFirst
       nodeSelector:
-        nodename: caas_master1
+        nodetype: caas_master
       securityContext:
         runAsUser: {{ caas.uid.kube }}
       containers: