Add maintenance toleration for chart and tiller

[ta/caas-helm.git] / ansible / roles / chart_repo / templates / chart-repo.yml

diff --git a/ansible/roles/chart_repo/templates/chart-repo.yml b/ansible/roles/chart_repo/templates/chart-repo.yml
index 465d77c..cad9b3c 100644 (file)
--- a/ansible/roles/chart_repo/templates/chart-repo.yml
+++ b/ansible/roles/chart_repo/templates/chart-repo.yml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 #}
 ---
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: chart-repo
@@ -32,7 +32,12 @@ spec:
       priorityClassName: "system-cluster-critical"
       dnsPolicy: ClusterFirst
       nodeSelector:
-        nodename: caas_master1
+        nodetype: caas_master
+      tolerations:
+      - key: "node-maintenancemode"
+        value: "enabled"
+        operator: "Equal"
+        effect: "NoExecute"
       securityContext:
         runAsUser: {{ caas.uid.chartrepo }}
       containers:
@@ -63,9 +68,9 @@ spec:
             - name: CHARTREPOHANDLER_INDEXPATH
               value: charts
             - name: CHARTREPOHANDLER_TLSCERTPATH
-              value: /etc/chart-repo/ssl/chart-repo{{ nodeindex }}.pem
+              value: /etc/chart-repo/ssl/chart-repo.pem
             - name: CHARTREPOHANDLER_TLSKEYPATH
-              value: /etc/chart-repo/ssl/chart-repo{{ nodeindex }}-key.pem
+              value: /etc/chart-repo/ssl/chart-repo-key.pem
             - name: CHARTREPOHANDLER_TLSCAPATH
               value: /etc/chart-repo/ssl/ca.pem
           volumeMounts: