From 9bc48ecb2434a1e4e3225916a334f380553fee4b Mon Sep 17 00:00:00 2001
From: Moritz Graf <github@moritzgraf.de>
Date: Sun, 3 Apr 2022 16:26:52 +0200
Subject: [PATCH] Updating openebs & switching to bitnami minio chart

---
 .gitattributes               |   3 ++-
 k8s/README.md                |  29 ++++++++++++++++++++++++++---
 k8s/minio/minio.secret.yaml  | Bin 595 -> 445 bytes
 k8s/octobot/deployment.yaml  |  33 ++++++++++++++-------------------
 k8s/openebs/openebs.yml      |   2 +-
 k8s/openebs/storageclass.yml |   4 ++++
 6 files changed, 47 insertions(+), 24 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 4cdf503..07ef734 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,4 @@
 *.secret filter=git-crypt diff=git-crypt
 *.secret.yaml filter=git-crypt diff=git-crypt
-*.secret.values filter=git-crypt diff=git-crypt
\ No newline at end of file
+*.secret.values filter=git-crypt diff=git-crypt
+*.secret.sh filter=git-crypt diff=git-crypt
\ No newline at end of file
diff --git a/k8s/README.md b/k8s/README.md
index 2b3cac0..c79e089 100644
--- a/k8s/README.md
+++ b/k8s/README.md
@@ -69,12 +69,23 @@ helm upgrade --install --create-namespace -f openebs/openebs.yml openebs --names
 k apply -f openebs/storageclass.yml
 ```
 
+## minio (bitnami)
+
+Switching to [Bitnami chart](https://artifacthub.io/packages/helm/bitnami/minio) as "normal" chart just too big.
+
+```sh
+helm repo update
+helm upgrade --install -f minio/minio.secret.yaml --namespace minio --create-namespace minio bitnami/minio
+```
+
 ## minio
 
+**DEPRECATED - INSTALL WITH OPERATOR**
+
 See [chart on GitHub](https://github.com/minio/charts/tree/master/minio).
 
 ```sh
-helm repo add minio https://helm.min.io/
+helm repo add minio https://charts.min.io/
 helm repo update
 helm upgrade --install -f minio/minio.secret.yaml --namespace minio --create-namespace minio minio/minio
 # #
