Code Review
/
it
/
test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
change directory name to workload_generators as it will contain multiple workload...
[it/test.git]
/
ric_robot_suite
/
helm
/
nanobot
/
templates
/
job-ric-robot-run.yaml
diff --git
a/ric_robot_suite/helm/nanobot/templates/job-ric-robot-run.yaml
b/ric_robot_suite/helm/nanobot/templates/job-ric-robot-run.yaml
index
14be82d
..
c476853
100644
(file)
--- a/
ric_robot_suite/helm/nanobot/templates/job-ric-robot-run.yaml
+++ b/
ric_robot_suite/helm/nanobot/templates/job-ric-robot-run.yaml
@@
-72,7
+72,7
@@
metadata:
namespace: {{ $xappNamespace }}
rules:
- apiGroups: [""]
namespace: {{ $xappNamespace }}
rules:
- apiGroups: [""]
- resources: ["pods", "services"]
+ resources: ["pods", "
pods/log", "
services"]
verbs: ["get", "list"]
- apiGroups: ["apps"]
resources: ["deployments", "daemonsets", "replicasets", "statefulsets"]
verbs: ["get", "list"]
- apiGroups: ["apps"]
resources: ["deployments", "daemonsets", "replicasets", "statefulsets"]
@@
-103,10
+103,11
@@
metadata:
name: {{ $jobName }}-ric-robot-run
namespace: {{ .Release.Namespace }}
spec:
name: {{ $jobName }}-ric-robot-run
namespace: {{ .Release.Namespace }}
spec:
+ backoffLimit: {{ default 0 .Values.ric.robot.job.backoffLimit }}
template:
spec:
serviceAccountName: {{ $serviceAccountName }}
template:
spec:
serviceAccountName: {{ $serviceAccountName }}
- restartPolicy:
Never
+ restartPolicy:
{{ default "Never" .Values.ric.robot.job.restartPolicy }}
initContainers:
- name: {{ $jobName }}-generate-robot-kubeconfig
{{ with .Values.images.ric.robot.job.init }}
initContainers:
- name: {{ $jobName }}-generate-robot-kubeconfig
{{ with .Values.images.ric.robot.job.init }}
@@
-127,9
+128,11
@@
spec:
- name: robot-etc
mountPath: /robot/etc
readOnly: false
- name: robot-etc
mountPath: /robot/etc
readOnly: false
+ {{- if .Values.ric.robot.log }}
- name: robot-log
mountPath: /robot/log
readOnly: false
- name: robot-log
mountPath: /robot/log
readOnly: false
+ {{- end }}
- name: robot-bin
mountPath: /robot/bin
readOnly: true
- name: robot-bin
mountPath: /robot/bin
readOnly: true
@@
-166,8
+169,19
@@
spec:
{{- if not .Values.ric.robot.job.failOnTestFail }}
- "--NoStatusRC"
{{- end }}
{{- if not .Values.ric.robot.job.failOnTestFail }}
- "--NoStatusRC"
{{- end }}
+ {{- if .Values.ric.robot.log }}
- "-d"
- "/robot/log"
- "-d"
- "/robot/log"
+ {{- else }}
+ - "-o"
+ - "NONE"
+ - "-l"
+ - "NONE"
+ - "-r"
+ - "NONE"
+ - "-L"
+ - "NONE"
+ {{- end }}
- "--console"
- "verbose"
- "-C"
- "--console"
- "verbose"
- "-C"
@@
-198,9
+212,11
@@
spec:
- name: robot-etc
mountPath: /robot/etc
readOnly: true
- name: robot-etc
mountPath: /robot/etc
readOnly: true
+ {{- if .Values.ric.robot.log }}
- name: robot-log
mountPath: /robot/log
readOnly: false
- name: robot-log
mountPath: /robot/log
readOnly: false
+ {{- end }}
# for compatability with the ric robot, we mount
# both properties files and interface libraries
# under resources/.
# for compatability with the ric robot, we mount
# both properties files and interface libraries
# under resources/.
@@
-220,9
+236,11
@@
spec:
- name: robot-etc
emptyDir: {}
- name: robot-log
- name: robot-etc
emptyDir: {}
- name: robot-log
+ {{- if .Values.ric.robot.log }}
hostPath:
path: {{ default "/opt/ric/robot/log" .Values.ric.robot.log }}
type: DirectoryOrCreate
hostPath:
path: {{ default "/opt/ric/robot/log" .Values.ric.robot.log }}
type: DirectoryOrCreate
+ {{- end }}
- name: robot-bin
configMap:
name: robot-bin
- name: robot-bin
configMap:
name: robot-bin