From fd852282eeda7788c555373e56fe6baf48ff327c Mon Sep 17 00:00:00 2001
From: Christine Dodrill <me@christine.website>
Date: Sat, 7 Sep 2019 11:50:47 -0400
Subject: [PATCH] Update kubernetes-cd.yml

---
 .github/workflows/kubernetes-cd.yml | 63 +++++++++++++++++------------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/kubernetes-cd.yml b/.github/workflows/kubernetes-cd.yml
index 0c440fa..dc2db99 100644
--- a/.github/workflows/kubernetes-cd.yml
+++ b/.github/workflows/kubernetes-cd.yml
@@ -8,40 +8,53 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-    - name: Build Docker Image
+    - name: Build/Push Docker Image
       run: |
         docker build . -t xena/christine.website:$(echo $GITHUB_SHA | head -c7)
-    - name: Setup Docker Hub
-      run: |
         mkdir -p ~/.docker && echo $DOCKER_CONFIG > ~/.docker/config
-    - name: Push Docker Image
-      run: |
         docker push xena/christine.website:$(echo $GITHUB_SHA | head -c7)
-    - name: Setup SSH
-      run: mkdir ~/.ssh
-    - name: Write SSH Key
-      run: echo $FILE_DATA > temp && cat temp | base64 -d > ~/.ssh/id_rsa && rm temp && md5sum ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa
+      env:
+        DOCKER_CONFIG: "$${ secrets.DOCKER_CONFIG }"
+    - name: Download secrets
+      run: |
+        mkdir ~/.ssh
+        echo $FILE_DATA > temp
+        cat temp | base64 -d > ~/.ssh/id_rsa
+        rm temp 
+        md5sum ~/.ssh/id_rsa 
+        chmod 600 ~/.ssh/id_rsa
+        git clone git@git.xeserv.us:xena/within-terraform-secret
       env:
         FILE_DATA: ${{ secrets.SSH_PRIVATE_KEY }}
-    - name: Download secrets
-      run: git clone git@git.xeserv.us:xena/within-terraform-secret
-      env:
         GIT_SSH_COMMAND: "ssh -i ~/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-    - name: Install Dyson
+    - name: Install/Configure/Use Dyson
       run: |
-        curl https://xena.greedo.xeserv.us/files/dyson-linux-amd64-0.1.0.tgz | tar xz && cp ./dyson-linux-amd64-0.1.0/dyson .
-    - name: Configure Dyson
-      run: |
-        mkdir ~/.config/dyson && echo '[DigitalOcean]\nToken = ""\n\n[Cloudflare]\nEmail = ""\nToken = ""\n\n[Secrets]\nGitCheckout = "./within-terraform-secret"' > ~/.config/dyson/dyson.ini
-    - name: Generate Kubernetes manifest
-      run: |
-        dyson manifest --name=christinewebsite --domain=christine.website --dockerImage=xena/christine.website:$(echo $GITHUB_SHA | head -c7) --containerPort=5000 --replicas=1 --useProdLE=true > deploy.yml
+        curl https://xena.greedo.xeserv.us/files/dyson-linux-amd64-0.1.0.tgz | tar xz 
+        cp ./dyson-linux-amd64-0.1.0/dyson .
+        rm -rf dyson-linux-amd64-0.1.0
+        mkdir ~/.config/dyson 
+        echo '[DigitalOcean]
+        Token = ""
+        
+        [Cloudflare]
+        Email = ""
+        Token = ""
+        
+        [Secrets]
+        GitCheckout = "./within-terraform-secret"' > ~/.config/dyson/dyson.ini
+        dyson manifest \
+          --name=christinewebsite \
+          --domain=christine.website \
+          --dockerImage=xena/christine.website:$(echo $GITHUB_SHA | head -c7) \
+          --containerPort=5000 \
+          --replicas=1 \
+          --useProdLE=true > deploy.yml
     - name: Configure Kubernetes
       uses: digitalocean/action-doctl@v1.3.0
-      run: kubernetes cluster kubeconfig show kubermemes > $HOME/.kubeconfig
+      run: |
+        doctl kubernetes cluster kubeconfig show kubermemes > $HOME/.kubeconfig
     - name: Deploy
       uses: docker://lachlanevenson/k8s-kubectl
-      run: kubectl --kubeconfig=$HOME/.kubeconfig apply -f deploy.yml
-    - name: Verify
-      uses: docker://lachlanevenson/k8s-kubectl
-      run: kubectl --kubeconfig=$HOME/.kubeconfig rollout status deployment/christinewebsite
+      run: |
+        kubectl --kubeconfig=$HOME/.kubeconfig apply -f deploy.yml
+        kubectl --kubeconfig=$HOME/.kubeconfig rollout status deployment/christinewebsite