Merge pull request #74 from seungkyua/20220328_install_eck_kibana

fix install grafana
openinfradev · Apr 5, 2022 · 5f32853 · 5f32853
2 parents e5c2682 + c29c0fe
commit 5f32853
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/deploy_apps/tks-service-mesh-dashboard-wftpl.yaml b/deploy_apps/tks-service-mesh-dashboard-wftpl.yaml
@@ -1115,7 +1115,12 @@ spec:
               default_home_dashboard_path: /tmp/dashboards/istio-control-plane-dashboard.json
           EOF
 
-          helm $kube_params upgrade -i grafana grafana/grafana --version 6.23.1 -f /tmp/grafana-values.yaml -n ${APP_NAMESPACE} 
+          ### delete psp and clusterrole, clusterrolebinding first.
+          kubectl $kube_params delete psp -n ${APP_NAMESPACE} grafana grafana-test || true
+          kubectl $kube_params delete clusterrole grafana-clusterrole || true
+          kubectl $kube_params delete clusterrolebinding grafana-clusterrolebinding || true
+
+          helm $kube_params upgrade -i grafana grafana/grafana --version 6.23.1 -f /tmp/grafana-values.yaml -n ${APP_NAMESPACE}
 
           log "INFO" "grafana: grafana-${REALMS} successfully created."
     activeDeadlineSeconds: 900