From a4c769f4bbaab9874753db7396ee94eca2bd8557 Mon Sep 17 00:00:00 2001 From: NilsKrattinger Date: Wed, 7 Aug 2024 16:17:51 +0200 Subject: [PATCH 1/7] feat: Add deployPostIntallFix flag to disable Fix --- galaxy/templates/configmap-cvmfs-fix.yaml | 3 +++ galaxy/templates/hook-cvmfs-fix.yaml | 3 +-- galaxy/values.yaml | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/galaxy/templates/configmap-cvmfs-fix.yaml b/galaxy/templates/configmap-cvmfs-fix.yaml index f680f119..3fcc04f4 100644 --- a/galaxy/templates/configmap-cvmfs-fix.yaml +++ b/galaxy/templates/configmap-cvmfs-fix.yaml @@ -1,3 +1,5 @@ +{{- if and .Values.cvmfs.deployPostInstallFix .Values.refdata.enabled (eq .Values.refdata.type "cvmfs") }} + --- apiVersion: v1 kind: ConfigMap @@ -17,3 +19,4 @@ data: 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." + {{- end }} \ No newline at end of file diff --git a/galaxy/templates/hook-cvmfs-fix.yaml b/galaxy/templates/hook-cvmfs-fix.yaml index 7e88b036..9ca1738b 100644 --- a/galaxy/templates/hook-cvmfs-fix.yaml +++ b/galaxy/templates/hook-cvmfs-fix.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.refdata.enabled (eq .Values.refdata.type "cvmfs") }} +{{- if and .Values.cvmfs.deployPostInstallFix .Values.refdata.enabled (eq .Values.refdata.type "cvmfs") }} --- # Include the code you want to run when both conditions are met apiVersion: batch/v1 @@ -37,4 +37,3 @@ spec: configMap: name: "{{ .Release.Name }}-configmap-cvmfs-fix" {{- end }} - diff --git a/galaxy/values.yaml b/galaxy/values.yaml index 6da949fd..4eafeee0 100644 --- a/galaxy/values.yaml +++ b/galaxy/values.yaml @@ -429,6 +429,8 @@ refdata: cvmfs: #- Deploy the Galaxy-CVMFS-CSI Helm Chart. This is an optional dependency, and for production scenarios it should be deployed separately as a cluster-wide resource deploy: true + #- Deploy the CVMF post install fix, + deployPostInstallFix: false storageClassName: "{{ $.Release.Name }}-cvmfs" #- Configuration block if `s3csi` is used as the `refdata.type` From c185f0ea25a84870db27ca5c3fb5d3897dcc4fd6 Mon Sep 17 00:00:00 2001 From: NilsKrattinger Date: Wed, 7 Aug 2024 17:30:21 +0200 Subject: [PATCH 2/7] feat: Add extrnalCvmfsNamespace support. --- galaxy/templates/configmap-cvmfs-fix.yaml | 10 +++++----- galaxy/values.yaml | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/galaxy/templates/configmap-cvmfs-fix.yaml b/galaxy/templates/configmap-cvmfs-fix.yaml index 3fcc04f4..73b5b4f2 100644 --- a/galaxy/templates/configmap-cvmfs-fix.yaml +++ b/galaxy/templates/configmap-cvmfs-fix.yaml @@ -1,5 +1,5 @@ {{- if and .Values.cvmfs.deployPostInstallFix .Values.refdata.enabled (eq .Values.refdata.type "cvmfs") }} - +{{ $Namespace := .Values.cvmfs.deploy | ternary .Release.Namespace .Values.cvmfs.externalCvmfsNamespace }} --- apiVersion: v1 kind: ConfigMap @@ -10,13 +10,13 @@ metadata: 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'` + status=`kubectl get pods -n {{ $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'` + status=`kubectl get pods -n {{ $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 && \ + kubectl get pods -n {{ $Namespace }} -l 'app=cvmfscsi' -l 'component=nodeplugin' -o name | xargs kubectl -n {{ $Namespace }} delete && \ echo "Deleted nodeplugin pods." - {{- end }} \ No newline at end of file +{{- end }} \ No newline at end of file diff --git a/galaxy/values.yaml b/galaxy/values.yaml index 4eafeee0..50529422 100644 --- a/galaxy/values.yaml +++ b/galaxy/values.yaml @@ -430,7 +430,9 @@ cvmfs: #- Deploy the Galaxy-CVMFS-CSI Helm Chart. This is an optional dependency, and for production scenarios it should be deployed separately as a cluster-wide resource deploy: true #- Deploy the CVMF post install fix, - deployPostInstallFix: false + deployPostInstallFix: true + #- Define the namespace where the cvmfs NodePlugin is deployed, if cvmfs.deploy is true, this isn't used. + externalCvmfsNamespace: storageClassName: "{{ $.Release.Name }}-cvmfs" #- Configuration block if `s3csi` is used as the `refdata.type` From bb60f245bb8aee7a72112047c7badc1474f419ed Mon Sep 17 00:00:00 2001 From: NilsKrattinger Date: Wed, 7 Aug 2024 17:40:29 +0200 Subject: [PATCH 3/7] doc: add deployPostIntallFix & extranalCvmfsNamespace in doc add in VALUES.md and README.md fix: add mising \n in configmap --- README.md | 2 ++ VALUES.md | 2 ++ galaxy/templates/configmap-cvmfs-fix.yaml | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fc7d6871..a7a7e5b1 100644 --- a/README.md +++ b/README.md @@ -167,6 +167,8 @@ current default values can be found in `values.yaml` file. | `cvmfs.deploy` | Deploy the Galaxy-CVMFS-CSI Helm Chart. This is an optional dependency, and for production scenarios it should be deployed separately as a cluster-wide resource | | `cvmfs.enabled` | Enable use of CVMFS in configs, and deployment of CVMFS Persistent Volume Claims for Galaxy | | `cvmfs.pvc.{}` | Persistent Volume Claim to deploy for CVMFS repositories. See `values.yaml` for examples. | +| `cvmfs.deploy` | Deploy the Galaxy-CVMFS-CSI Helm Chart. This is an optional dependency, and for production scenarios it should be deployed separately as a cluster-wide resource | +| `cvmfs.enabled` | Enable use of CVMFS in configs, and deployment of CVMFS Persistent Volume Claims for Galaxy | | `setupJob.ttlSecondsAfterFinished` | Sets `ttlSecondsAfterFinished` for the initialization jobs. See the [Kubernetes documentation](https://kubernetes.io/docs/concepts/workloads/controllers/ttlafterfinished/#ttl-controller) for more details. | | `setupJob.downloadToolConfs.enabled` | Download configuration files and the `tools` directory from an archive via a job at startup | | `setupJob.downloadToolConfs.archives.startup` | A URL to a `tar.gz` publicly accessible archive containing AT LEAST conf files and XML tool wrappers. Meant to be enough for Galaxy handlers to startup. | diff --git a/VALUES.md b/VALUES.md index bbae4835..950ee381 100644 --- a/VALUES.md +++ b/VALUES.md @@ -41,6 +41,8 @@ | refdata.type | `s3fs` or `cvmfs`, determines the CSI to use for mounting reference data. `cvmfs` is the default and recommended for the time being. | | cvmfs | Configuration block if `cvmfs` is used as `refdata.type` | | cvmfs.deploy | Deploy the Galaxy-CVMFS-CSI Helm Chart. This is an optional dependency, and for production scenarios it should be deployed separately as a cluster-wide resource | +| cvmfs.deployPostInstallFix| Deploy the fix for Galaxy-CVMFS-CSI Helm Chart. | +| cvmfs.externalCvmfsNamespace|Define the namespace where the cvmfs NodePlugin is deployed, if cvmfs.deploy is true, this isn't used. | | s3csi | Configuration block if `s3csi` is used as the `refdata.type` | | s3csi.deploy | Deploy the CSI-S3 Helm Chart. This is an optional dependency, and for production scenarios it should be deployed separately as a cluster-wide resource. | | useSecretConfigs | When this flag is set to true, all configs will be set in secrets, when it is set to false, all configs will be set in configmaps | diff --git a/galaxy/templates/configmap-cvmfs-fix.yaml b/galaxy/templates/configmap-cvmfs-fix.yaml index 73b5b4f2..fc268b16 100644 --- a/galaxy/templates/configmap-cvmfs-fix.yaml +++ b/galaxy/templates/configmap-cvmfs-fix.yaml @@ -19,4 +19,4 @@ data: echo "Deleting nodeplugin pods..." kubectl get pods -n {{ $Namespace }} -l 'app=cvmfscsi' -l 'component=nodeplugin' -o name | xargs kubectl -n {{ $Namespace }} delete && \ echo "Deleted nodeplugin pods." -{{- end }} \ No newline at end of file +{{- end }} From 0fde3ab45d66840247a75428032f8053d8d8d4f9 Mon Sep 17 00:00:00 2001 From: NilsKrattinger Date: Thu, 8 Aug 2024 14:55:15 +0200 Subject: [PATCH 4/7] feat: Add service account and RBAC to Join Nodeplugin Namesapce --- galaxy/templates/hook-cvmfs-fix.yaml | 4 +-- galaxy/templates/rbac-fix-cvmfs.yaml | 42 ++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 galaxy/templates/rbac-fix-cvmfs.yaml diff --git a/galaxy/templates/hook-cvmfs-fix.yaml b/galaxy/templates/hook-cvmfs-fix.yaml index 9ca1738b..08d141f2 100644 --- a/galaxy/templates/hook-cvmfs-fix.yaml +++ b/galaxy/templates/hook-cvmfs-fix.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.cvmfs.deployPostInstallFix .Values.refdata.enabled (eq .Values.refdata.type "cvmfs") }} +{{- if and .Values.cvmfs.deployPostInstallFix .Values.refdata.enabled (eq .Values.refdata.type "cvmfs") }} --- # Include the code you want to run when both conditions are met apiVersion: batch/v1 @@ -19,7 +19,7 @@ spec: labels: {{- include "galaxy.labels" . | nindent 8 }} spec: - serviceAccountName: {{ include "galaxy.serviceAccountName" . }} + serviceAccountName: {{ .Values.cvmfs.deploy | ternary ( include "galaxy.serviceAccountName" . ) (printf "%s-cvmfs-fix" (include "galaxy.fullname" .)) }} securityContext: {{- toYaml .Values.securityContext | nindent 8 }} restartPolicy: Never diff --git a/galaxy/templates/rbac-fix-cvmfs.yaml b/galaxy/templates/rbac-fix-cvmfs.yaml new file mode 100644 index 00000000..4cad7e7b --- /dev/null +++ b/galaxy/templates/rbac-fix-cvmfs.yaml @@ -0,0 +1,42 @@ +{{- if and .Values.cvmfs.deployPostInstallFix (not .Values.cvmfs.deploy) .Values.refdata.enabled (eq .Values.refdata.type "cvmfs") }} +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "galaxy.fullname" . }}-cvmfs-fix + namespace: {{ .Release.Namespace }} + labels: + {{- include "galaxy.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +--- +kind: Role +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + namespace: {{ .Values.cvmfs.externalCvmfsNamespace }} + name: {{ include "galaxy.fullname" . }}-cvmfs-fix + labels: + {{- include "galaxy.labels" . | nindent 4 }} +rules: +- apiGroups: [""] + resources: ["pods"] + verbs: ["get", "list","watch","delete"] +--- +kind: RoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: {{ include "galaxy.fullname" . }}-cvmfs-fix + namespace: {{ .Values.cvmfs.externalCvmfsNamespace }} + labels: + {{- include "galaxy.labels" . | nindent 4 }} +subjects: +- kind: ServiceAccount + name: {{ include "galaxy.fullname" . }}-cvmfs-fix + namespace: {{ .Release.Namespace }} +roleRef: + kind: Role + name: {{ include "galaxy.fullname" . }}-cvmfs-fix + apiGroup: rbac.authorization.k8s.io +{{ end }} From 700d061d943436871815b709a8ff58ecc33eeb5a Mon Sep 17 00:00:00 2001 From: NilsKrattinger Date: Mon, 12 Aug 2024 09:48:33 +0200 Subject: [PATCH 5/7] fix: Update readme doc about CVMFS fix --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a7a7e5b1..ff4d89eb 100644 --- a/README.md +++ b/README.md @@ -167,8 +167,8 @@ current default values can be found in `values.yaml` file. | `cvmfs.deploy` | Deploy the Galaxy-CVMFS-CSI Helm Chart. This is an optional dependency, and for production scenarios it should be deployed separately as a cluster-wide resource | | `cvmfs.enabled` | Enable use of CVMFS in configs, and deployment of CVMFS Persistent Volume Claims for Galaxy | | `cvmfs.pvc.{}` | Persistent Volume Claim to deploy for CVMFS repositories. See `values.yaml` for examples. | -| `cvmfs.deploy` | Deploy the Galaxy-CVMFS-CSI Helm Chart. This is an optional dependency, and for production scenarios it should be deployed separately as a cluster-wide resource | -| `cvmfs.enabled` | Enable use of CVMFS in configs, and deployment of CVMFS Persistent Volume Claims for Galaxy | +| `cvmfs.deployPostInstallFix` |Deploy the fix for Galaxy-CVMFS-CSI Helm Chart. | +| `cvmfs.externalCvmfsNamespace` | Define the namespace where the cvmfs NodePlugin is deployed, if cvmfs.deploy is true, this isn't used. | | `setupJob.ttlSecondsAfterFinished` | Sets `ttlSecondsAfterFinished` for the initialization jobs. See the [Kubernetes documentation](https://kubernetes.io/docs/concepts/workloads/controllers/ttlafterfinished/#ttl-controller) for more details. | | `setupJob.downloadToolConfs.enabled` | Download configuration files and the `tools` directory from an archive via a job at startup | | `setupJob.downloadToolConfs.archives.startup` | A URL to a `tar.gz` publicly accessible archive containing AT LEAST conf files and XML tool wrappers. Meant to be enough for Galaxy handlers to startup. | From 4664c73f7c25c0b4977a2f1aeffe2efd5a10e23b Mon Sep 17 00:00:00 2001 From: NilsKrattinger Date: Tue, 13 Aug 2024 11:35:13 +0200 Subject: [PATCH 6/7] feat: remove cvmfs extrnal restart capability --- README.md | 1 - VALUES.md | 1 - galaxy/templates/configmap-cvmfs-fix.yaml | 7 ++-- galaxy/templates/hook-cvmfs-fix.yaml | 2 +- galaxy/templates/rbac-fix-cvmfs.yaml | 42 ----------------------- galaxy/values.yaml | 2 -- 6 files changed, 4 insertions(+), 51 deletions(-) delete mode 100644 galaxy/templates/rbac-fix-cvmfs.yaml diff --git a/README.md b/README.md index ff4d89eb..3a1be528 100644 --- a/README.md +++ b/README.md @@ -168,7 +168,6 @@ current default values can be found in `values.yaml` file. | `cvmfs.enabled` | Enable use of CVMFS in configs, and deployment of CVMFS Persistent Volume Claims for Galaxy | | `cvmfs.pvc.{}` | Persistent Volume Claim to deploy for CVMFS repositories. See `values.yaml` for examples. | | `cvmfs.deployPostInstallFix` |Deploy the fix for Galaxy-CVMFS-CSI Helm Chart. | -| `cvmfs.externalCvmfsNamespace` | Define the namespace where the cvmfs NodePlugin is deployed, if cvmfs.deploy is true, this isn't used. | | `setupJob.ttlSecondsAfterFinished` | Sets `ttlSecondsAfterFinished` for the initialization jobs. See the [Kubernetes documentation](https://kubernetes.io/docs/concepts/workloads/controllers/ttlafterfinished/#ttl-controller) for more details. | | `setupJob.downloadToolConfs.enabled` | Download configuration files and the `tools` directory from an archive via a job at startup | | `setupJob.downloadToolConfs.archives.startup` | A URL to a `tar.gz` publicly accessible archive containing AT LEAST conf files and XML tool wrappers. Meant to be enough for Galaxy handlers to startup. | diff --git a/VALUES.md b/VALUES.md index 950ee381..319c31e8 100644 --- a/VALUES.md +++ b/VALUES.md @@ -42,7 +42,6 @@ | cvmfs | Configuration block if `cvmfs` is used as `refdata.type` | | cvmfs.deploy | Deploy the Galaxy-CVMFS-CSI Helm Chart. This is an optional dependency, and for production scenarios it should be deployed separately as a cluster-wide resource | | cvmfs.deployPostInstallFix| Deploy the fix for Galaxy-CVMFS-CSI Helm Chart. | -| cvmfs.externalCvmfsNamespace|Define the namespace where the cvmfs NodePlugin is deployed, if cvmfs.deploy is true, this isn't used. | | s3csi | Configuration block if `s3csi` is used as the `refdata.type` | | s3csi.deploy | Deploy the CSI-S3 Helm Chart. This is an optional dependency, and for production scenarios it should be deployed separately as a cluster-wide resource. | | useSecretConfigs | When this flag is set to true, all configs will be set in secrets, when it is set to false, all configs will be set in configmaps | diff --git a/galaxy/templates/configmap-cvmfs-fix.yaml b/galaxy/templates/configmap-cvmfs-fix.yaml index fc268b16..11178d85 100644 --- a/galaxy/templates/configmap-cvmfs-fix.yaml +++ b/galaxy/templates/configmap-cvmfs-fix.yaml @@ -1,5 +1,4 @@ {{- if and .Values.cvmfs.deployPostInstallFix .Values.refdata.enabled (eq .Values.refdata.type "cvmfs") }} -{{ $Namespace := .Values.cvmfs.deploy | ternary .Release.Namespace .Values.cvmfs.externalCvmfsNamespace }} --- apiVersion: v1 kind: ConfigMap @@ -10,13 +9,13 @@ metadata: data: cvmfs-fix.sh: | sleep 10; - status=`kubectl get pods -n {{ $Namespace }} -l 'app=cvmfscsi' -l 'component=nodeplugin' -o custom-columns=STATUS:.status.phase --no-headers | sort | uniq | tr -d '\n'` + 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 {{ $Namespace }} -l 'app=cvmfscsi' -l 'component=nodeplugin' -o custom-columns=STATUS:.status.phase --no-headers | sort | uniq | tr -d '\n'` + 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 {{ $Namespace }} -l 'app=cvmfscsi' -l 'component=nodeplugin' -o name | xargs kubectl -n {{ $Namespace }} delete && \ + kubectl get pods -n {{ .Release.Namespace }} -l 'app=cvmfscsi' -l 'component=nodeplugin' -o name | xargs kubectl -n {{ .Release.Namespace }} delete && \ echo "Deleted nodeplugin pods." {{- end }} diff --git a/galaxy/templates/hook-cvmfs-fix.yaml b/galaxy/templates/hook-cvmfs-fix.yaml index 08d141f2..89150080 100644 --- a/galaxy/templates/hook-cvmfs-fix.yaml +++ b/galaxy/templates/hook-cvmfs-fix.yaml @@ -19,7 +19,7 @@ spec: labels: {{- include "galaxy.labels" . | nindent 8 }} spec: - serviceAccountName: {{ .Values.cvmfs.deploy | ternary ( include "galaxy.serviceAccountName" . ) (printf "%s-cvmfs-fix" (include "galaxy.fullname" .)) }} + serviceAccountName: {{ include "galaxy.serviceAccountName" . }} securityContext: {{- toYaml .Values.securityContext | nindent 8 }} restartPolicy: Never diff --git a/galaxy/templates/rbac-fix-cvmfs.yaml b/galaxy/templates/rbac-fix-cvmfs.yaml deleted file mode 100644 index 4cad7e7b..00000000 --- a/galaxy/templates/rbac-fix-cvmfs.yaml +++ /dev/null @@ -1,42 +0,0 @@ -{{- if and .Values.cvmfs.deployPostInstallFix (not .Values.cvmfs.deploy) .Values.refdata.enabled (eq .Values.refdata.type "cvmfs") }} ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: {{ include "galaxy.fullname" . }}-cvmfs-fix - namespace: {{ .Release.Namespace }} - labels: - {{- include "galaxy.labels" . | nindent 4 }} - {{- with .Values.serviceAccount.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} ---- -kind: Role -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - namespace: {{ .Values.cvmfs.externalCvmfsNamespace }} - name: {{ include "galaxy.fullname" . }}-cvmfs-fix - labels: - {{- include "galaxy.labels" . | nindent 4 }} -rules: -- apiGroups: [""] - resources: ["pods"] - verbs: ["get", "list","watch","delete"] ---- -kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1 -metadata: - name: {{ include "galaxy.fullname" . }}-cvmfs-fix - namespace: {{ .Values.cvmfs.externalCvmfsNamespace }} - labels: - {{- include "galaxy.labels" . | nindent 4 }} -subjects: -- kind: ServiceAccount - name: {{ include "galaxy.fullname" . }}-cvmfs-fix - namespace: {{ .Release.Namespace }} -roleRef: - kind: Role - name: {{ include "galaxy.fullname" . }}-cvmfs-fix - apiGroup: rbac.authorization.k8s.io -{{ end }} diff --git a/galaxy/values.yaml b/galaxy/values.yaml index 50529422..26921b69 100644 --- a/galaxy/values.yaml +++ b/galaxy/values.yaml @@ -431,8 +431,6 @@ cvmfs: deploy: true #- Deploy the CVMF post install fix, deployPostInstallFix: true - #- Define the namespace where the cvmfs NodePlugin is deployed, if cvmfs.deploy is true, this isn't used. - externalCvmfsNamespace: storageClassName: "{{ $.Release.Name }}-cvmfs" #- Configuration block if `s3csi` is used as the `refdata.type` From 8723418055d194a4341f1a0a81b090eb8546bf63 Mon Sep 17 00:00:00 2001 From: NilsKrattinger Date: Tue, 13 Aug 2024 11:37:09 +0200 Subject: [PATCH 7/7] fix: Remove extra withspace in hook-cvmfs-fix --- galaxy/templates/hook-cvmfs-fix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/galaxy/templates/hook-cvmfs-fix.yaml b/galaxy/templates/hook-cvmfs-fix.yaml index 89150080..9ca1738b 100644 --- a/galaxy/templates/hook-cvmfs-fix.yaml +++ b/galaxy/templates/hook-cvmfs-fix.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.cvmfs.deployPostInstallFix .Values.refdata.enabled (eq .Values.refdata.type "cvmfs") }} +{{- if and .Values.cvmfs.deployPostInstallFix .Values.refdata.enabled (eq .Values.refdata.type "cvmfs") }} --- # Include the code you want to run when both conditions are met apiVersion: batch/v1