Skip to content

Commit a283b2d

Browse files
nedvnanedvna
committed
Rename cron to wcli
1 parent c1edbc8 commit a283b2d

File tree

10 files changed

+33
-33
lines changed

10 files changed

+33
-33
lines changed

‎charts/ingress-nginx/ci/daemonset-extra-envs-values.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ controller:
1414
extraEnvs:
1515
- name: EXTRA_ADDNODE_KEY
1616
value: EXTRA_ADDNODE_VAL
17-
cron:
17+
wcli:
1818
extraEnvs:
19-
- name: EXTRA_CRON_KEY
20-
value: EXTRA_CRON_VAL
19+
- name: EXTRA_WCLI_KEY
20+
value: EXTRA_WCLI_VAL
2121
collectd:
2222
extraEnvs:
2323
- name: EXTRA_COLLECTD_KEY

‎charts/ingress-nginx/ci/deployment-extra-envs-values.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ controller:
1414
extraEnvs:
1515
- name: EXTRA_ADDNODE_KEY
1616
value: EXTRA_ADDNODE_VAL
17-
cron:
17+
wcli:
1818
extraEnvs:
19-
- name: EXTRA_CRON_KEY
20-
value: EXTRA_CRON_VAL
19+
- name: EXTRA_WCLI_KEY
20+
value: EXTRA_WCLI_VAL
2121
collectd:
2222
extraEnvs:
2323
- name: EXTRA_COLLECTD_KEY

‎charts/ingress-nginx/templates/_helpers.tpl‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ Create the name of the controller service account to use
196196

197197
{{- define "ingress-nginx.wallarmPostanalyticsPort" -}}3313{{- end -}}
198198
{{- define "ingress-nginx.wallarmPostanalyticsName" -}}{{ .Values.controller.name }}-wallarm-wstore{{- end -}}
199-
{{- define "ingress-nginx.wallarmPostanalyticsCronConfig" -}}{{ template "ingress-nginx.wallarmPostanalyticsName" . }}-cron{{- end -}}
200-
{{- define "ingress-nginx.wallarmControllerCronConfig" -}}{{ include "ingress-nginx.controller.fullname" . | lower }}-cron{{- end -}}
199+
{{- define "ingress-nginx.wallarmPostanalyticsWcliConfig" -}}{{ template "ingress-nginx.wallarmPostanalyticsName" . }}-wcli{{- end -}}
200+
{{- define "ingress-nginx.wallarmControllerWcliConfig" -}}{{ include "ingress-nginx.controller.fullname" . | lower }}-wcli{{- end -}}
201201
{{- define "ingress-nginx.wallarmSecret" -}}{{ .Values.controller.name }}-secret{{- end -}}
202202

203203
{{- define "wallarm.credentials" -}}
@@ -265,10 +265,10 @@ Create the name of the controller service account to use
265265
{{ toYaml .Values.controller.wallarm.init.resources | indent 4 }}
266266
{{- end -}}
267267

268-
{{- define "ingress-nginx.wallarmCronContainer" -}}
269-
- name: cron
270-
{{- if .Values.controller.wallarm.cron.image }}
271-
{{- with .Values.controller.wallarm.cron.image }}
268+
{{- define "ingress-nginx.wallarmWcliContainer" -}}
269+
- name: wcli
270+
{{- if .Values.controller.wallarm.wcli.image }}
271+
{{- with .Values.controller.wallarm.wcli.image }}
272272
image: "{{ .repository }}:{{ .tag }}"
273273
{{- end }}
274274
{{- else }}
@@ -282,8 +282,8 @@ Create the name of the controller service account to use
282282
valueFrom:
283283
fieldRef:
284284
fieldPath: metadata.name
285-
{{- if .Values.controller.wallarm.cron.extraEnvs }}
286-
{{- toYaml .Values.controller.wallarm.cron.extraEnvs | nindent 2 }}
285+
{{- if .Values.controller.wallarm.wcli.extraEnvs }}
286+
{{- toYaml .Values.controller.wallarm.wcli.extraEnvs | nindent 2 }}
287287
{{- end }}
288288
volumeMounts:
289289
- mountPath: {{ include "wallarm.path" . }}
@@ -298,7 +298,7 @@ Create the name of the controller service account to use
298298
readOnly: true
299299
securityContext: {{ include "ingress-nginx.controller.containerSecurityContext" . | nindent 4 }}
300300
resources:
301-
{{ toYaml .Values.controller.wallarm.cron.resources | indent 4 }}
301+
{{ toYaml .Values.controller.wallarm.wcli.resources | indent 4 }}
302302
{{- end -}}
303303

