diff options
Diffstat (limited to 'vnfs/DAaaS/sample-apps')
12 files changed, 24 insertions, 40 deletions
diff --git a/vnfs/DAaaS/sample-apps/m3db_promql/Chart.yaml b/vnfs/DAaaS/sample-apps/m3db_promql/Chart.yaml index 5bfedbf8..90a54ebd 100644 --- a/vnfs/DAaaS/sample-apps/m3db_promql/Chart.yaml +++ b/vnfs/DAaaS/sample-apps/m3db_promql/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 appVersion: "1.0" -description: Helm chart for a sample promql query app +description: Helm chart for a sample promql query app name: promql_query_app version: 0.1.0 diff --git a/vnfs/DAaaS/sample-apps/m3db_promql/templates/configmap_promql_app_env.yaml b/vnfs/DAaaS/sample-apps/m3db_promql/templates/configmap_promql_app_env.yaml index 7116a175..31556045 100644 --- a/vnfs/DAaaS/sample-apps/m3db_promql/templates/configmap_promql_app_env.yaml +++ b/vnfs/DAaaS/sample-apps/m3db_promql/templates/configmap_promql_app_env.yaml @@ -3,4 +3,4 @@ kind: ConfigMap metadata: name: {{ if .Values.prometheus.configMapName }}{{ .Values.prometheus.configMapName }}{{ else }}{{ template "promql_query_app.fullname" . }}{{ end }} data: - prometheus_endpoint: {{ .Values.prometheus.serverURL }}
\ No newline at end of file + prometheus_endpoint: {{ .Values.prometheus.serverURL }} diff --git a/vnfs/DAaaS/sample-apps/m3db_promql/values.yaml b/vnfs/DAaaS/sample-apps/m3db_promql/values.yaml index 9920bccd..8bcf0336 100644 --- a/vnfs/DAaaS/sample-apps/m3db_promql/values.yaml +++ b/vnfs/DAaaS/sample-apps/m3db_promql/values.yaml @@ -58,4 +58,3 @@ nodeSelector: {} tolerations: [] affinity: {} - 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: diff --git a/vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/SampleSparkApp.yaml b/vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/SampleSparkApp.yaml index f728f82e..1b12e479 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/SampleSparkApp.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-spark-app/templates/SampleSparkApp.yaml @@ -2,7 +2,7 @@ apiVersion: "sparkoperator.k8s.io/v1beta1" kind: SparkApplication metadata: name: {{ .Values.nameOfTheSparkApp }} - namespace: {{ .Release.Namespace }} + namespace: {{ .Release.Namespace }} spec: type: {{ .Values.programmingLanguageType }} mode: {{ .Values.modeOfSparkApp | default "cluster" }} @@ -10,7 +10,7 @@ spec: imagePullPolicy: {{ .Values.imagePullPolicy | default "IfNotPresent" }} mainClass: {{ .Values.mainClassOfTheSparkApp }} mainApplicationFile: {{ .Values.mainApplicationFileOfTheSparkApp }} - arguments: + arguments: {{- range .Values.argumentsOfTheSparkProgram }} - {{ . }} {{ end }} diff --git a/vnfs/DAaaS/sample-apps/training/sample-spark-app/values.yaml b/vnfs/DAaaS/sample-apps/training/sample-spark-app/values.yaml index afb48d67..07457ac8 100644 --- a/vnfs/DAaaS/sample-apps/training/sample-spark-app/values.yaml +++ b/vnfs/DAaaS/sample-apps/training/sample-spark-app/values.yaml @@ -2,7 +2,6 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. - #===========================KUBERNETES POD RELATED CONFIGs======================== image: spark-tf-keras-horo:latest imagePullPolicy: Never @@ -11,47 +10,33 @@ volumesName: test-volume hostpath: /tmp hostpathType: Directory - - #============================SPARK APP RELATED CONFIGs============================= - -nameOfTheSparkApp: spark-apache-logs2 +nameOfTheSparkApp: spark-apache-logs2 # Python or Scala supported. programmingLanguageType: Scala modeOfSparkApp: cluster mainClassOfTheSparkApp: ApacheLogAnalysis # can be http path, s3 path, minio path -mainApplicationFileOfTheSparkApp: https://github.com/mohanraj1311/ApacheLogAnalysisJar/raw/master/analysisofapachelogs_2.11-0.1.jar +mainApplicationFileOfTheSparkApp: https://github.com/mohanraj1311/ApacheLogAnalysisJar/raw/master/analysisofapachelogs_2.11-0.1.jar argumentsOfTheSparkProgram: - - hdfs://hdfs-1-namenode-1.hdfs-1-namenode.hdfs1.svc.cluster.local:8020/data/apache-logs - - + - hdfs://hdfs-1-namenode-1.hdfs-1-namenode.hdfs1.svc.cluster.local:8020/data/apache-logs #============================SPARK DRIVER RELATED CONFIGs========================= driverCores: 0.1 driverCoreLimit: 200m driverMemory: 1024m driverVolumeMountsName: test-volume -driverVolumeMountPath: /tmp - - +driverVolumeMountPath: /tmp #============================SPARK EXECUTOR RELATED CONFIGs======================= -executorCores: 1 -executorInstances: 1 +executorCores: 1 +executorInstances: 1 executorMemory: 512m executorVolumeMountsName: test-volume executorVolumeMountPath: /tmp - - #===========================HADOOP RELATED CONFIGs=============================== # config map of the hdfs hadoopConfigMap: hdfs-1-config - ################################################################################### - - - - |