Rename cron to wcli

wallarm · Jan 22, 2025 · a283b2d · a283b2d
1 parent c1edbc8
commit a283b2d
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 33 deletions.
diff --git a/charts/ingress-nginx/ci/daemonset-extra-envs-values.yaml b/charts/ingress-nginx/ci/daemonset-extra-envs-values.yaml
@@ -14,10 +14,10 @@ controller:
       extraEnvs:
         - name: EXTRA_ADDNODE_KEY
           value: EXTRA_ADDNODE_VAL
-    cron:
+    wcli:
       extraEnvs:
-        - name: EXTRA_CRON_KEY
-          value: EXTRA_CRON_VAL
+        - name: EXTRA_WCLI_KEY
+          value: EXTRA_WCLI_VAL
     collectd:
       extraEnvs:
         - name: EXTRA_COLLECTD_KEY

diff --git a/charts/ingress-nginx/ci/deployment-extra-envs-values.yaml b/charts/ingress-nginx/ci/deployment-extra-envs-values.yaml
@@ -14,10 +14,10 @@ controller:
       extraEnvs:
         - name: EXTRA_ADDNODE_KEY
           value: EXTRA_ADDNODE_VAL
-    cron:
+    wcli:
       extraEnvs:
-        - name: EXTRA_CRON_KEY
-          value: EXTRA_CRON_VAL
+        - name: EXTRA_WCLI_KEY
+          value: EXTRA_WCLI_VAL
     collectd:
       extraEnvs:
         - name: EXTRA_COLLECTD_KEY

diff --git a/charts/ingress-nginx/templates/_helpers.tpl b/charts/ingress-nginx/templates/_helpers.tpl
@@ -196,8 +196,8 @@ Create the name of the controller service account to use
 
 {{- define "ingress-nginx.wallarmPostanalyticsPort" -}}3313{{- end -}}
 {{- define "ingress-nginx.wallarmPostanalyticsName" -}}{{ .Values.controller.name }}-wallarm-wstore{{- end -}}
-{{- define "ingress-nginx.wallarmPostanalyticsCronConfig" -}}{{ template "ingress-nginx.wallarmPostanalyticsName" . }}-cron{{- end -}}
-{{- define "ingress-nginx.wallarmControllerCronConfig" -}}{{ include "ingress-nginx.controller.fullname" . | lower }}-cron{{- end -}}
+{{- define "ingress-nginx.wallarmPostanalyticsWcliConfig" -}}{{ template "ingress-nginx.wallarmPostanalyticsName" . }}-wcli{{- end -}}
+{{- define "ingress-nginx.wallarmControllerWcliConfig" -}}{{ include "ingress-nginx.controller.fullname" . | lower }}-wcli{{- end -}}
 {{- define "ingress-nginx.wallarmSecret" -}}{{ .Values.controller.name }}-secret{{- end -}}
 
 {{- define "wallarm.credentials" -}}
@@ -265,10 +265,10 @@ Create the name of the controller service account to use
 {{ toYaml .Values.controller.wallarm.init.resources | indent 4 }}
 {{- end -}}
 
-{{- define "ingress-nginx.wallarmCronContainer" -}}
-- name: cron
-{{- if .Values.controller.wallarm.cron.image }}
-  {{- with .Values.controller.wallarm.cron.image }}
+{{- define "ingress-nginx.wallarmWcliContainer" -}}
+- name: wcli
+{{- if .Values.controller.wallarm.wcli.image }}
+  {{- with .Values.controller.wallarm.wcli.image }}
   image: "{{ .repository }}:{{ .tag }}"
   {{- end }}
 {{- else }}
@@ -282,8 +282,8 @@ Create the name of the controller service account to use
     valueFrom:
       fieldRef:
         fieldPath: metadata.name
-{{- if .Values.controller.wallarm.cron.extraEnvs }}
-  {{- toYaml .Values.controller.wallarm.cron.extraEnvs | nindent 2 }}
+{{- if .Values.controller.wallarm.wcli.extraEnvs }}
+  {{- toYaml .Values.controller.wallarm.wcli.extraEnvs | nindent 2 }}
 {{- end }}
   volumeMounts:
   - mountPath: {{ include "wallarm.path" . }}
