@@ -49,25 +49,22 @@ spec:
49
49
args :
50
50
- " --zap-log-level=info"
51
51
- " --leader-election-id={{ include " kiali-operator.fullname" . }}"
52
- {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }}
53
- - " --watches-file=./watches-os.yaml"
54
- {{- else }}
55
- - " --watches-file=./watches-k8s.yaml"
56
- {{- end }}
52
+ - " --watches-file=./$(WATCHES_FILE)"
57
53
securityContext :
58
54
{{- if .Values.securityContext }}
59
55
{{- toYaml .Values.securityContext | nindent 10 }}
60
56
{{- else }}
61
57
allowPrivilegeEscalation : false
62
58
privileged : false
63
59
runAsNonRoot : true
60
+ readOnlyRootFilesystem : true
64
61
capabilities :
65
62
drop :
66
63
- ALL
67
64
{{- end }}
68
65
volumeMounts :
69
- - mountPath : /tmp/ansible-operator/runner
70
- name : runner
66
+ - mountPath : /tmp
67
+ name : tmp
71
68
env :
72
69
- name : WATCH_NAMESPACE
73
70
value : {{ .Values.watchNamespace | default "\"\"" }}
@@ -109,6 +106,20 @@ spec:
109
106
{{- else }}
110
107
value : " /etc/ansible/ansible.cfg"
111
108
{{- end }}
109
+ - name : ANSIBLE_LOCAL_TEMP
110
+ value : " /tmp/ansible/tmp"
111
+ - name : ANSIBLE_REMOTE_TEMP
112
+ value : " /tmp/ansible/tmp"
113
+ - name : WATCHES_FILE
114
+ {{- if .Values.watchesFile }}
115
+ value : " {{ .Values.watchesFile }}"
116
+ {{- else }}
117
+ {{- if .Capabilities.APIVersions.Has "route.openshift.io/v1" }}
118
+ value : " watches-os.yaml"
119
+ {{- else }}
120
+ value : " watches-k8s.yaml"
121
+ {{- end }}
122
+ {{- end }}
112
123
{{- if .Values.env }}
113
124
{{- toYaml .Values.env | nindent 8 }}
114
125
{{- end }}
@@ -120,8 +131,8 @@ spec:
120
131
{{- toYaml .Values.resources | nindent 10 }}
121
132
{{- end }}
122
133
volumes :
123
- - name : runner
134
+ - name : tmp
124
135
emptyDir : {}
125
136
affinity :
126
137
{{- toYaml .Values.affinity | nindent 8 }}
127
- ...
138
+ ---
0 commit comments