Read the tag from cmd for deploy-srv-dbs && Change dbs service regexp at deploy-srv

Author: todor-ivanov

kubernetes/cmsweb/scripts/deploy-srv-dbs.sh

@@ -3,17 +3,17 @@
 # Define the target namespace in the new cluster
 target_namespace="dbs"
 
-# Mapping of service names to their full image tags
+tag=$1
+
 declare -A service_image_tags=(
-    ["check-metric"]="registry.cern.ch/cmsweb/check-metric:20220404-stable"
-    ["dbs2go-global-m"]="registry.cern.ch/cmsweb/dbs2go:v00.06.42-stable"
-    ["dbs2go-global-migration"]="registry.cern.ch/cmsweb/dbs2go:v00.06.42-stable"
-    ["dbs2go-global-r"]="registry.cern.ch/cmsweb/dbs2go:v00.06.42-stable"
-    ["dbs2go-global-w"]="registry.cern.ch/cmsweb/dbs2go:v00.06.43-stable"
-    ["dbs2go-phys03-m"]="registry.cern.ch/cmsweb/dbs2go:v00.06.42-stable"
-    ["dbs2go-phys03-migration"]="registry.cern.ch/cmsweb/dbs2go:v00.06.42-stable"
-    ["dbs2go-phys03-r"]="registry.cern.ch/cmsweb/dbs2go:v00.06.42-stable"
-    ["dbs2go-phys03-w"]="registry.cern.ch/cmsweb/dbs2go:v00.06.43-stable"
+    ["dbs2go-global-m"]="registry.cern.ch/cmsweb/dbs2go:$tag"
+    ["dbs2go-global-migration"]="registry.cern.ch/cmsweb/dbs2go:$tag"
+    ["dbs2go-global-r"]="registry.cern.ch/cmsweb/dbs2go:$tag"
+    ["dbs2go-global-w"]="registry.cern.ch/cmsweb/dbs2go:$tag"
+    ["dbs2go-phys03-m"]="registry.cern.ch/cmsweb/dbs2go:$tag"
+    ["dbs2go-phys03-migration"]="registry.cern.ch/cmsweb/dbs2go:$tag"
+    ["dbs2go-phys03-r"]="registry.cern.ch/cmsweb/dbs2go:$tag"
+    ["dbs2go-phys03-w"]="registry.cern.ch/cmsweb/dbs2go:$tag"
 )
 
 # Loop through the service names and their full image tags

kubernetes/cmsweb/scripts/deploy-srv.sh

@@ -197,11 +197,10 @@ elif  [ "$cmsweb_env" == "k8s-preprod" ] ; then
 
             cat $srv.yaml | sed -e "s,1 #PROD#,,g" | sed -e "s,#PROD#,      ,g" |  sed -e "s,logs-cephfs-claim,$cmsweb_log,g" | sed -e "s, #imagetag,$cmsweb_image_tag,g" | sed -e "s,k8s #k8s#,$cmsweb_env,g" | sed -e 's+crabserver/prod+crabserver/preprod+g' |  kubectl apply -f -
 
-        elif [[ "$srv" == "dbs-global-r"  || "$srv" == "dbs-global-w"  ||  "$srv" == "dbs-migrate"  ||  "$srv" == "dbs-phys03-r" || "$srv" == "dbs-phys03-w" || "$srv" == "dbs2go-global-r" || "$srv" == "dbs2go-global-w" || "$srv" == "dbs2go-phys03-r" || "$srv" == "dbs2go-phys03-w" || "$srv" == "dbs2go-global-m" || "$srv" == "dbs2go-phys03-m" || "$srv" == "dbs2go-global-migration" || "$srv" == "dbs2go-phys03-migration" ]] ; then
+        elif [[ "$srv" =~ dbs2go.* ]] || [[ "$srv" =~ dbs-.* ]] ; then
             cat $srv.yaml | sed -e "s,1 #PROD#,,g" | sed -e "s,#PROD#,      ,g" |  sed -e "s,logs-cephfs-claim,$cmsweb_log,g" | sed -e "s, #imagetag,$cmsweb_image_tag,g" | sed -e "s,k8s #k8s#,$cmsweb_env,g" | sed -e 's+dbs/prod+dbs/int+g' >  $srv.yaml.new
-
             cat $srv.yaml | sed -e "s,1 #PROD#,,g" | sed -e "s,#PROD#,      ,g" |  sed -e "s,logs-cephfs-claim,$cmsweb_log,g" | sed -e "s, #imagetag,$cmsweb_image_tag,g" | sed -e "s,k8s #k8s#,$cmsweb_env,g" | sed -e 's+dbs/prod+dbs/int+g' |  kubectl apply -f -
-	
+	        
 	else
             cat $srv.yaml | sed -e "s,1 #PROD# 5,2,g" | sed -e "s,#PROD#,      ,g" |  sed -e "s,logs-cephfs-claim,$cmsweb_log,g" | sed -e "s, #imagetag,$cmsweb_image_tag,g" | sed -e "s,k8s #k8s#,$cmsweb_env,g" >  $srv.yaml.new