From aeeb0140691d1a0b68a87c14a1e56a7c8b9d0dea Mon Sep 17 00:00:00 2001 From: Sanya Kochhar Date: Thu, 21 Oct 2021 16:22:39 -0400 Subject: [PATCH] chore(cleanup): remove cleanup script Deletes the cleanup script as this is no longer used and is documented as user-facing steps in osm-docs/pull/254 Signed-off-by: Sanya Kochhar --- charts/osm/templates/cleanup-hook.yaml | 1 + scripts/cleanup/osm-cleanup.sh | 21 --------------------- 2 files changed, 1 insertion(+), 21 deletions(-) delete mode 100755 scripts/cleanup/osm-cleanup.sh diff --git a/charts/osm/templates/cleanup-hook.yaml b/charts/osm/templates/cleanup-hook.yaml index 61e93629c3..aced380591 100644 --- a/charts/osm/templates/cleanup-hook.yaml +++ b/charts/osm/templates/cleanup-hook.yaml @@ -76,6 +76,7 @@ spec: - name: garbage-collector image: "{{ include "osmCRDs.image" . }}" imagePullPolicy: {{ .Values.osm.image.pullPolicy }} + # NOTE: any changes to resources being cleaned up should be updated in the lists/commands in the uninstall guide (https://github.com/openservicemesh/osm-docs/blob/main/content/docs/guides/uninstall.md#uninstall-osm-control-plane-and-remove-user-provided-resources) and the uninstall troubleshooting guide (https://github.com/openservicemesh/osm-docs/blob/main/content/docs/guides/troubleshooting/uninstall.md) command: - sh - -c diff --git a/scripts/cleanup/osm-cleanup.sh b/scripts/cleanup/osm-cleanup.sh deleted file mode 100755 index 8361e97274..0000000000 --- a/scripts/cleanup/osm-cleanup.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# This script is only for cleaning up leaked resources. -# Please use osm cli or helm uninstall if possible. - -# shellcheck disable=SC1091 -source .env - -MESH_NAME="${MESH_NAME:-osm}" -K8S_NAMESPACE="${K8S_NAMESPACE:-osm-system}" -DEPLOY_GRAFANA="${DEPLOY_GRAFANA:-true}" -ENABLE_FLUENTBIT="${ENABLE_FLUENTBIT:-false}" -DEPLOY_PROMETHEUS="${DEPLOY_PROMETHEUS:-true}" - - -helm template "$MESH_NAME" ./charts/osm \ - --set osm.osmNamespace="$K8S_NAMESPACE" \ - --set osm.deployGrafana="$DEPLOY_GRAFANA" \ - --set osm.enableFluentbit="$ENABLE_FLUENTBIT" \ - --set osm.deployPrometheus="$DEPLOY_PROMETHEUS" \ - | kubectl delete --ignore-not-found -f -