From 659aae57f351d3c977eaa8b4655c2e4d5cd94fed Mon Sep 17 00:00:00 2001
From: ducoterra <ducoterra@gmail.com>
Date: Sat, 13 Jun 2020 09:53:25 -0400
Subject: [PATCH] fix adding users who supply their own key

---
 adduser.sh          |  2 ++
 certsigner/pod.yaml | 12 ++++++------
 certsigner/pvc.yaml | 11 -----------
 createuserspace.sh  |  4 +---
 4 files changed, 9 insertions(+), 20 deletions(-)
 create mode 100644 adduser.sh
 delete mode 100644 certsigner/pvc.yaml

diff --git a/adduser.sh b/adduser.sh
new file mode 100644
index 0000000..3b757f2
--- /dev/null
+++ b/adduser.sh
@@ -0,0 +1,2 @@
+kubectl config set-credentials $USER --client-certificate=$HOME/.kube/users/$USER/$USER.crt  --client-key=$HOME/.kube/users/$USER/$USER.key
+kubectl config set-context $USER --cluster=mainframe --namespace=kube-system --user=$USER
diff --git a/certsigner/pod.yaml b/certsigner/pod.yaml
index 27f97ff..f0c6972 100644
--- a/certsigner/pod.yaml
+++ b/certsigner/pod.yaml
@@ -17,15 +17,15 @@ spec:
         memory: 100Mi
         cpu: 100m
     volumeMounts:
-      - mountPath: /certs
-        name: certs
       - mountPath: /keys
         name: keys
+      - mountPath: /certs
+        name: certs
   volumes:
-    - name: certs
-      persistentVolumeClaim:
-        claimName: certsigner-certs
     - name: keys
       secret:
-        secretName: certsigner
+        secretName: certs
+    - name: certs
+      emptyDir: {}
+
   restartPolicy: Always
\ No newline at end of file
diff --git a/certsigner/pvc.yaml b/certsigner/pvc.yaml
deleted file mode 100644
index dae645c..0000000
--- a/certsigner/pvc.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: certsigner-certs
-  namespace: kube-system
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 1Gi
\ No newline at end of file
diff --git a/createuserspace.sh b/createuserspace.sh
index 96732ba..efe5359 100755
--- a/createuserspace.sh
+++ b/createuserspace.sh
@@ -4,6 +4,4 @@ export USER=$1
 helm template $USER ./namespace | kubectl --context admin apply -f -
 kubectl --context admin cp $HOME/.kube/users/$USER/$USER.csr certsigner:/certs/$USER.csr
 kubectl --context admin exec --context admin certsigner -- openssl x509 -in /certs/$USER.csr -req -CA /keys/client-ca.crt -CAkey /keys/client-ca.key -set_serial $(python -c "import random; print(random.randint(1000000000, 9999999999))") -out /certs/$USER.crt -days 5000
-kubectl --context admin cp certsigner:/certs/$USER.crt $HOME/.kube/users/$USER/$USER.crt
-kubectl config set-credentials $USER --client-certificate=$HOME/.kube/users/$USER/$USER.crt  --client-key=$HOME/.kube/users/$USER/$USER.key
-kubectl config set-context $USER --cluster=mainframe --namespace=kube-system --user=$USER
+kubectl --context admin cp certsigner:/certs/$USER.crt $HOME/.kube/users/$USER/$USER.crt
\ No newline at end of file