From fcf42dd44f078be3cd4be97e3c296436a5229d3f Mon Sep 17 00:00:00 2001 From: Hu Zhou Date: Fri, 17 Jan 2020 11:40:49 +0200 Subject: [PATCH] Add maintenance toleration for chart and tiller Change-Id: Ibebacb5f546fafadb01302124f36f8d1a6853529 Signed-off-by: Hu Zhou --- SPECS/caas-chartrepo.spec | 2 +- SPECS/caas-helm.spec | 2 +- ansible/roles/chart_repo/templates/chart-repo.yml | 5 +++++ ansible/roles/helm/templates/tiller.yml | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/SPECS/caas-chartrepo.spec b/SPECS/caas-chartrepo.spec index d021788..e2a4639 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 12 +%define RPM_MINOR_VERSION 13 %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 80b0edf..6c73965 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.15.2 -%define RPM_MINOR_VERSION 0 +%define RPM_MINOR_VERSION 1 %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 9a111a7..cad9b3c 100644 --- a/ansible/roles/chart_repo/templates/chart-repo.yml +++ b/ansible/roles/chart_repo/templates/chart-repo.yml @@ -33,6 +33,11 @@ spec: dnsPolicy: ClusterFirst nodeSelector: nodetype: caas_master + tolerations: + - key: "node-maintenancemode" + value: "enabled" + operator: "Equal" + effect: "NoExecute" securityContext: runAsUser: {{ caas.uid.chartrepo }} containers: diff --git a/ansible/roles/helm/templates/tiller.yml b/ansible/roles/helm/templates/tiller.yml index 5762d81..51f06ff 100644 --- a/ansible/roles/helm/templates/tiller.yml +++ b/ansible/roles/helm/templates/tiller.yml @@ -33,6 +33,11 @@ spec: dnsPolicy: ClusterFirst nodeSelector: nodetype: caas_master + tolerations: + - key: "node-maintenancemode" + value: "enabled" + operator: "Equal" + effect: "NoExecute" securityContext: runAsUser: {{ caas.uid.kube }} containers: -- 2.16.6