From 81f7f37a0c6eefaba48ab40594da04bcafa628c1 Mon Sep 17 00:00:00 2001
From: rick <1450685+LinuxSuRen@users.noreply.github.com>
Date: Thu, 12 May 2022 10:00:40 +0800
Subject: [PATCH] Avoid install s2i templates via the helm chart

Signed-off-by: rick <1450685+LinuxSuRen@users.noreply.github.com>
---
 roles/ks-devops/tasks/main.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/roles/ks-devops/tasks/main.yaml b/roles/ks-devops/tasks/main.yaml
index f883aa944..decc4319f 100644
--- a/roles/ks-devops/tasks/main.yaml
+++ b/roles/ks-devops/tasks/main.yaml
@@ -210,6 +210,11 @@
       -s templates/nodejs.yaml \
       -s templates/python.yaml \
       -s templates/tomcat.yaml > s2i-templates\templates.yaml
+    rm -rf $charts_folder/ks-devops/charts/s2i/templates/binary.yaml
+    rm -rf $charts_folder/ks-devops/charts/s2i/templates/java.yaml
+    rm -rf $charts_folder/ks-devops/charts/s2i/templates/nodejs.yaml
+    rm -rf $charts_folder/ks-devops/charts/s2i/templates/python.yaml
+    rm -rf $charts_folder/ks-devops/charts/s2i/templates/tomcat.yaml
 
     {{ bin_dir }}/helm upgrade --install devops $ks_devops_chart \
     -n kubesphere-devops-system \