304304
{{- define "ingress-nginx.wallarmTokenVolume" -}}
@@ -512,8 +512,8 @@ Extra modules.
512512
Wcli arguments building
513513
*/}}
514514
{{- define "ingress-nginx.wcli-args" -}}
515-
"-log-level", "{{ .Values.controller.wallarm.cron.logLevel }}",{{ " " }}
516-
{{- with .Values.controller.wallarm.cron.commands -}}
515+
"-log-level", "{{ .Values.controller.wallarm.wcli.logLevel }}",{{ " " }}
516+
{{- with .Values.controller.wallarm.wcli.commands -}}
517517
{{- range $name, $value := . -}}
518518
"job:{{ $name }}", "-log-level", "{{ $value.logLevel }}",{{ " " }}
519519
{{- end -}}

‎charts/ingress-nginx/templates/controller-daemonset.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
annotations:
3131
{{- if .Values.controller.wallarm.enabled }}
3232
wallarm-enabled: "true"
33-
checksum/cron: {{ .Values.controller.wallarm.cron | toJson | sha256sum }}
33+
checksum/wcli: {{ .Values.controller.wallarm.wcli | toJson | sha256sum }}
3434
{{- if not .Values.controller.wallarm.existingSecret.enabled }}
3535
checksum/token: {{ .Values.controller.wallarm.token | sha256sum }}
3636
{{- end }}
@@ -198,7 +198,7 @@ spec:
198198
{{- toYaml .Values.controller.extraContainers | nindent 8 }}
199199
{{- end }}
200200
{{- if .Values.controller.wallarm.enabled }}
201-
{{ include "ingress-nginx.wallarmCronContainer" . | nindent 8 }}
201+
{{ include "ingress-nginx.wallarmWcliContainer" . | nindent 8 }}
202202
{{ include "ingress-nginx.wallarmCollectdContainer" . | nindent 8 }}
203203
{{- if .Values.controller.wallarm.apiFirewall.enabled }}
204204
{{ include "ingress-nginx.wallarmapiFirewallContainer" . | nindent 8 }}

‎charts/ingress-nginx/templates/controller-deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
annotations:
3434
{{- if .Values.controller.wallarm.enabled }}
3535
wallarm-enabled: "true"
36-
checksum/cron: {{ .Values.controller.wallarm.cron | toJson | sha256sum }}
36+
checksum/wcli: {{ .Values.controller.wallarm.wcli | toJson | sha256sum }}
3737
{{- if not .Values.controller.wallarm.existingSecret.enabled }}
3838
checksum/token: {{ .Values.controller.wallarm.token | sha256sum }}
3939
{{- end }}
@@ -201,7 +201,7 @@ spec:
201201
{{- toYaml .Values.controller.extraContainers | nindent 8 }}
202202
{{- end }}
203203
{{- if .Values.controller.wallarm.enabled }}
204-
{{ include "ingress-nginx.wallarmCronContainer" . | nindent 8 }}
204+
{{ include "ingress-nginx.wallarmWcliContainer" . | nindent 8 }}
205205
{{ include "ingress-nginx.wallarmCollectdContainer" . | nindent 8 }}
206206
{{- if .Values.controller.wallarm.apiFirewall.enabled }}
207207
{{ include "ingress-nginx.wallarmapiFirewallContainer" . | nindent 8 }}

