diff --git a/smardigo/templates/sepa-exporter/_helpers.tpl b/smardigo/templates/sepa-exporter/_helpers.tpl deleted file mode 100644 index 657c3e4..0000000 --- a/smardigo/templates/sepa-exporter/_helpers.tpl +++ /dev/null @@ -1,7 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Create name for the service. -*/}} -{{- define "service.name" -}} -{{- default "sepa-exporter" -}} -{{- end -}} \ No newline at end of file diff --git a/smardigo/templates/sepa-exporter/deployment.yml b/smardigo/templates/sepa-exporter/deployment.yml index 42a4fdf..b6cc113 100644 --- a/smardigo/templates/sepa-exporter/deployment.yml +++ b/smardigo/templates/sepa-exporter/deployment.yml @@ -2,20 +2,20 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: "{{ include "service.name" $ }}" + name: "sepa-exporter" spec: replicas: 1 selector: matchLabels: - app: "{{ include "service.name" $ }}" + app: "sepa-exporter" template: metadata: labels: - app: "{{ include "service.name" $ }}" + app: "sepa-exporter" spec: spec: containers: - - name: "{{ include "service.name" $ }}" + - name: "sepa-exporter" image: "{{ .Values.harbor.host.name }}/{{ .Values.sepaExporter.image.name }}:{{ .Values.sepaExporter.image.version }}" imagePullPolicy: Always env: @@ -34,7 +34,7 @@ spec: - name: SMA_WORKFLOW_REST_AUTH_TOKEN valueFrom: secretKeyRef: - name: "{{ include "service.name" $ }}-secrets" + name: "sepa-exporter-secrets" key: SMA_WORKFLOW_AUTH_TOKEN - name: SMA_DOCUMENT_REST_BASE_PATH value: "{{ .Values.smardigo.document.host }}" @@ -45,7 +45,7 @@ spec: - name: SMA_DOCUMENT_REST_AUTH_TOKEN valueFrom: secretKeyRef: - name: "{{ include "service.name" $ }}-secrets" + name: "sepa-exporter-secrets" key: SMA_DOCUMENT_AUTH_TOKEN ports: - containerPort: 8080 diff --git a/smardigo/templates/sepa-exporter/monitoring.yml b/smardigo/templates/sepa-exporter/monitoring.yml index 0c0252a..a7bf7d1 100644 --- a/smardigo/templates/sepa-exporter/monitoring.yml +++ b/smardigo/templates/sepa-exporter/monitoring.yml @@ -2,13 +2,13 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: "{{ include "service.name" $ }}" + name: "sepa-exporter" labels: release: "prometheus" spec: selector: matchLabels: - app: "{{ include "service.name" $ }}" + app: "sepa-exporter" namespaceSelector: matchNames: - "{{ .Release.Namespace }}" diff --git a/smardigo/templates/sepa-exporter/secret.yml b/smardigo/templates/sepa-exporter/secret.yml index a6964be..6d466d1 100644 --- a/smardigo/templates/sepa-exporter/secret.yml +++ b/smardigo/templates/sepa-exporter/secret.yml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: "{{ include "service.name" $ }}-secrets" + name: "sepa-exporter-secrets" data: SMA_WORKFLOW_AUTH_TOKEN: "{{ .Values.sepaExporter.workflow.api_token | b64enc }}" SMA_DOCUMENT_AUTH_TOKEN: "{{ .Values.sepaExporter.document.api_token | b64enc }}" diff --git a/smardigo/templates/sepa-exporter/service.yml b/smardigo/templates/sepa-exporter/service.yml index 32c3dfa..a8a5568 100644 --- a/smardigo/templates/sepa-exporter/service.yml +++ b/smardigo/templates/sepa-exporter/service.yml @@ -2,12 +2,12 @@ apiVersion: v1 kind: Service metadata: - name: "{{ include "service.name" $ }}" + name: "sepa-exporter" labels: - app: "{{ include "service.name" $ }}" + app: "sepa-exporter" spec: selector: - app: "{{ include "service.name" $ }}" + app: "sepa-exporter" ports: - port: 8080 targetPort: 8080 diff --git a/smardigo/templates/uba-export/_helpers.tpl b/smardigo/templates/uba-export/_helpers.tpl deleted file mode 100644 index b6b22b7..0000000 --- a/smardigo/templates/uba-export/_helpers.tpl +++ /dev/null @@ -1,7 +0,0 @@ -{{/* vim: set filetype=mustache: */}} -{{/* -Create name for the service. -*/}} -{{- define "service.name" -}} -{{- default "uba-exporter" -}} -{{- end -}} \ No newline at end of file diff --git a/smardigo/templates/uba-export/deployment.yml b/smardigo/templates/uba-export/deployment.yml index 0ff9073..3ea7012 100644 --- a/smardigo/templates/uba-export/deployment.yml +++ b/smardigo/templates/uba-export/deployment.yml @@ -2,20 +2,20 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: "{{ include "service.name" $ }}" + name: "uba-exporter" spec: replicas: 1 selector: matchLabels: - app: "{{ include "service.name" $ }}" + app: "uba-exporter" template: metadata: labels: - app: "{{ include "service.name" $ }}" + app: "uba-exporter" spec: spec: containers: - - name: "{{ include "service.name" $ }}" + - name: "uba-exporter" image: "{{ .Values.harbor.host.name }}/{{ .Values.ubaExporter.image.name }}:{{ .Values.ubaExporter.image.version }}" imagePullPolicy: Always env: @@ -34,7 +34,7 @@ spec: - name: SMA_WORKFLOW_REST_AUTH_TOKEN valueFrom: secretKeyRef: - name: "{{ include "service.name" $ }}-secrets" + name: "uba-exporter-secrets" key: SMA_WORKFLOW_AUTH_TOKEN - name: SMA_DOCUMENT_REST_BASE_PATH value: "{{ .Values.smardigo.document.host }}" @@ -45,7 +45,7 @@ spec: - name: SMA_DOCUMENT_REST_AUTH_TOKEN valueFrom: secretKeyRef: - name: "{{ include "service.name" $ }}-secrets" + name: "uba-exporter-secrets" key: SMA_DOCUMENT_AUTH_TOKEN ports: - containerPort: 8080 diff --git a/smardigo/templates/uba-export/monitoring.yml b/smardigo/templates/uba-export/monitoring.yml index 0c0252a..62b5738 100644 --- a/smardigo/templates/uba-export/monitoring.yml +++ b/smardigo/templates/uba-export/monitoring.yml @@ -2,13 +2,13 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: - name: "{{ include "service.name" $ }}" + name: "uba-exporter" labels: release: "prometheus" spec: selector: matchLabels: - app: "{{ include "service.name" $ }}" + app: "uba-exporter" namespaceSelector: matchNames: - "{{ .Release.Namespace }}" diff --git a/smardigo/templates/uba-export/secret.yml b/smardigo/templates/uba-export/secret.yml index c8f812a..c737520 100644 --- a/smardigo/templates/uba-export/secret.yml +++ b/smardigo/templates/uba-export/secret.yml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Secret metadata: - name: "{{ include "service.name" $ }}-secrets" + name: "uba-exporter-secrets" data: SMA_WORKFLOW_AUTH_TOKEN: "{{ .Values.ubaExporter.workflow.api_token | b64enc }}" SMA_DOCUMENT_AUTH_TOKEN: "{{ .Values.ubaExporter.document.api_token | b64enc }}" diff --git a/smardigo/templates/uba-export/service.yml b/smardigo/templates/uba-export/service.yml index 32c3dfa..d635e3f 100644 --- a/smardigo/templates/uba-export/service.yml +++ b/smardigo/templates/uba-export/service.yml @@ -2,12 +2,12 @@ apiVersion: v1 kind: Service metadata: - name: "{{ include "service.name" $ }}" + name: "uba-exporter" labels: - app: "{{ include "service.name" $ }}" + app: "uba-exporter" spec: selector: - app: "{{ include "service.name" $ }}" + app: "uba-exporter" ports: - port: 8080 targetPort: 8080