Skip to content

Allow to use local services area via optional parameter #1269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow to use local services area via optional parameter #1269

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5d048a
Allow to use local services area via optional parameter
vkuznet Dec 1, 2022
5d55d01
Add script options
vkuznet Dec 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 55 additions & 10 deletions kubernetes/cmsweb/scripts/deploy-srv.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,40 @@
#!/bin/bash
# helper script to deploy given service with given tag to k8s infrastructure

if [ $# -lt 2 ]; then
echo "The required parameters for service and tag are missing. Please use deploy-srv.sh <service> <tag> <env> "
Copy link
Member

@arooshap arooshap Dec 2, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@amaltaro Yes, this can cause a mixup of parameters 3 and 4. I think rather than removing the env variable entirely, we can make the script take keyword arguments because when you're doing multiple deployments at the same time, it helps to make sure that you are deploying in the correct environment.

function Usage()
{
echo "deploy-srv.sh -s <service> -t <tag> -e <env> -d <optional services directory>"
exit 1;
fi
}
srv=""
tag=""
env=""
sdir=""

while getopts "s:t:e:d:" opt; do
case $opt in
s)
srv=$OPTARG
;;
t)
tag=$OPTARG
;;
e)
env=$OPTARG
;;
d)
sdir=$OPTARG
;;
*)
Usage
;;
esac
done

cluster_name=`kubectl config get-clusters | grep -v NAME`
check=true

if [ $# -ne 3 ]; then
if [ "$env" == "" ]; then
if [[ "$cluster_name" == *"testbed"* ]] ; then
env="preprod"
fi
Expand Down Expand Up @@ -55,12 +80,25 @@ if [ $# -ne 3 ]; then
fi

fi
srv=$1
cmsweb_image_tag=:$2

if [ $# == 3 ]; then
env=$3
# check mandatory option values
if [ "$srv" == "" ]; then
echo "missing service value"
Usage
fi
if [ "$tag" == "" ]; then
echo "missing tag value"
Usage
fi
if [ "$env" == "" ]; then
echo "missing env value"
Usage
fi
echo "service=$srv tag=$tag env=$env sdir=$sdir"

cmsweb_image_tag=":$tag"

localServices=$sdir

cmsweb_env=k8s-$env
cmsweb_log=logs-cephfs-claim-$env
Expand Down Expand Up @@ -151,8 +189,15 @@ if [ -d $tmpDir ]; then
rm -rf $tmpDir
fi
mkdir -p $tmpDir
cd $tmpDir
curl -ksLO https://raw.githubusercontent.com/dmwm/CMSKubernetes/master/kubernetes/cmsweb/services/$srv.yaml
if [ "$localServices" != "" ] && [ -f $localServices/$srv.yaml ]; then
echo "copy $localServices/$srv.yaml to $tmpDir"
cp $localServices/$srv.yaml $tmpDir
cd $tmpDir
else
cd $tmpDir
echo "fetch https://raw.githubusercontent.com/dmwm/CMSKubernetes/master/kubernetes/cmsweb/services/$srv.yaml to $tmpDir"
curl -ksLO https://raw.githubusercontent.com/dmwm/CMSKubernetes/master/kubernetes/cmsweb/services/$srv.yaml
fi

# check that service file has imagetag
if [ -z "`grep imagetag $srv.yaml`" ]; then
Expand Down