Merge pull request #1103 from sillsdev/staging

Release 1.8.8

Author: megahirt

docker/deployment/Makefile

@@ -32,9 +32,9 @@ deploy-app-staging:
   | sed -e s/{{VERSION}}/$(VERSION)/ | kubectl apply -f -
 deploy-prod: deploy-db deploy-mail-prod deploy-app-prod
 deploy-mail-prod:
-	sed -e s/{{SERVER_HOSTNAME}}/beta.languageforge.org/ mail-deployment.yaml | kubectl apply -f -
+	sed -e s/{{SERVER_HOSTNAME}}/languageforge.org/ mail-deployment.yaml | kubectl apply -f -
 deploy-app-prod:
-	sed -e s/{{WEBSITE}}/beta.languageforge.org/ app-deployment.yaml \
+	sed -e s/{{WEBSITE}}/languageforge.org/ app-deployment.yaml \
   | sed -e s/{{VERSION}}/$(VERSION)/ | kubectl apply -f -
 deploy-db:
 	kubectl apply -f db-deployment.yaml

docker/deployment/db-deployment.yaml

@@ -39,6 +39,8 @@ spec:
   selector:
     matchLabels:
       app: db
+  strategy:
+      type: Recreate
   template:
     # https://kubernetes.io/docs/concepts/workloads/pods/#pod-templates
     metadata:

docker/deployment/scripts/kubeRsyncAssets.sh

@@ -5,6 +5,7 @@
 # -p 55555 this port is being forwarded to 22 on the container
 # -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" these are a hack to bypass security checks for "localhost".  localhost isn't a real host so I don't care about "host key verification failed" errors when doing localhost port forwarding
 
-USERANDHOSTNAME=user@hostname
-
-ssh -A -p 55555 -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" root@localhost "rsync -avzhP $USERANDHOSTNAME:/var/www/languageforge.org/htdocs/assets/lexicon/ /var/www/html/assets/lexicon/"
+USER=user
+HOSTNAME=hostname
+ssh -A -p 55555 -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" root@localhost "[ -f ~/.ssh/known_hosts ] || ssh-keyscan $HOSTNAME >> ~/.ssh/known_hosts"
+ssh -A -p 55555 -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" root@localhost "rsync -avzhP $USER@$HOSTNAME:/var/www/languageforge.org/htdocs/assets/lexicon/ /var/www/html/assets/lexicon/"

docker/deployment/scripts/kubeRsyncSendReceive.sh

@@ -5,6 +5,7 @@
 # -p 55555 this port is being forwarded to 22 on the container
 # -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" these are a hack to bypass security checks for "localhost".  localhost isn't a real host so I don't care about "host key verification failed" errors when doing localhost port forwarding
 
-USERANDHOSTNAME=user@hostname
-
-ssh -A -p 55555 -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" root@localhost "rsync -avzhP ${USERANDHOSTNAME}:/var/lib/languageforge/lexicon/ /var/lib/languageforge/lexicon/"
+USER=user
+HOSTNAME=hostname
+ssh -A -p 55555 -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" root@localhost "[ -f ~/.ssh/known_hosts ] || ssh-keyscan $HOSTNAME >> ~/.ssh/known_hosts"
+ssh -A -p 55555 -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" root@localhost "rsync -avzhP $USER@$HOSTNAME:/var/lib/languageforge/lexicon/ /var/lib/languageforge/lexicon/"

docker/deployment/scripts/kubeSetup.sh

@@ -13,13 +13,3 @@ kubectl exec -c app $APPPOD -- bash -c "apt-get update \
 # add my public key to the container so I can "ssh root@localhost"
 # --no-preserve=true keeps the permissions intact for root on the container side
 kubectl cp -c app ~/.ssh/authorized_keys $APPPOD:/root/.ssh/authorized_keys --no-preserve=true
-
-echo Installing SSH on pod $MONGOPOD
-kubectl exec -c db $MONGOPOD -- bash -c "apt-get update \
-&& apt-get install -y openssh-server openssh-client rsync \
-&& mkdir -p -m 700 /root/.ssh \
-&& service ssh start"
-
-# add my public key to the container so I can "ssh root@localhost"
-# --no-preserve=true keeps the permissions intact for root on the container side
-kubectl cp -c db ~/.ssh/authorized_keys $MONGOPOD:/root/.ssh/authorized_keys --no-preserve=true

docker/deployment/scripts/kubeRsyncMongo.sh renamed to docker/deployment/scripts/kubeSyncMongo.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 echo Mongo Dump
 ssh mongo-xf mongodump
 
@@ -12,10 +14,6 @@ ssh mongo-xf tar -czvf mongodump.tgz dump
 echo Copy tar file to local filesystem
 scp mongo-xf:mongodump.tgz .
 
-echo Clean up on remote
-ssh mongo-xf rm -r dump
-ssh mongo-xf rm mongodump.tgz
-
 MONGOPOD=$(kubectl get pods --selector='app=db' -o name | sed -e s'/pod\///')
 
 echo Copying mongodump.tgz into $MONGOPOD/data/db
@@ -29,9 +27,15 @@ echo MongoRestore
 kubectl exec -c db $MONGOPOD -- bash -c "cd /data/db \
     && mongorestore --drop dump"
 
-echo Clean Up
-kubectl exec -c db $MONGOPOD -- bash -c "rm -r /data/db/dump && rm /data/db/mongodump.tgz"
-rm mongodump.tgz
-
 echo Run Mongo migration
 kubectl exec -c db $MONGOPOD -- bash -c 'mongo scriptureforge --eval "db.projects.updateMany({}, {"\$unset": {userProperties: 1}});"'
+
+echo Clean up on mongo-xf remote
+ssh mongo-xf rm -r dump
+ssh mongo-xf rm mongodump.tgz
+
+echo Clean up on lf-mongo-data volume
+kubectl exec -c db $MONGOPOD -- bash -c "rm -r /data/db/dump && rm /data/db/mongodump.tgz"
+
+echo Clean up local tarball
+rm mongodump.tgz