From f285b1b9b62582c41242db4f40a8c58a999d5efe Mon Sep 17 00:00:00 2001
From: Keith Suderman <suderman@jhu.edu>
Date: Fri, 18 Aug 2023 15:38:45 -0400
Subject: [PATCH] Remove the CVMFS fix (hack).  Closes #439

---
 galaxy/templates/configmap-cvmfs-fix.yaml | 18 ------------
 galaxy/templates/hook-cvmfs-fix.yaml      | 35 -----------------------
 2 files changed, 53 deletions(-)
 delete mode 100644 galaxy/templates/configmap-cvmfs-fix.yaml
 delete mode 100644 galaxy/templates/hook-cvmfs-fix.yaml

diff --git a/galaxy/templates/configmap-cvmfs-fix.yaml b/galaxy/templates/configmap-cvmfs-fix.yaml
deleted file mode 100644
index d5d4c129..00000000
--- a/galaxy/templates/configmap-cvmfs-fix.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ .Release.Name }}-configmap-cvmfs-fix
-  labels:
-    {{- include "galaxy.labels" . | nindent 4 }}
-data:
-  cvmfs-fix.sh: |
-    sleep 10;
-    status=`kubectl get pods -n {{ .Release.Namespace }} -l 'app=cvmfscsi' -l 'component=nodeplugin' -o custom-columns=STATUS:.status.phase --no-headers | sort | uniq | tr -d '\n'`
-    while [ "$status" != "Running" ]; do
-      echo "Waiting on nodeplugin pod to enter 'Running' status. Currently '$status'.";
-      sleep 1;
-      status=`kubectl get pods -n {{ .Release.Namespace }} -l 'app=cvmfscsi' -l 'component=nodeplugin' -o custom-columns=STATUS:.status.phase --no-headers | sort | uniq | tr -d '\n'`
-    done && \
-    echo "Deleting nodeplugin pods..."
-    kubectl get pods -n {{ .Release.Namespace }} -l 'app=cvmfscsi' -l 'component=nodeplugin' -o name | xargs kubectl -n {{ .Release.Namespace }} delete && \
-    echo "Deleted nodeplugin pods."
diff --git a/galaxy/templates/hook-cvmfs-fix.yaml b/galaxy/templates/hook-cvmfs-fix.yaml
deleted file mode 100644
index 12ab3cbd..00000000
--- a/galaxy/templates/hook-cvmfs-fix.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: "{{ .Release.Name }}-post-install-cvmfs-fix-job"
-  labels:
-    {{- include "galaxy.labels" . | nindent 4 }}
-  annotations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-weight": "10"
-    "helm.sh/hook-delete-policy": hook-succeeded
-spec:
-  ttlSecondsAfterFinished: 120
-  template:
-    metadata:
-      name: "{{ .Release.Name }}-post-install-cvmfs-fix-job"
-      labels:
-        {{- include "galaxy.labels" . | nindent 8 }}
-    spec:
-      serviceAccountName: {{ include "galaxy.serviceAccountName" . }}
-      securityContext:
-        {{- toYaml .Values.securityContext | nindent 8 }}
-      restartPolicy: Never
-      containers:
-      - name: post-install-kubectl
-        image: bitnami/kubectl
-        command:
-          - "sh"
-          - "/script/cvmfs-fix.sh"
-        volumeMounts:
-            - name: kubectl-script
-              mountPath: "/script"
-      volumes:
-      - name: kubectl-script
-        configMap:
-          name: "{{ .Release.Name }}-configmap-cvmfs-fix"