From b058b5e2ce1cec54148cccb68805fb755dc35890 Mon Sep 17 00:00:00 2001 From: Keith Suderman Date: Wed, 13 Mar 2024 16:06:07 -0400 Subject: [PATCH] Add YAML document separators (triple dashes) to the start of yaml templates. --- galaxy/templates/configmap-cvmfs-fix.yaml | 1 + galaxy/templates/configmap-extra-files.yaml | 5 ++--- galaxy/templates/configmap-galaxy-rules.yaml | 1 + galaxy/templates/configmap-grafana-dashboard.yaml | 1 + galaxy/templates/configmap-nginx.yaml | 1 + galaxy/templates/configs-galaxy.yaml | 1 + galaxy/templates/cronjob-maintenance.yaml | 1 + galaxy/templates/deployment-celery-beat.yaml | 1 + galaxy/templates/deployment-celery.yaml | 1 + galaxy/templates/deployment-job.yaml | 2 +- galaxy/templates/deployment-metrics.yaml | 1 + galaxy/templates/deployment-nginx.yaml | 1 + galaxy/templates/deployment-tusd.yaml | 1 + galaxy/templates/deployment-web.yaml | 1 + galaxy/templates/deployment-workflow.yaml | 1 + galaxy/templates/hook-cvmfs-fix.yaml | 1 + galaxy/templates/ingress-activity-canary.yaml | 3 ++- galaxy/templates/ingress-tusd.yaml | 3 ++- galaxy/templates/ingress.yaml | 2 +- galaxy/templates/jobs-init.yaml | 1 + galaxy/templates/priorityclass-job.yaml | 1 + galaxy/templates/pv-s3fs.yaml | 1 + galaxy/templates/pvc-galaxy.yaml | 2 +- galaxy/templates/pvc-refdata.yaml | 2 +- galaxy/templates/rabbitmqcluster.yaml | 1 + galaxy/templates/rbac-job.yaml | 1 + galaxy/templates/secret-galaxy.yaml | 1 + galaxy/templates/service-galaxy.yaml | 1 + galaxy/templates/service-nginx.yaml | 1 + galaxy/templates/service-tusd.yaml | 1 + galaxy/templates/serviceaccount.yaml | 1 + 31 files changed, 34 insertions(+), 9 deletions(-) diff --git a/galaxy/templates/configmap-cvmfs-fix.yaml b/galaxy/templates/configmap-cvmfs-fix.yaml index d5d4c129..f680f119 100644 --- a/galaxy/templates/configmap-cvmfs-fix.yaml +++ b/galaxy/templates/configmap-cvmfs-fix.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: ConfigMap metadata: diff --git a/galaxy/templates/configmap-extra-files.yaml b/galaxy/templates/configmap-extra-files.yaml index b0e60f60..53dc516c 100644 --- a/galaxy/templates/configmap-extra-files.yaml +++ b/galaxy/templates/configmap-extra-files.yaml @@ -1,5 +1,6 @@ {{- range $key, $entry := .Values.extraFileMappings -}} {{- if $entry }} +--- apiVersion: v1 metadata: # Extract the filename portion only @@ -20,9 +21,9 @@ data: {{- else }} {{- $entry.content | nindent 4 }} {{- end }} ---- {{- end }} {{- end }} +--- apiVersion: v1 metadata: name: {{ include "galaxy.fullname" $ }}-probedb-py @@ -32,5 +33,3 @@ kind: ConfigMap data: probedb.py: | {{- (.Files.Get "scripts/probedb.py") | nindent 4 }} - ---- diff --git a/galaxy/templates/configmap-galaxy-rules.yaml b/galaxy/templates/configmap-galaxy-rules.yaml index aaa5101c..ed09bb95 100644 --- a/galaxy/templates/configmap-galaxy-rules.yaml +++ b/galaxy/templates/configmap-galaxy-rules.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: ConfigMap metadata: diff --git a/galaxy/templates/configmap-grafana-dashboard.yaml b/galaxy/templates/configmap-grafana-dashboard.yaml index 58d573aa..1ced09bb 100644 --- a/galaxy/templates/configmap-grafana-dashboard.yaml +++ b/galaxy/templates/configmap-grafana-dashboard.yaml @@ -1,4 +1,5 @@ {{- if .Values.influxdb.enabled }} +--- apiVersion: v1 kind: ConfigMap metadata: diff --git a/galaxy/templates/configmap-nginx.yaml b/galaxy/templates/configmap-nginx.yaml index d1166b32..a74409cd 100644 --- a/galaxy/templates/configmap-nginx.yaml +++ b/galaxy/templates/configmap-nginx.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: ConfigMap metadata: diff --git a/galaxy/templates/configs-galaxy.yaml b/galaxy/templates/configs-galaxy.yaml index f1b0e229..4fa8a7ec 100644 --- a/galaxy/templates/configs-galaxy.yaml +++ b/galaxy/templates/configs-galaxy.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1 metadata: name: {{ include "galaxy.fullname" . }}-configs diff --git a/galaxy/templates/cronjob-maintenance.yaml b/galaxy/templates/cronjob-maintenance.yaml index 17b0219a..80deecd5 100644 --- a/galaxy/templates/cronjob-maintenance.yaml +++ b/galaxy/templates/cronjob-maintenance.yaml @@ -1,3 +1,4 @@ +--- apiVersion: batch/v1 kind: CronJob metadata: diff --git a/galaxy/templates/deployment-celery-beat.yaml b/galaxy/templates/deployment-celery-beat.yaml index e50a9622..0f46248d 100644 --- a/galaxy/templates/deployment-celery-beat.yaml +++ b/galaxy/templates/deployment-celery-beat.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galaxy/templates/deployment-celery.yaml b/galaxy/templates/deployment-celery.yaml index c21660f4..100b4ac6 100644 --- a/galaxy/templates/deployment-celery.yaml +++ b/galaxy/templates/deployment-celery.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galaxy/templates/deployment-job.yaml b/galaxy/templates/deployment-job.yaml index 28e12dc3..29988bd1 100644 --- a/galaxy/templates/deployment-job.yaml +++ b/galaxy/templates/deployment-job.yaml @@ -1,4 +1,5 @@ {{- range $handler_num, $e := until (int $.Values.jobHandlers.replicaCount) }} +--- apiVersion: apps/v1 kind: Deployment metadata: @@ -210,5 +211,4 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} ---- {{- end }} diff --git a/galaxy/templates/deployment-metrics.yaml b/galaxy/templates/deployment-metrics.yaml index 3f29b7b6..03637c43 100644 --- a/galaxy/templates/deployment-metrics.yaml +++ b/galaxy/templates/deployment-metrics.yaml @@ -1,4 +1,5 @@ {{- if .Values.metrics.enabled }} +--- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galaxy/templates/deployment-nginx.yaml b/galaxy/templates/deployment-nginx.yaml index 34020fcb..36d0bb6d 100644 --- a/galaxy/templates/deployment-nginx.yaml +++ b/galaxy/templates/deployment-nginx.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galaxy/templates/deployment-tusd.yaml b/galaxy/templates/deployment-tusd.yaml index 45813ab9..0d7d2fb7 100644 --- a/galaxy/templates/deployment-tusd.yaml +++ b/galaxy/templates/deployment-tusd.yaml @@ -1,4 +1,5 @@ {{ if .Values.tusd.enabled -}} +--- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galaxy/templates/deployment-web.yaml b/galaxy/templates/deployment-web.yaml index 0a1f8c49..783d1a52 100644 --- a/galaxy/templates/deployment-web.yaml +++ b/galaxy/templates/deployment-web.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galaxy/templates/deployment-workflow.yaml b/galaxy/templates/deployment-workflow.yaml index ee094f58..b994fbc9 100644 --- a/galaxy/templates/deployment-workflow.yaml +++ b/galaxy/templates/deployment-workflow.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apps/v1 kind: Deployment metadata: diff --git a/galaxy/templates/hook-cvmfs-fix.yaml b/galaxy/templates/hook-cvmfs-fix.yaml index 1caa21ba..a954ae77 100644 --- a/galaxy/templates/hook-cvmfs-fix.yaml +++ b/galaxy/templates/hook-cvmfs-fix.yaml @@ -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: diff --git a/galaxy/templates/ingress-activity-canary.yaml b/galaxy/templates/ingress-activity-canary.yaml index 09c467e1..4cee4b9e 100644 --- a/galaxy/templates/ingress-activity-canary.yaml +++ b/galaxy/templates/ingress-activity-canary.yaml @@ -6,6 +6,7 @@ {{- $fullName := include "galaxy.fullname" . -}} {{- $ingressPath := .Values.ingress.path -}} {{- $servicePort := .Values.service.port -}} +--- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -42,4 +43,4 @@ spec: number: {{ $servicePort }} {{- end }} {{- end }} ---- + diff --git a/galaxy/templates/ingress-tusd.yaml b/galaxy/templates/ingress-tusd.yaml index ebb836a9..36180356 100644 --- a/galaxy/templates/ingress-tusd.yaml +++ b/galaxy/templates/ingress-tusd.yaml @@ -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: @@ -38,4 +39,4 @@ spec: {{- end }} {{- end }} {{- end }} ---- + diff --git a/galaxy/templates/ingress.yaml b/galaxy/templates/ingress.yaml index 9b2458e6..a77b9a2d 100644 --- a/galaxy/templates/ingress.yaml +++ b/galaxy/templates/ingress.yaml @@ -1,6 +1,7 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "galaxy.fullname" . -}} {{- $servicePort := .Values.service.port -}} +--- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -39,4 +40,3 @@ spec: {{- end }} {{- end }} {{- end }} ---- diff --git a/galaxy/templates/jobs-init.yaml b/galaxy/templates/jobs-init.yaml index d72244da..92079e07 100644 --- a/galaxy/templates/jobs-init.yaml +++ b/galaxy/templates/jobs-init.yaml @@ -1,3 +1,4 @@ +--- apiVersion: batch/v1 kind: Job metadata: diff --git a/galaxy/templates/priorityclass-job.yaml b/galaxy/templates/priorityclass-job.yaml index df518387..da4f9b59 100644 --- a/galaxy/templates/priorityclass-job.yaml +++ b/galaxy/templates/priorityclass-job.yaml @@ -1,4 +1,5 @@ {{- if and .Values.jobs.priorityClass.enabled (not .Values.jobs.priorityClass.existingClass) }} +--- apiVersion: scheduling.k8s.io/v1 kind: PriorityClass metadata: diff --git a/galaxy/templates/pv-s3fs.yaml b/galaxy/templates/pv-s3fs.yaml index 2948960c..4b0fb2fd 100644 --- a/galaxy/templates/pv-s3fs.yaml +++ b/galaxy/templates/pv-s3fs.yaml @@ -1,4 +1,5 @@ {{- if and .Values.refdata.enabled (eq .Values.refdata.type "s3csi") }} +--- apiVersion: v1 kind: PersistentVolume metadata: diff --git a/galaxy/templates/pvc-galaxy.yaml b/galaxy/templates/pvc-galaxy.yaml index c6426020..975f5c53 100644 --- a/galaxy/templates/pvc-galaxy.yaml +++ b/galaxy/templates/pvc-galaxy.yaml @@ -1,4 +1,5 @@ {{ if and .Values.persistence.enabled (not .Values.persistence.existingClaim) -}} +--- apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -23,4 +24,3 @@ spec: requests: storage: {{ .Values.persistence.size | quote }} {{ end }} ---- diff --git a/galaxy/templates/pvc-refdata.yaml b/galaxy/templates/pvc-refdata.yaml index a537eb03..a258f92b 100644 --- a/galaxy/templates/pvc-refdata.yaml +++ b/galaxy/templates/pvc-refdata.yaml @@ -1,4 +1,5 @@ {{- if .Values.refdata.enabled }} +--- apiVersion: v1 kind: PersistentVolumeClaim metadata: @@ -18,5 +19,4 @@ spec: {{- if eq $.Values.refdata.type "cvmfs" }} storageClassName: {{ tpl .Values.cvmfs.storageClassName . }} {{- end }} ---- {{- end }} diff --git a/galaxy/templates/rabbitmqcluster.yaml b/galaxy/templates/rabbitmqcluster.yaml index f215fc3b..1b100004 100644 --- a/galaxy/templates/rabbitmqcluster.yaml +++ b/galaxy/templates/rabbitmqcluster.yaml @@ -1,4 +1,5 @@ {{- if and .Values.rabbitmq.enabled (not .Values.rabbitmq.existingCluster) }} +--- apiVersion: rabbitmq.com/v1beta1 kind: RabbitmqCluster metadata: diff --git a/galaxy/templates/rbac-job.yaml b/galaxy/templates/rbac-job.yaml index f1180267..f80b5e1a 100644 --- a/galaxy/templates/rbac-job.yaml +++ b/galaxy/templates/rbac-job.yaml @@ -1,4 +1,5 @@ {{ if .Values.rbac.enabled }} +--- kind: Role apiVersion: rbac.authorization.k8s.io/v1 metadata: diff --git a/galaxy/templates/secret-galaxy.yaml b/galaxy/templates/secret-galaxy.yaml index 3ee42943..5c0ed980 100644 --- a/galaxy/templates/secret-galaxy.yaml +++ b/galaxy/templates/secret-galaxy.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Secret type: Opaque diff --git a/galaxy/templates/service-galaxy.yaml b/galaxy/templates/service-galaxy.yaml index 35fd5a1f..666dc20c 100644 --- a/galaxy/templates/service-galaxy.yaml +++ b/galaxy/templates/service-galaxy.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Service metadata: diff --git a/galaxy/templates/service-nginx.yaml b/galaxy/templates/service-nginx.yaml index 1b1e9f04..c2cef838 100644 --- a/galaxy/templates/service-nginx.yaml +++ b/galaxy/templates/service-nginx.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: Service metadata: diff --git a/galaxy/templates/service-tusd.yaml b/galaxy/templates/service-tusd.yaml index 0f4a7454..572848eb 100644 --- a/galaxy/templates/service-tusd.yaml +++ b/galaxy/templates/service-tusd.yaml @@ -1,4 +1,5 @@ {{ if .Values.tusd.enabled -}} +--- apiVersion: v1 kind: Service metadata: diff --git a/galaxy/templates/serviceaccount.yaml b/galaxy/templates/serviceaccount.yaml index 8560763e..435da946 100644 --- a/galaxy/templates/serviceaccount.yaml +++ b/galaxy/templates/serviceaccount.yaml @@ -1,4 +1,5 @@ {{- if .Values.serviceAccount.create -}} +--- apiVersion: v1 kind: ServiceAccount metadata: