Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add YAML document separators #458

Merged
merged 1 commit into from
Apr 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions galaxy/templates/configmap-cvmfs-fix.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: v1
kind: ConfigMap
metadata:
Expand Down
5 changes: 2 additions & 3 deletions galaxy/templates/configmap-extra-files.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{{- range $key, $entry := .Values.extraFileMappings -}}
{{- if $entry }}
---
apiVersion: v1
metadata:
# Extract the filename portion only
Expand All @@ -20,9 +21,9 @@ data:
{{- else }}
{{- $entry.content | nindent 4 }}
{{- end }}
---
{{- end }}
{{- end }}
---
apiVersion: v1
metadata:
name: {{ include "galaxy.fullname" $ }}-probedb-py
Expand All @@ -32,5 +33,3 @@ kind: ConfigMap
data:
probedb.py: |
{{- (.Files.Get "scripts/probedb.py") | nindent 4 }}
---
1 change: 1 addition & 0 deletions galaxy/templates/configmap-galaxy-rules.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: v1
kind: ConfigMap
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/configmap-grafana-dashboard.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- if .Values.influxdb.enabled }}
---
apiVersion: v1
kind: ConfigMap
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/configmap-nginx.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: v1
kind: ConfigMap
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/configs-galaxy.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: v1
metadata:
name: {{ include "galaxy.fullname" . }}-configs
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/cronjob-maintenance.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: batch/v1
kind: CronJob
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/deployment-celery-beat.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/deployment-celery.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
2 changes: 1 addition & 1 deletion galaxy/templates/deployment-job.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- range $handler_num, $e := until (int $.Values.jobHandlers.replicaCount) }}
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down Expand Up @@ -210,5 +211,4 @@ spec:
tolerations:
{{- toYaml . | nindent 8 }}
{{- end }}
---
{{- end }}
1 change: 1 addition & 0 deletions galaxy/templates/deployment-metrics.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- if .Values.metrics.enabled }}
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/deployment-nginx.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/deployment-tusd.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{ if .Values.tusd.enabled -}}
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/deployment-web.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/deployment-workflow.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/hook-cvmfs-fix.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{{- if and .Values.refdata.enabled (eq .Values.refdata.type "cvmfs") }}
# Include the code you want to run when both conditions are met
---
apiVersion: batch/v1
kind: Job
metadata:
Expand Down
3 changes: 2 additions & 1 deletion galaxy/templates/ingress-activity-canary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
{{- $fullName := include "galaxy.fullname" . -}}
{{- $ingressPath := .Values.ingress.path -}}
{{- $servicePort := .Values.service.port -}}
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
Expand Down Expand Up @@ -42,4 +43,4 @@ spec:
number: {{ $servicePort }}
{{- end }}
{{- end }}
---

3 changes: 2 additions & 1 deletion galaxy/templates/ingress-tusd.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{{- if and .Values.tusd.enabled .Values.tusd.ingress.enabled -}}
{{- $fullName := include "galaxy.fullname" . -}}
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
Expand Down Expand Up @@ -38,4 +39,4 @@ spec:
{{- end }}
{{- end }}
{{- end }}
---

2 changes: 1 addition & 1 deletion galaxy/templates/ingress.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "galaxy.fullname" . -}}
{{- $servicePort := .Values.service.port -}}
---
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
Expand Down Expand Up @@ -39,4 +40,3 @@ spec:
{{- end }}
{{- end }}
{{- end }}
---
1 change: 1 addition & 0 deletions galaxy/templates/jobs-init.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: batch/v1
kind: Job
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/priorityclass-job.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- if and .Values.jobs.priorityClass.enabled (not .Values.jobs.priorityClass.existingClass) }}
---
apiVersion: scheduling.k8s.io/v1
kind: PriorityClass
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/pv-s3fs.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- if and .Values.refdata.enabled (eq .Values.refdata.type "s3csi") }}
---
apiVersion: v1
kind: PersistentVolume
metadata:
Expand Down
2 changes: 1 addition & 1 deletion galaxy/templates/pvc-galaxy.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{ if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}}
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
Expand All @@ -23,4 +24,3 @@ spec:
requests:
storage: {{ .Values.persistence.size | quote }}
{{ end }}
---
2 changes: 1 addition & 1 deletion galaxy/templates/pvc-refdata.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- if .Values.refdata.enabled }}
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
Expand All @@ -18,5 +19,4 @@ spec:
{{- if eq $.Values.refdata.type "cvmfs" }}
storageClassName: {{ tpl .Values.cvmfs.storageClassName . }}
{{- end }}
---
{{- end }}
1 change: 1 addition & 0 deletions galaxy/templates/rabbitmqcluster.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- if and .Values.rabbitmq.enabled (not .Values.rabbitmq.existingCluster) }}
---
apiVersion: rabbitmq.com/v1beta1
kind: RabbitmqCluster
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/rbac-job.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{ if .Values.rbac.enabled }}
---
kind: Role
apiVersion: rbac.authorization.k8s.io/v1
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/secret-galaxy.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: v1
kind: Secret
type: Opaque
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/service-galaxy.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: v1
kind: Service
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/service-nginx.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
apiVersion: v1
kind: Service
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/service-tusd.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{ if .Values.tusd.enabled -}}
---
apiVersion: v1
kind: Service
metadata:
Expand Down
1 change: 1 addition & 0 deletions galaxy/templates/serviceaccount.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{{- if .Values.serviceAccount.create -}}
---
apiVersion: v1
kind: ServiceAccount
metadata:
Expand Down
Loading