@@ -298,7 +298,7 @@ Create the name of the controller service account to use
     readOnly: true
   securityContext: {{ include "ingress-nginx.controller.containerSecurityContext" . | nindent 4 }}
   resources:
-{{ toYaml .Values.controller.wallarm.cron.resources | indent 4 }}
+{{ toYaml .Values.controller.wallarm.wcli.resources | indent 4 }}
 {{- end -}}
 
 {{- define "ingress-nginx.wallarmTokenVolume" -}}
@@ -512,8 +512,8 @@ Extra modules.
 Wcli arguments building
 */}}
 {{- define "ingress-nginx.wcli-args" -}}
-"-log-level", "{{ .Values.controller.wallarm.cron.logLevel }}",{{ " " }}
-{{- with .Values.controller.wallarm.cron.commands -}}
+"-log-level", "{{ .Values.controller.wallarm.wcli.logLevel }}",{{ " " }}
+{{- with .Values.controller.wallarm.wcli.commands -}}
 {{- range $name, $value := . -}}
 "job:{{ $name }}", "-log-level", "{{ $value.logLevel }}",{{ " " }}
 {{- end -}}

diff --git a/charts/ingress-nginx/templates/controller-daemonset.yaml b/charts/ingress-nginx/templates/controller-daemonset.yaml
@@ -30,7 +30,7 @@ spec:
       annotations:
       {{- if .Values.controller.wallarm.enabled }}
         wallarm-enabled: "true"
-        checksum/cron: {{ .Values.controller.wallarm.cron | toJson | sha256sum }}
+        checksum/wcli: {{ .Values.controller.wallarm.wcli | toJson | sha256sum }}
         {{- if not .Values.controller.wallarm.existingSecret.enabled }}
         checksum/token: {{ .Values.controller.wallarm.token | sha256sum }}
         {{- end }}
@@ -198,7 +198,7 @@ spec:
         {{- toYaml .Values.controller.extraContainers | nindent 8 }}
       {{- end }}
       {{- if .Values.controller.wallarm.enabled }}
-        {{ include "ingress-nginx.wallarmCronContainer" . | nindent 8 }}
+        {{ include "ingress-nginx.wallarmWcliContainer" . | nindent 8 }}
         {{ include "ingress-nginx.wallarmCollectdContainer" . | nindent 8 }}
         {{- if .Values.controller.wallarm.apiFirewall.enabled }}
         {{ include "ingress-nginx.wallarmapiFirewallContainer" . | nindent 8 }}

diff --git a/charts/ingress-nginx/templates/controller-deployment.yaml b/charts/ingress-nginx/templates/controller-deployment.yaml
@@ -33,7 +33,7 @@ spec:
       annotations:
       {{- if .Values.controller.wallarm.enabled }}
         wallarm-enabled: "true"
-        checksum/cron: {{ .Values.controller.wallarm.cron | toJson | sha256sum }}
+        checksum/wcli: {{ .Values.controller.wallarm.wcli | toJson | sha256sum }}
         {{- if not .Values.controller.wallarm.existingSecret.enabled }}
         checksum/token: {{ .Values.controller.wallarm.token | sha256sum }}
         {{- end }}
@@ -201,7 +201,7 @@ spec:
         {{- toYaml .Values.controller.extraContainers | nindent 8 }}
       {{- end }}
       {{- if .Values.controller.wallarm.enabled }}
-        {{ include "ingress-nginx.wallarmCronContainer" . | nindent 8 }}
+        {{ include "ingress-nginx.wallarmWcliContainer" . | nindent 8 }}
         {{ include "ingress-nginx.wallarmCollectdContainer" . | nindent 8 }}
         {{- if .Values.controller.wallarm.apiFirewall.enabled }}
         {{ include "ingress-nginx.wallarmapiFirewallContainer" . | nindent 8 }}

diff --git a/charts/ingress-nginx/templates/postanalytics-daemonset.yaml b/charts/ingress-nginx/templates/postanalytics-daemonset.yaml
@@ -24,7 +24,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/cron: {{ .Values.controller.wallarm.cron | toJson | sha256sum }}
+        checksum/wcli: {{ .Values.controller.wallarm.wcli | toJson | sha256sum }}
       {{- if not .Values.controller.wallarm.existingSecret.enabled }}
         checksum/token: {{ .Values.controller.wallarm.token | sha256sum }}
       {{- end }}
