Update imgage versions and flags (#1539)

* Update img versions and flags * Update img versions, delete old cronjob
dmwm · Jan 21, 2025 · ac7a73f · ac7a73f
1 parent 6ef0c3c
commit ac7a73f
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/kubernetes/monitoring/crons/grafana-dashboard-copy.yaml b/kubernetes/monitoring/crons/grafana-dashboard-copy.yaml
@@ -11,7 +11,7 @@ spec:
         spec:
           containers:
           - name: grafana-dashboard-copy
-            image: registry.cern.ch/cmsmonitoring/cmsmon-spark:v0.5.0.3
+            image: registry.cern.ch/cmsmonitoring/cmsmon-spark:v0.5.0.5
             command: [ "bash", "-c"]
             args:
             - date; echo "run dashboard-copy.py through run.sh";

diff --git a/kubernetes/monitoring/crons/grafana-dashboard-exporter.yaml b/kubernetes/monitoring/crons/grafana-dashboard-exporter.yaml
@@ -11,7 +11,7 @@ spec:
         spec:
           containers:
           - name: grafana-dashboard-exporter
-            image: registry.cern.ch/cmsmonitoring/cmsmon-spark:v0.5.0.3
+            image: registry.cern.ch/cmsmonitoring/cmsmon-spark:v0.5.0.5
             command: [ "bash", "-c"]
             args:
             - date; echo "run dashboard-exporter.py through run.sh";

diff --git a/kubernetes/monitoring/services/cmsmon-hpc-usage.yaml b/kubernetes/monitoring/services/cmsmon-hpc-usage.yaml
@@ -57,7 +57,7 @@ spec:
       hostname: hpc-usage
       containers:
         - name: hpc-usage
-          image: registry.cern.ch/cmsmonitoring/cmsmon-spark:v0.5.0.0
+          image: registry.cern.ch/cmsmonitoring/cmsmon-spark:v0.5.0.5
           env:
             - name: MY_NODE_NAME
               valueFrom:
@@ -72,6 +72,7 @@ spec:
               exec:
                 command:
                   - "sh"
+                  - "-l"
                   - "-c"
                   - >
                     export > /etc/environment;

diff --git a/kubernetes/monitoring/services/cmsmon-rucio-ds.yaml b/kubernetes/monitoring/services/cmsmon-rucio-ds.yaml
@@ -65,7 +65,7 @@ spec:
       hostname: cmsmon-rucio-ds
       containers:
         - name: cmsmon-rucio-ds
-          image: registry.cern.ch/cmsmonitoring/cmsmon-spark:v0.5.0.0
+          image: registry.cern.ch/cmsmonitoring/cmsmon-spark:v0.5.0.5
           env:
             - name: MY_NODE_NAME
               valueFrom:
@@ -80,6 +80,7 @@ spec:
               exec:
                 command:
                   - "sh"
+                  - "-l"
                   - "-c"
                   - >
                     export > /etc/environment;

diff --git a/kubernetes/monitoring/services/cpueff/cpueff-goweb.yaml b/kubernetes/monitoring/services/cpueff/cpueff-goweb.yaml
@@ -32,7 +32,7 @@ spec:
     spec:
       containers:
       - name: cpueff-goweb
-        image: registry.cern.ch/cmsmonitoring/cpueff-goweb:cpueff-0.0.25
+        image: registry.cern.ch/cmsmonitoring/cpueff-goweb:cpueff-0.0.30
         # image: golang
         # command: [ "sleep" ]
         # args: [ "infinity" ]

diff --git a/kubernetes/monitoring/services/cpueff/cpueff-spark.yaml b/kubernetes/monitoring/services/cpueff/cpueff-spark.yaml
@@ -60,7 +60,7 @@ spec:
           hostname: cpueff-spark
           containers:
             - name: cpueff-spark
-              image: registry.cern.ch/cmsmonitoring/cpueff-spark:cpueff-0.0.25
+              image: registry.cern.ch/cmsmonitoring/cpueff-spark:cpueff-0.0.28
               command: [ "/bin/bash", "-c" ]
               args:
                 - source /etc/environment;
@@ -97,6 +97,7 @@ spec:
                   exec:
                     command:
                       - "sh"
+                      - "-l"
                       - "-c"
                       - >
                         export > /etc/environment;

diff --git a/kubernetes/monitoring/services/cron-spark-jobs.yaml b/kubernetes/monitoring/services/cron-spark-jobs.yaml
@@ -21,7 +21,6 @@ data:
     # each Monday at 10 AM
     00 10 * * 1 . /data/cronjob/s.sh; $B_/cron4wma_agent_count.sh $A_ --conf /etc/secrets/test_tenant_secret >>$O_ 2>&1
     # MONTHLY
-    00 16 03  *  * . /data/cronjob/s.sh; $B_/cron4hpc_at_cms.sh        $A_ --output $EOS_/hpc             >>$O_ 2>&1
     00 16 05  *  * . /data/cronjob/s.sh; $B_/cron4crab_popularity.sh   $A_ --output $EOS_/crabPop/data    >>$O_ 2>&1
     00 16 07  *  * . /data/cronjob/s.sh; $B_/cron4gen_crsg_plots.sh    $A_ --output $EOS_/EventCountPlots >>$O_ 2>&1
     00 16 19  *  * . /data/cronjob/s.sh; $B_/cron4hs06_cputime_plot.sh $A_ --output $EOS_/hs06cputime     >>$O_ 2>&1
@@ -71,7 +70,7 @@ spec:
       hostname: cron-spark-jobs
       containers:
         - name: cron-spark-jobs
-          image: registry.cern.ch/cmsmonitoring/cmsmon-spark:v0.5.0.2
+          image: registry.cern.ch/cmsmonitoring/cmsmon-spark:v0.5.0.5
           env:
             - name: MY_NODE_NAME
               valueFrom:
@@ -88,6 +87,7 @@ spec:
               exec:
                 command:
                   - "sh"
+                  - "-l"
                   - "-c"
                   - >
                     export > /etc/environment;

diff --git a/kubernetes/monitoring/services/udp-collector/udp-server.yaml b/kubernetes/monitoring/services/udp-collector/udp-server.yaml
@@ -40,7 +40,7 @@ spec:
         value: "true"
         effect: "NoSchedule"
       containers:
-      - image: registry.cern.ch/cmsmonitoring/udp-server:v0.0.14
+      - image: registry.cern.ch/cmsmonitoring/udp-server:v0.0.16
         name: udp-server
         command: ["/data/udp_collector"]
         args: ["-config", "/etc/secrets/udp_server.json"]