@@ -328,12 +339,24 @@ Deployment instructions for [Octobot](https://github.com/Drakkar-Software/OctoBo
 
 ```sh
 kubectl create ns octobot
-helm repo add dex https://charts.dexidp.io
+helm repo add oauth2-proxy https://oauth2-proxy.github.io/manifests
 helm repo update
-helm upgrade --install -n octobot dex-octobot dex/dex -f ./octobot/dex.secret.values
+helm upgrade --install -n octobot oauth2-octobot oauth2-proxy/oauth2-proxy -f ./octobot/oauth2.secret.values
 kubectl apply $(ls octobot/*.yaml | awk ' { print " -f " $1 } ')
 ```
 
+## octobot-fabi
+
+Deployment instructions for [Octobot](https://github.com/Drakkar-Software/OctoBot). Dex is used for authenticating.
+
+```sh
+kubectl create ns octobot-fabi
+helm repo add oauth2-proxy https://oauth2-proxy.github.io/manifests
+helm repo update
+helm upgrade --install -n octobot-fabi oauth2-octobot oauth2-proxy/oauth2-proxy -f ./octobot-fabi/oauth2.secret.values
+kubectl apply $(ls octobot-fabi/*.yaml | awk ' { print " -f " $1 } ')
+```
+
 ## nextcloud
 
 [Chart GitHub](https://github.com/nextcloud/helm/tree/master/charts/nextcloud)
diff --git a/k8s/minio/minio.secret.yaml b/k8s/minio/minio.secret.yaml
index 902dd9cb33e9668e3889522858fc8c8f603529cd..17f41521381bc9440b9d5e6be062df7373b26e7f 100644
GIT binary patch
literal 445
zcmV;u0Yd%&M@dveQdv+`0L7u6pMlvr#{i(atnrS--k-LAH0*K*aeRzZrRb?1Ob+Jx
zNUvUK21eqx{@BURqGH@VbcdImmGIz2>!hWu;hdt3{nlLRe4Iwa_7*r`&=>kvwAZb8
zgB!nawv=t>kT`ud%2|X>c!ICI>j{PDRQ9k4iZ@2K`Jo?>s%u0Zg%W%%E+Zn?h8%`4
zl>WLc0z*YntlvvYzm;X5ZeBvo+Y8nhPGYz`37CDMs0iwg;3YEmNZpRl4d@Se^4{l#
z`5_5(n>ZeJP5p{JtMlsUXxFG-8LuTLwlVE@9k=iuZ};`aw&d+_-}?@|@`ezI&H0(|
zZ50xD*xk!X0_|{!FfE}R3{PeS0d+`K0<$Jp00*1*RwDafXMYq&<Q*H#_<5{4!M|j;
zJWMC99t|KbTTGy14J7icZ`F|EOBJ|MNQ_^nkTV&Eo}%yb|9$s)?+zJO-L;eN+Jh(+
z?RK8HMr4lq)7pKCQ$;${Vprsx#N&Gz_Oz16jw9<pGZotYt_AbL2gNsNo2r_9=3a~g
nWi|6Zxjg(5AS(N&=EpCnpNz#BBEo1Ir^}BF&MXR3*Zf9=SXbib

literal 595
zcmV-Z0<8T2M@dveQdv+`00_6H*nIUPPA$I6#!dmO+d8YT{{(?ODr*hu#{Wx-C59%y
z{cQtF`)r*^PQMJgJ$dXq(`R47+8{xt1&8?wCm7w?-dk@PD*cpy%QIL|6Vejd6hP09
zARIL+mNd8ABS6eqkuMQ!)pc#j1T+ksp@svaDWhQdt?aS70gVH?yvOIh%0R=v?PM2%
zCy0^hAh3!i2qLXYA(7578rozTA_*Mv`<Q4TFq}T;-TGYR<<wj=lp&_m9A$7i4CV6%
z;O3?H7}H1cce%sOYMy`q=qVWJbwe$kxvR!YZ;u#XBwN8^cJH}`wI=7GZjt!jj$XmE
z_d29PX&8uQu6T@8@H*6Y;`{_i5r$+UK1#?%_OEZ1;a!zs<nWPrb6J6CUKth=3g(W<
zEs<}CzNHD&FM<|E6eerI%ma@~EWwgcHULI9q6`D+pRWWGlzOay0`t6g$TD?npH~Nq
z=*IO>o*`|hfgy}LCRR>Nm#=I;+=)RH8fWcx`6vm;<>JfG>A(I?y4i@mI<vHD%|UWk
z+adgD3>NdlVYA)EgLhTUi7q`@z_q%>@B?<JU6|48R@N|&OC+Mr6BJBmW-9O|B7$Ho
zmP{Flp|$WNQdrk?dN5euK`O@(l~_khMt}WseY@>8HpRg%_;P<rI2Q)`=wX8d7*8Jd
zhtADay{K{%&X;VY@<22-jTxr#CSS67*GLR~HFamO5PI>U)Ly15hg}pK&8QblQ7m!z
h<r~pzdD;FodSokj##?nUagq}8bV1^$77HqoEmqax9Gd_D

diff --git a/k8s/octobot/deployment.yaml b/k8s/octobot/deployment.yaml
index 6c4865d..ac3cff6 100644
--- a/k8s/octobot/deployment.yaml
+++ b/k8s/octobot/deployment.yaml
@@ -25,14 +25,10 @@ spec:
           limits:
             cpu: "1"
             memory: "800Mi"
-        # args:
-        # - --cert-dir=/tmp
-        # - --secure-port=4443
-        # - --kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname
-        # - --kubelet-use-node-status-port
-        # - --kubelet-preferred-address-types=InternalIP
-        # - --v=2
-        # - --kubelet-insecure-tls
+        # # To make manual configurations on the container
+        # command:
+        #   - "sleep"
+        #   - "9999"
         image: drakkarsoftware/octobot:stable
         imagePullPolicy: Always
         # livenessProbe:
@@ -55,7 +51,7 @@ spec:
         #     scheme: HTTPS
         #   periodSeconds: 10
         # securityContext:
-        #   readOnlyRootFilesystem: true
+        #   #readOnlyRootFilesystem: true
         #   runAsNonRoot: true
         #   runAsUser: 1000
         volumeMounts:
@@ -66,18 +62,17 @@ spec:
           name: user
         - mountPath: /octobot/tentacles
           name: tentacles
-        # - mountPath: /octobot/logs
-        #   name: logs
+        - mountPath: /octobot/logs
+          name: logs
       nodeSelector:
         kubernetes.io/os: linux
       # serviceAccountName: metrics-server
       volumes:
-      # - name: octobot-config
-      #   configMap:
-      #     name: octobot-config
+      - name: user
+        persistentVolumeClaim:
+          claimName: octobot-user
+      - name: tentacles
+        persistentVolumeClaim:
+          claimName: octobot-tentacles
       - emptyDir: {}
-        name: user
-      - emptyDir: {}
-        name: tentacles
-      # - emptyDir: {}
-      #   name: logs
\ No newline at end of file
+        name: logs
\ No newline at end of file
diff --git a/k8s/openebs/openebs.yml b/k8s/openebs/openebs.yml
index e215910..78247bc 100644
--- a/k8s/openebs/openebs.yml
+++ b/k8s/openebs/openebs.yml
@@ -6,7 +6,7 @@ analytics:
 ndmOperator:
   enabled: false
 ndm:
-  enabled: false
+  enabled: true
 snapshotOperator:
   enabled: true
 webhook:
diff --git a/k8s/openebs/storageclass.yml b/k8s/openebs/storageclass.yml
index e7a94c5..feebef2 100644
--- a/k8s/openebs/storageclass.yml
+++ b/k8s/openebs/storageclass.yml
@@ -2,10 +2,14 @@ apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
   annotations:
+    meta.helm.sh/release-name: openebs 
+    meta.helm.sh/release-namespace: openebs
     cas.openebs.io/config: "- name: StorageType\n  value: \"hostpath\"\n- name: BasePath\n
       \ value: /var/openebs/local \n"
     openebs.io/cas-type: local
     storageclass.kubernetes.io/is-default-class: "true"
+  labels:
+    app.kubernetes.io/managed-by: "Helm"
   name: openebs-hostpath
 provisioner: openebs.io/local
 reclaimPolicy: Delete