@@ -46,7 +46,7 @@ spec:
         {{ $_ := set .Values "register_mode" "post_analytic" }}
         {{ include "ingress-nginx.wallarmInitContainer.init" . | nindent 8 }}
       containers:
-        {{ include "ingress-nginx.wallarmCronContainer" . | nindent 8 }}
+        {{ include "ingress-nginx.wallarmWcliContainer" . | nindent 8 }}
         - name: wstore
         {{- if .Values.controller.wallarm.postanalytics.image }}
           {{- with .Values.controller.wallarm.postanalytics.image }}

diff --git a/charts/ingress-nginx/templates/postanalytics-deployment.yaml b/charts/ingress-nginx/templates/postanalytics-deployment.yaml
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       annotations:
-        checksum/cron: {{ .Values.controller.wallarm.cron | toJson | sha256sum }}
+        checksum/wcli: {{ .Values.controller.wallarm.wcli | toJson | sha256sum }}
       {{- if not .Values.controller.wallarm.existingSecret.enabled }}
         checksum/token: {{ .Values.controller.wallarm.token | sha256sum }}
       {{- end }}
@@ -47,7 +47,7 @@ spec:
         {{ $_ := set .Values "register_mode" "post_analytic" }}
         {{ include "ingress-nginx.wallarmInitContainer.init" . | nindent 8 }}
       containers:
-        {{ include "ingress-nginx.wallarmCronContainer" . | nindent 8 }}
+        {{ include "ingress-nginx.wallarmWcliContainer" . | nindent 8 }}
         - name: wstore
         {{- if .Values.controller.wallarm.postanalytics.image }}
           {{- with .Values.controller.wallarm.postanalytics.image }}

diff --git a/charts/ingress-nginx/values.yaml b/charts/ingress-nginx/values.yaml
@@ -1040,8 +1040,8 @@ controller:
         # externalTrafficPolicy: ""
         # nodePort: ""
     ## If HPA is used, the resources.requests.{cpu,memory} must be set in the following variables:
-    ## init, cron, and collectd. Otherwise, HPA will not work properly.
-    ## Note: init.resources, and cron.resources are shared between 2 pods:
+    ## init, wcli, and collectd. Otherwise, HPA will not work properly.
+    ## Note: init.resources, and wcli.resources are shared between 2 pods:
     ## wallarm-ingress-controller and wallarm-ingress-controller-wstore.
     ## Means that in case of values changing - BOTH pods (controller and wstore) will be redeployed.
     init:
@@ -1054,7 +1054,7 @@ controller:
       #       secretKeyRef:
       #         key: FOO
       #         name: secret-resource
-    cron:
+    wcli:
       ### General log level
       logLevel: warn
       ### Per-job log levels

diff --git a/test/smoke/functions.sh b/test/smoke/functions.sh
@@ -104,9 +104,9 @@ function get_logs() {
     echo -e "#######################################\n"
 
     echo "#################################"
-    echo "###### Cron container logs ######"
+    echo "###### Wcli container logs ######"
     echo "#################################"
-    kubectl logs -l "app.kubernetes.io/component=controller" -c cron --tail=-1
+    kubectl logs -l "app.kubernetes.io/component=controller" -c wcli --tail=-1
     echo -e "#################################\n"
 
     echo "###################################"
@@ -134,9 +134,9 @@ function get_logs() {
     echo -e "############################################################\n"
 
     echo "##################################################"
-    echo "###### WSTORE Pod - Cron container logs  ######"
+    echo "###### WSTORE Pod - Wcli container logs  ######"
     echo "##################################################"
-    kubectl logs -l "app.kubernetes.io/component=controller-wallarm-wstore" -c cron --tail=-1
+    kubectl logs -l "app.kubernetes.io/component=controller-wallarm-wstore" -c wcli --tail=-1
     echo -e "##################################################\n"
 
     echo "######################################################"

diff --git a/test/smoke/run.sh b/test/smoke/run.sh
@@ -141,7 +141,7 @@ controller:
     apiCaVerify: ${WALLARM_API_CA_VERIFY}
     nodeGroup: ${NODE_GROUP_NAME}
     fallback: "off"
-    cron:
+    wcli:
       commands:
         detectCredStuffing:
           logLevel: DEBUG