Merge pull request #1554 from nikodemas/delete_cmspopdb_keytab

Delete cmspopdb keytab
dmwm · Oct 4, 2024 · f11dade · f11dade
2 parents 40767dc + 9eacee8
commit f11dade
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/kubernetes/monitoring/deploy-secrets.sh b/kubernetes/monitoring/deploy-secrets.sh
@@ -148,11 +148,9 @@ elif [ "$secret" == "cron-size-quotas-secrets" ]; then
     files="--from-file=${sdir}/cmsmonit-keytab/keytab"
 elif [ "$secret" == "cron-spark-jobs-secrets" ]; then
     # file in secrets mount : keytab          -> cmsmonit-keytab
-    # file in secrets mount : cmspopdb-keytab -> cmspopdb-keytab
     cmsmonit_k="--from-file=${sdir}/cmsmonit-keytab/keytab"
-    cmspopdb_k="--from-file=cmspopdb-keytab=${sdir}/cmspopdb-keytab/keytab"
     test_tenant_secret="--from-file=${sdir}/es-cms-opensearch/test_tenant_secret"
-    files="${cmsmonit_k} ${cmspopdb_k} ${test_tenant_secret}"
+    files="${cmsmonit_k} ${test_tenant_secret}"
 elif [ "$secret" == "cms-eos-mon-secrets" ]; then
     files="--from-file=${sdir}/cms-eos-mon/amq_broker.json"
 elif [ "$secret" == "hpc-usage-secrets" ]; then
@@ -193,10 +191,9 @@ elif [ "$secret" == "certcheck-secrets" ]; then
     cms_dm_monitoring_s="--from-file=cms_dm_monitoring_key=${sdir}/cms-dm-monitoring-auth/tls.key ${cms_dm_monitoring_s}"
     #
     cmsmonit_k="--from-file=cmsmonit_keytab=${sdir}/cmsmonit-keytab/keytab"
-    cmspopdb_k="--from-file=cmspopdb_keytab=${sdir}/cmspopdb-keytab/keytab"
     cmssqoop_k="--from-file=cmssqoop_keytab=${sdir}/cmssqoop-keytab/keytab"
     training_s="--from-file=${sdir}/cms-training/robot-training-cert.pem --from-file=${sdir}/cms-training/robot-training-key.pem"
-    files="${robot_s} ${cms_monitoring_s} ${cms_dm_monitoring_s} ${cmsmonit_k} ${cmspopdb_k} ${cmssqoop_k} ${training_s}"
+    files="${robot_s} ${cms_monitoring_s} ${cms_dm_monitoring_s} ${cmsmonit_k} ${cmssqoop_k} ${training_s}"
 fi
 echo "files: \"$files\""
 #echo "literals: $literals"

diff --git a/kubernetes/monitoring/services/cron-spark-jobs.yaml b/kubernetes/monitoring/services/cron-spark-jobs.yaml
@@ -13,8 +13,6 @@ data:
     export B_=$WDIR/CMSSpark/bin
     # Shared args
     export A_=" --keytab /etc/secrets/keytab --host ${MY_NODE_NAME} --wdir ${WDIR} --p1 32500 --p2 32501 "
-    # CMSPOPDB keytab args
-    export POPDB_A_=" --keytab /etc/secrets/cmspopdb-keytab --host ${MY_NODE_NAME} --wdir ${WDIR} --p1 32500 --p2 32501 "
     # Stdout of crond
     export O_=/proc/$(cat /var/run/crond.pid)/fd/1
     export EOS_=$BASE_EOS_OUT
@@ -23,14 +21,14 @@ 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
-    00 16 24  *  * . /data/cronjob/s.sh; $B_/cron4eos_dataset.sh       $A_ --output $EOS_/EOS/data           >>$O_ 2>&1
-    00 16 27  *  * . /data/cronjob/s.sh; $B_/cron4crab_unique_users.sh $A_ --output $EOS_/crab_uu            >>$O_ 2>&1
+    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
+    00 16 24  *  * . /data/cronjob/s.sh; $B_/cron4eos_dataset.sh       $A_ --output $EOS_/EOS/data        >>$O_ 2>&1
+    00 16 27  *  * . /data/cronjob/s.sh; $B_/cron4crab_unique_users.sh $A_ --output $EOS_/crab_uu         >>$O_ 2>&1
     # DAILY
-    07 08  *  *  * . /data/cronjob/s.sh; $B_/cron4rucio_daily.sh       $POPDB_A_ --output /cms/rucio_daily   >>$O_ 2>&1
+    07 08  *  *  * . /data/cronjob/s.sh; $B_/cron4rucio_daily.sh       $A_ --output /cms/rucio_daily      >>$O_ 2>&1
 ---
 kind: Service
 apiVersion: v1
@@ -73,7 +71,7 @@ spec:
       hostname: cron-spark-jobs
       containers:
         - name: cron-spark-jobs
-          image: registry.cern.ch/cmsmonitoring/cmsmon-spark:v0.5.0.0
+          image: registry.cern.ch/cmsmonitoring/cmsmon-spark:v0.5.0.2
           env:
             - name: MY_NODE_NAME
               valueFrom:

diff --git a/kubernetes/monitoring/services/http-exporter-certcheck.yaml b/kubernetes/monitoring/services/http-exporter-certcheck.yaml
@@ -28,7 +28,6 @@ data:
       {"cert": "/etc/secrets/cms_dm_monitoring_cert", "ckey": "/etc/secrets/cms_dm_monitoring_key"},
       {"cert": "/etc/secrets/robot-training-cert.pem", "ckey": "/etc/secrets/robot-training-key.pem"},
       {"keytab": "/etc/secrets/cmsmonit_keytab"},
-      {"keytab": "/etc/secrets/cmspopdb_keytab"},
       {"keytab": "/etc/secrets/cmssqoop_keytab"}
     ]
 ---