‎charts/ingress-nginx/templates/postanalytics-daemonset.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
template:
2525
metadata:
2626
annotations:
27-
checksum/cron: {{ .Values.controller.wallarm.cron | toJson | sha256sum }}
27+
checksum/wcli: {{ .Values.controller.wallarm.wcli | toJson | sha256sum }}
2828
{{- if not .Values.controller.wallarm.existingSecret.enabled }}
2929
checksum/token: {{ .Values.controller.wallarm.token | sha256sum }}
3030
{{- end }}
@@ -46,7 +46,7 @@ spec:
4646
{{ $_ := set .Values "register_mode" "post_analytic" }}
4747
{{ include "ingress-nginx.wallarmInitContainer.init" . | nindent 8 }}
4848
containers:
49-
{{ include "ingress-nginx.wallarmCronContainer" . | nindent 8 }}
49+
{{ include "ingress-nginx.wallarmWcliContainer" . | nindent 8 }}
5050
- name: wstore
5151
{{- if .Values.controller.wallarm.postanalytics.image }}
5252
{{- with .Values.controller.wallarm.postanalytics.image }}

‎charts/ingress-nginx/templates/postanalytics-deployment.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
template:
2626
metadata:
2727
annotations:
28-
checksum/cron: {{ .Values.controller.wallarm.cron | toJson | sha256sum }}
28+
checksum/wcli: {{ .Values.controller.wallarm.wcli | toJson | sha256sum }}
2929
{{- if not .Values.controller.wallarm.existingSecret.enabled }}
3030
checksum/token: {{ .Values.controller.wallarm.token | sha256sum }}
3131
{{- end }}
@@ -47,7 +47,7 @@ spec:
4747
{{ $_ := set .Values "register_mode" "post_analytic" }}
4848
{{ include "ingress-nginx.wallarmInitContainer.init" . | nindent 8 }}
4949
containers:
50-
{{ include "ingress-nginx.wallarmCronContainer" . | nindent 8 }}
50+
{{ include "ingress-nginx.wallarmWcliContainer" . | nindent 8 }}
5151
- name: wstore
5252
{{- if .Values.controller.wallarm.postanalytics.image }}
5353
{{- with .Values.controller.wallarm.postanalytics.image }}

‎charts/ingress-nginx/values.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,8 +1040,8 @@ controller:
10401040
# externalTrafficPolicy: ""
10411041
# nodePort: ""
10421042
## If HPA is used, the resources.requests.{cpu,memory} must be set in the following variables:
1043-
## init, cron, and collectd. Otherwise, HPA will not work properly.
1044-
## Note: init.resources, and cron.resources are shared between 2 pods:
1043+
## init, wcli, and collectd. Otherwise, HPA will not work properly.
1044+
## Note: init.resources, and wcli.resources are shared between 2 pods:
10451045
## wallarm-ingress-controller and wallarm-ingress-controller-wstore.
10461046
## Means that in case of values changing - BOTH pods (controller and wstore) will be redeployed.
10471047
init:
@@ -1054,7 +1054,7 @@ controller:
10541054
# secretKeyRef:
10551055
# key: FOO
10561056
# name: secret-resource
1057-
cron:
1057+
wcli:
10581058
### General log level
10591059
logLevel: warn
10601060
### Per-job log levels

‎test/smoke/functions.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,9 @@ function get_logs() {
104104
echo -e "#######################################\n"
105105

106106
echo "#################################"
107-
echo "###### Cron container logs ######"
107+
echo "###### Wcli container logs ######"
108108
echo "#################################"
109-
kubectl logs -l "app.kubernetes.io/component=controller" -c cron --tail=-1
109+
kubectl logs -l "app.kubernetes.io/component=controller" -c wcli --tail=-1
110110
echo -e "#################################\n"
111111

112112
echo "###################################"
@@ -134,9 +134,9 @@ function get_logs() {
134134
echo -e "############################################################\n"
135135

136136
echo "##################################################"
137-
echo "###### WSTORE Pod - Cron container logs ######"
137+
echo "###### WSTORE Pod - Wcli container logs ######"
138138
echo "##################################################"
139-
kubectl logs -l "app.kubernetes.io/component=controller-wallarm-wstore" -c cron --tail=-1
139+
kubectl logs -l "app.kubernetes.io/component=controller-wallarm-wstore" -c wcli --tail=-1
140140
echo -e "##################################################\n"
141141

142142
echo "######################################################"

‎test/smoke/run.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ controller:
141141
apiCaVerify: ${WALLARM_API_CA_VERIFY}
142142
nodeGroup: ${NODE_GROUP_NAME}
143143
fallback: "off"
144-
cron:
144+
wcli:
145145
commands:
146146
detectCredStuffing:
147147
logLevel: DEBUG

0 commit comments

Comments
 (0)