From 4ec7fdc7e60aec3bac457e7b37841864902170d8 Mon Sep 17 00:00:00 2001 From: Steven Fitzpatrick Date: Wed, 9 Sep 2020 05:12:54 +0000 Subject: [PATCH] Alerta: Fix files with CRLF eol characters Change-Id: I30a6dbb8b2aaf8a1e944530426995457b59a4c9a --- alerta/templates/deployment.yaml | 204 +++++++++++++++---------------- alerta/templates/secret.yaml | 56 ++++----- alerta/templates/service.yaml | 72 +++++------ 3 files changed, 166 insertions(+), 166 deletions(-) diff --git a/alerta/templates/deployment.yaml b/alerta/templates/deployment.yaml index ead4063229..68acb2133c 100644 --- a/alerta/templates/deployment.yaml +++ b/alerta/templates/deployment.yaml @@ -1,102 +1,102 @@ -{{/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/}} - -{{- if .Values.manifests.alerta.deployment }} -{{- $envAll := . }} - ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: alerta - annotations: - {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} - labels: -{{ tuple $envAll "alerta" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} -spec: - podManagementPolicy: "Parallel" - replicas: {{ .Values.pod.replicas.alerta }} - selector: - matchLabels: -{{ tuple $envAll "alerta" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }} - template: - metadata: - labels: -{{ tuple $envAll "alerta" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} - annotations: -{{ dict "envAll" $envAll "podName" "alerta" "containerNames" (list "alerta") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} - configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} - configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} - spec: -{{ dict "envAll" $envAll "application" "server" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} - affinity: -{{ tuple $envAll "alerta" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} - nodeSelector: - {{ .Values.labels.alerta.node_selector_key }}: {{ .Values.labels.alerta.node_selector_value | quote }} - terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.alerta.timeout | default "30" }} - containers: - - name: alerta -{{ tuple $envAll "alerta" | include "helm-toolkit.snippets.image" | indent 10 }} -{{ tuple $envAll $envAll.Values.pod.resources.alerta | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} -{{ dict "envAll" $envAll "application" "server" "container" "alerta" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} - env: - - name: ADMIN_USERS - valueFrom: - secretKeyRef: - name: {{ printf "%s-%s" $envAll.Release.Name "admin-cert" | quote }} - key: alerta-admin-user - - name: ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: {{ printf "%s-%s" $envAll.Release.Name "admin-cert" | quote }} - key: alerta-admin-password - - name: ADMIN_KEY - valueFrom: - secretKeyRef: - name: {{ printf "%s-%s" $envAll.Release.Name "admin-cert" | quote }} - key: alerta-admin-key - - name: ALERTA_API_KEY - valueFrom: - secretKeyRef: - name: {{ printf "%s-%s" $envAll.Release.Name "admin-cert" | quote }} - key: alerta-api-key - ports: - - name: http - containerPort: 8080 - protocol: TCP - livenessProbe: - httpGet: - path: / - port: http - initialDelaySeconds: 180 - readinessProbe: - httpGet: - path: / - port: http - initialDelaySeconds: 120 - volumeMounts: - - name: alerta-etc - mountPath: /app/alertad.conf - subPath: alertad.conf - - name: alerta-etc - mountPath: /app/config.js - subPath: config.js - resources: -{{ toYaml .Values.pod.resources | indent 12 }} - volumes: - - name: alerta-etc - configMap: - name: alerta-etc - defaultMode: 0444 -{{- end }} +{{/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/}} + +{{- if .Values.manifests.alerta.deployment }} +{{- $envAll := . }} + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: alerta + annotations: + {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} + labels: +{{ tuple $envAll "alerta" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} +spec: + podManagementPolicy: "Parallel" + replicas: {{ .Values.pod.replicas.alerta }} + selector: + matchLabels: +{{ tuple $envAll "alerta" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 6 }} + template: + metadata: + labels: +{{ tuple $envAll "alerta" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} + annotations: +{{ dict "envAll" $envAll "podName" "alerta" "containerNames" (list "alerta") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} + configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} + configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} + spec: +{{ dict "envAll" $envAll "application" "server" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} + affinity: +{{ tuple $envAll "alerta" "server" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }} + nodeSelector: + {{ .Values.labels.alerta.node_selector_key }}: {{ .Values.labels.alerta.node_selector_value | quote }} + terminationGracePeriodSeconds: {{ .Values.pod.lifecycle.termination_grace_period.alerta.timeout | default "30" }} + containers: + - name: alerta +{{ tuple $envAll "alerta" | include "helm-toolkit.snippets.image" | indent 10 }} +{{ tuple $envAll $envAll.Values.pod.resources.alerta | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} +{{ dict "envAll" $envAll "application" "server" "container" "alerta" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} + env: + - name: ADMIN_USERS + valueFrom: + secretKeyRef: + name: {{ printf "%s-%s" $envAll.Release.Name "admin-cert" | quote }} + key: alerta-admin-user + - name: ADMIN_PASSWORD + valueFrom: + secretKeyRef: + name: {{ printf "%s-%s" $envAll.Release.Name "admin-cert" | quote }} + key: alerta-admin-password + - name: ADMIN_KEY + valueFrom: + secretKeyRef: + name: {{ printf "%s-%s" $envAll.Release.Name "admin-cert" | quote }} + key: alerta-admin-key + - name: ALERTA_API_KEY + valueFrom: + secretKeyRef: + name: {{ printf "%s-%s" $envAll.Release.Name "admin-cert" | quote }} + key: alerta-api-key + ports: + - name: http + containerPort: 8080 + protocol: TCP + livenessProbe: + httpGet: + path: / + port: http + initialDelaySeconds: 180 + readinessProbe: + httpGet: + path: / + port: http + initialDelaySeconds: 120 + volumeMounts: + - name: alerta-etc + mountPath: /app/alertad.conf + subPath: alertad.conf + - name: alerta-etc + mountPath: /app/config.js + subPath: config.js + resources: +{{ toYaml .Values.pod.resources | indent 12 }} + volumes: + - name: alerta-etc + configMap: + name: alerta-etc + defaultMode: 0444 +{{- end }} diff --git a/alerta/templates/secret.yaml b/alerta/templates/secret.yaml index 54d52a0bf9..b22a82eb02 100644 --- a/alerta/templates/secret.yaml +++ b/alerta/templates/secret.yaml @@ -1,28 +1,28 @@ -{{/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/}} - -{{- if .Values.manifests.alerta.secret }} -{{- $envAll := . }} ---- -apiVersion: v1 -kind: Secret -metadata: - name: alerta-admin-cert -type: Opaque -data: - alerta-admin-user: {{ .Values.conf.alerta.alertaAdminUser | b64enc }} - alerta-admin-password: {{ .Values.conf.alerta.alertaAdminPassword | b64enc }} - alerta-admin-key: {{ .Values.conf.alerta.alertaAdminPassword | b64enc }} - alerta-api-key: {{ .Values.conf.alerta.alertaAdminPassword | b64enc }} -{{- end }} \ No newline at end of file +{{/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/}} + +{{- if .Values.manifests.alerta.secret }} +{{- $envAll := . }} +--- +apiVersion: v1 +kind: Secret +metadata: + name: alerta-admin-cert +type: Opaque +data: + alerta-admin-user: {{ .Values.conf.alerta.alertaAdminUser | b64enc }} + alerta-admin-password: {{ .Values.conf.alerta.alertaAdminPassword | b64enc }} + alerta-admin-key: {{ .Values.conf.alerta.alertaAdminPassword | b64enc }} + alerta-api-key: {{ .Values.conf.alerta.alertaAdminPassword | b64enc }} +{{- end }} diff --git a/alerta/templates/service.yaml b/alerta/templates/service.yaml index 813b4288ce..5d046425e8 100644 --- a/alerta/templates/service.yaml +++ b/alerta/templates/service.yaml @@ -1,36 +1,36 @@ -{{/* -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/}} - -{{- if .Values.manifests.alerta.service }} -{{- $envAll := . }} ---- -apiVersion: v1 -kind: Service -metadata: - name: alerta -spec: - ports: - - name: http - {{ if .Values.network.alerta.node_port.enabled }} - nodePort: {{ .Values.network.alerta.node_port.port }} - {{ end }} - port: {{ tuple "alerta" "internal" "server" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} - targetPort: http - protocol: TCP - selector: -{{ tuple $envAll "alerta" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} - {{ if .Values.network.alerta.node_port.enabled }} - type: NodePort - {{ end }} -{{- end }} +{{/* +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/}} + +{{- if .Values.manifests.alerta.service }} +{{- $envAll := . }} +--- +apiVersion: v1 +kind: Service +metadata: + name: alerta +spec: + ports: + - name: http + {{ if .Values.network.alerta.node_port.enabled }} + nodePort: {{ .Values.network.alerta.node_port.port }} + {{ end }} + port: {{ tuple "alerta" "internal" "server" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }} + targetPort: http + protocol: TCP + selector: +{{ tuple $envAll "alerta" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} + {{ if .Values.network.alerta.node_port.enabled }} + type: NodePort + {{ end }} +{{- end }}