postfix instead of prefix

This commit is contained in:
Wolfgang Hottgenroth 2024-01-31 15:30:53 +01:00
parent d469a7cf2c
commit 536e933fef
Signed by: wn
GPG Key ID: 836E9E1192A6B132
3 changed files with 12 additions and 18 deletions

View File

@ -46,10 +46,10 @@ metadata:
spec: spec:
tls: tls:
- hosts: - hosts:
- %PREFIX%nutri.hottis.de - nutri%POSTFIX%.hottis.de
secretName: nutri-cert secretName: nutri-cert
rules: rules:
- host: %PREFIX%nutri.hottis.de - host: nutri%POSTFIX%.hottis.de
http: http:
paths: paths:
- path: / - path: /

View File

@ -1,13 +1,19 @@
#!/bin/bash #!/bin/bash
if [ "$1" == "test" ]; then
POSTFIX="-test"
IMAGE_TAG="latest"
else
POSTFIX=""
fi
if [ "$IMAGE_TAG" == "" ]; then if [ "$IMAGE_TAG" == "" ]; then
echo "Make sure IMAGE_TAG is set" echo "Make sure IMAGE_TAG is set"
exit 1 exit 1
fi fi
IMAGE_NAME=gitea.hottis.de/moerp/elo-rezept-rechner IMAGE_NAME=gitea.hottis.de/moerp/elo-rezept-rechner
NAMESPACE=moerp NAMESPACE=moerp${POSTFIX}
DEPLOYMENT_DIR=$PWD/deployment DEPLOYMENT_DIR=$PWD/deployment
pushd $DEPLOYMENT_DIR > /dev/null pushd $DEPLOYMENT_DIR > /dev/null
@ -15,7 +21,7 @@ pushd $DEPLOYMENT_DIR > /dev/null
. /tmp/secrets . /tmp/secrets
rm /tmp/secrets rm /tmp/secrets
CLIENT_SECRETS=`cat oidc-config.json | sed -e's!%CLIENT_SECRET%!'$CLIENT_SECRET'!'` CLIENT_SECRETS=`cat oidc-config${POSTFIX}.json | sed -e's!%CLIENT_SECRET%!'$CLIENT_SECRET'!'`
kubectl create namespace $NAMESPACE \ kubectl create namespace $NAMESPACE \
--dry-run=client \ --dry-run=client \
@ -37,6 +43,7 @@ kubectl create secret generic nutri-secrets \
cat $DEPLOYMENT_DIR/deploy-yml.tmpl | \ cat $DEPLOYMENT_DIR/deploy-yml.tmpl | \
sed -e 's,%IMAGE%,'$IMAGE_NAME':'$IMAGE_TAG','g | \ sed -e 's,%IMAGE%,'$IMAGE_NAME':'$IMAGE_TAG','g | \
sed -e 's,%POSTFIX%,'$POSTFIX','g | \
kubectl apply -f - -n $NAMESPACE kubectl apply -f - -n $NAMESPACE
popd > /dev/null popd > /dev/null

View File

@ -1,13 +0,0 @@
{
"web": {
"issuer": "https://auth2.hottis.de/realms/hottis",
"auth_uri": "https://auth2.hottis.de/ealms/hottis/protocol/openid-connect/auth",
"client_id": "nutri",
"client_secret": "%CLIENT_SECRET%",
"redirect_uris": [
"https://nutri.hottis.de/*"
],
"userinfo_uri": "https://auth2.hottis.de/realms/hottis/protocol/openid-connect/userinfo",
"token_uri": "https://auth2.hottis.de/realms/hottis/protocol/openid-connect/token"
}
}