From d5a98dcfcd992d73c512d9d1b77576db65448fe1 Mon Sep 17 00:00:00 2001
From: ducoterra <ducoterra@gmail.com>
Date: Mon, 25 Jan 2021 19:27:48 -0500
Subject: [PATCH] createuserspace

---
 README.md                              | 16 +++-------------
 createuser.sh                          |  5 -----
 namespace/templates/resourcequota.yaml | 12 ++++--------
 3 files changed, 7 insertions(+), 26 deletions(-)
 delete mode 100755 createuser.sh

diff --git a/README.md b/README.md
index c00e7d3..d47a82a 100644
--- a/README.md
+++ b/README.md
@@ -4,21 +4,11 @@
 
 ### Quickstart
 
-```bash
-kubectl -n kube-system create secret generic certsigner --from-file /var/lib/rancher/k3s/server/tls/client-ca.crt --from-file /var/lib/rancher/k3s/server/tls/client-ca.key
-kubectl apply -f cluster
-kubectl apply -f certsigner
-./adduser.sh tester
-./userspace.sh tester
-```
+1. Start Docker
+2. Run createuserspace.sh
 
 ```bash
-export USER=$1
-openssl req -in $HOME/.kube/users/$USER/$USER.csr -noout -text
-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
+./createuserspace.sh <username> <server_fqdn>
 ```
 
 ### Update a user
diff --git a/createuser.sh b/createuser.sh
deleted file mode 100755
index 816fae0..0000000
--- a/createuser.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-export USER=$1
-docker run -it -v $HOME/.kube/users/$USER:/$USER python:latest openssl genrsa -out /$USER/$USER.key 2048
-docker run -it -v $HOME/.kube/users/$USER:/$USER python:latest openssl req -new -key /$USER/$USER.key -out /$USER/$USER.csr -subj "/CN=$USER/O=user"
\ No newline at end of file
diff --git a/namespace/templates/resourcequota.yaml b/namespace/templates/resourcequota.yaml
index 6c41854..0fa1020 100644
--- a/namespace/templates/resourcequota.yaml
+++ b/namespace/templates/resourcequota.yaml
@@ -5,11 +5,7 @@ metadata:
   namespace: {{ .Release.Name }}
 spec:
   hard:
-    requests.cpu: "12"
-    requests.memory: "24G"
-    limits.cpu: "48"
-    limits.memory: "64G"
-    nvme.storageclass.storage.k8s.io/persistentvolumeclaims: "0"
-    nvme.storageclass.storage.k8s.io/requests.storage: 0Gi
-    external-ssd.storageclass.storage.k8s.io/persistentvolumeclaims: "0"
-    external-ssd.storageclass.storage.k8s.io/requests.storage: 0Mi
\ No newline at end of file
+    requests.cpu: "1"
+    requests.memory: "4Gi"
+    limits.cpu: "12"
+    limits.memory: "12G"
\ No newline at end of file