From f11447d127d21dd56b302fe1014f4801d32511c5 Mon Sep 17 00:00:00 2001 From: Bartek Grzybowski Date: Thu, 26 Mar 2020 14:20:56 +0100 Subject: Fix spacing issues in YAML files in vnfs Fixes applied as reported by yamllint. Change-Id: I8bd30d49e728715fdc696bb984fbca842ac1c2b8 Issue-ID: INT-1482 Signed-off-by: Bartek Grzybowski --- vnfs/DAaaS/sample-apps/training/sample-horovod-app/Chart.yaml | 2 +- .../sample-apps/training/sample-horovod-app/sample_values.yaml | 4 ++-- .../training/sample-horovod-app/templates/config.yaml | 6 +++--- .../training/sample-horovod-app/templates/job-service.yaml | 2 +- .../sample-apps/training/sample-horovod-app/templates/job.yaml | 10 +++++----- .../training/sample-horovod-app/templates/secrets.yaml | 2 +- .../sample-horovod-app/templates/statefulset-service.yaml | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) (limited to 'vnfs/DAaaS/sample-apps/training/sample-horovod-app') diff --git a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/Chart.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/Chart.yaml index 3ce06e28..b53b2ff0 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/Chart.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "1.0" description: "A sample horovod application which runs the MNIST application using Tensorflow as backend" name: sample-horovod-app-keras-mnist-advanced -version: 0.1.0 +version: 0.1.0 diff --git a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/sample_values.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/sample_values.yaml index 7030dd24..d8b9aa22 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/sample_values.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/sample_values.yaml @@ -35,10 +35,10 @@ worker: image: repository: spark-tf-keras-horovod-pytorch tag: latest - pullPolicy: Never + pullPolicy: Never master: image: - repository: spark-tf-keras-horovod-pytorch + repository: spark-tf-keras-horovod-pytorch tag: latest pullPolicy: Never args: diff --git a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/config.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/config.yaml index ae93c445..70d18eab 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/config.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/config.yaml @@ -73,7 +73,7 @@ data: yes | cp /etc/secret-volume/authorized_keys /root/.ssh/authorized_keys set -e fi - + for i in `cat $1 | awk '{print $(1)}'`;do if [[ "$i" != *"master" ]];then retry 30 ssh -o ConnectTimeout=2 -q $i exit @@ -102,14 +102,14 @@ data: if [ $? -ne 0 ]; then exit 1 fi - set -e + set -e } updateSSHPort runCheckSSH $1 worker.run: | #!/bin/bash set -x - + mkdir -p /root/.ssh rm -f /root/.ssh/config touch /root/.ssh/config diff --git a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job-service.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job-service.yaml index e7b05c26..b7fe1e53 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job-service.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job-service.yaml @@ -10,7 +10,7 @@ metadata: spec: clusterIP: None ports: - - name: ssh + - name: ssh port: {{ .Values.ssh.port }} targetPort: {{ .Values.ssh.port }} selector: diff --git a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job.yaml index da42ded8..2263ddbc 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/job.yaml @@ -64,7 +64,7 @@ spec: - name: USESECRETS value: "{{ .Values.ssh.useSecrets }}" {{- end }} - {{- if .Values.master.env }} + {{- if .Values.master.env }} {{- range $key, $value := .Values.master.env }} - name: "{{ $key }}" value: "{{ $value }}" @@ -101,10 +101,10 @@ spec: {{- if .Values.volumeMounts }} {{ toYaml .Values.volumeMounts | indent 8 }} {{- end }} - command: + command: - /horovod/generated/run.sh args: -{{ toYaml .Values.master.args | indent 10 }} +{{ toYaml .Values.master.args | indent 10 }} resources: {{ toYaml .Values.resources | indent 10 }} {{- if .Values.ssh.useSecrets }} @@ -119,13 +119,13 @@ spec: - name: USESECRETS value: "{{ .Values.ssh.useSecrets }}" {{- end }} - {{- if .Values.master.env }} + {{- if .Values.master.env }} {{- range $key, $value := .Values.master.env }} - name: "{{ $key }}" value: "{{ $value }}" {{- end }} {{- end }} - command: + command: - /horovod/generated/waitWorkersReady.sh args: - /horovod/generated/hostfile diff --git a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/secrets.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/secrets.yaml index c9853ed0..992ed87e 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/secrets.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/secrets.yaml @@ -12,4 +12,4 @@ type: Opaque data: host-key: {{ .Values.ssh.hostKey | b64enc | quote }} host-key-pub: {{ .Values.ssh.hostKeyPub | b64enc | quote }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset-service.yaml b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset-service.yaml index d0216a86..70fd0478 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset-service.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-horovod-app/templates/statefulset-service.yaml @@ -10,7 +10,7 @@ metadata: spec: clusterIP: None ports: - - name: ssh + - name: ssh port: {{ .Values.ssh.port }} targetPort: {{ .Values.ssh.port }} selector: -- cgit 1.2.3-korg