From 536e933fefe7df9619d729a2d1abfe8bdfd4b356 Mon Sep 17 00:00:00 2001 From: Wolfgang Hottgenroth Date: Wed, 31 Jan 2024 15:30:53 +0100 Subject: [PATCH] postfix instead of prefix --- deployment/deploy-yml.tmpl | 4 ++-- deployment/deploy.sh | 13 ++++++++++--- deployment/test-oidc-config.json | 13 ------------- 3 files changed, 12 insertions(+), 18 deletions(-) delete mode 100644 deployment/test-oidc-config.json diff --git a/deployment/deploy-yml.tmpl b/deployment/deploy-yml.tmpl index 806d8ca..059e329 100644 --- a/deployment/deploy-yml.tmpl +++ b/deployment/deploy-yml.tmpl @@ -46,10 +46,10 @@ metadata: spec: tls: - hosts: - - %PREFIX%nutri.hottis.de + - nutri%POSTFIX%.hottis.de secretName: nutri-cert rules: - - host: %PREFIX%nutri.hottis.de + - host: nutri%POSTFIX%.hottis.de http: paths: - path: / diff --git a/deployment/deploy.sh b/deployment/deploy.sh index 83a70eb..613d7b4 100755 --- a/deployment/deploy.sh +++ b/deployment/deploy.sh @@ -1,13 +1,19 @@ #!/bin/bash +if [ "$1" == "test" ]; then + POSTFIX="-test" + IMAGE_TAG="latest" +else + POSTFIX="" +fi + if [ "$IMAGE_TAG" == "" ]; then echo "Make sure IMAGE_TAG is set" exit 1 fi - IMAGE_NAME=gitea.hottis.de/moerp/elo-rezept-rechner -NAMESPACE=moerp +NAMESPACE=moerp${POSTFIX} DEPLOYMENT_DIR=$PWD/deployment pushd $DEPLOYMENT_DIR > /dev/null @@ -15,7 +21,7 @@ pushd $DEPLOYMENT_DIR > /dev/null . /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 \ --dry-run=client \ @@ -37,6 +43,7 @@ kubectl create secret generic nutri-secrets \ cat $DEPLOYMENT_DIR/deploy-yml.tmpl | \ sed -e 's,%IMAGE%,'$IMAGE_NAME':'$IMAGE_TAG','g | \ + sed -e 's,%POSTFIX%,'$POSTFIX','g | \ kubectl apply -f - -n $NAMESPACE popd > /dev/null diff --git a/deployment/test-oidc-config.json b/deployment/test-oidc-config.json deleted file mode 100644 index f79e07a..0000000 --- a/deployment/test-oidc-config.json +++ /dev/null @@ -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" - } -}