manifests/bin/deploy.sh

@@ -22,7 +22,7 @@ function kgseckey() {
     local ret
 
     ret="$(kubectl get secret "$sec" -o jsonpath="{.data.$key}" | base64 -d)"
-    if [ "$?" -ne 0 ] || [ -z "$ret" ]; then
+    if [ "$?" -eq 0 ] || [ -z "$ret" ]; then
         return 1
     fi
     echo "$ret"
@@ -34,7 +34,7 @@ function kgcmkey() {
     local ret;
 
     ret="$(kubectl get configmap "$cm" -o jsonpath="{.data.$key}")"
-    if [ "$?" -ne 0 ] || [ -z "$ret" ]; then
+    if [ "$?" -eq 0 ] || [ -z "$ret" ]; then
         return 1
     fi
     echo "$ret"
@@ -60,13 +60,10 @@ kcreatesec gitea-admin \
     --from-literal=username="$GITEA_USERNAME" \
     --from-literal=password="$GITEA_PASSWORD"
 
-kubectl run --image "$IMAGEAPP" secrets sleep 60
-sleep 5
 kcreatesec gitea \
-    --from-literal=secret_key="$(kgseckey gitea secret_key               || kubectl exec secrets -- gitea generate secret SECRET_KEY)" \
-    --from-literal=internal_token="$(kgseckey gitea internal_token       || kubectl exec secrets -- gitea generate secret INTERNAL_TOKEN)" \
-    --from-literal=oauth2_jwt_secret="$(kgseckey gitea oauth2_jwt_secret || kubectl exec secrets -- gitea generate secret JWT_SECRET)"
-kubectl delete pod secrets
+    --from-literal=secret_key="$(kgseckey gitea secret_key || openssl rand -hex 32)" \
+    --from-literal=internal_token="$(kgseckey gitea internal_token || openssl rand -hex 32)" \
+    --from-literal=oauth2_jwt_secret="$(kgseckey gitea oauth2_jwt_secret || openssl rand -hex 32)"
 
 kcreatecm gitea \
     --from-file=app.ini=<(envsubst "$(env | xargs printf '$%s ')" < config/app.ini)
@@ -78,7 +75,6 @@ kapply common/job.yaml \
 kubectl rollout restart statefulset app
 
 kubectl wait --timeout=5m --for=condition=complete job/createadminuser
-sleep 5
 
 kcreatesec runner \
     --from-literal=token="$(kgseckey runner token || kubectl exec app-0 -- gitea actions generate-runner-token)"