refactoring

banderlog · Dec 30, 2021 · a275009 · a275009
1 parent 5de2c93
commit a275009
Show file tree

Hide file tree

Showing 26 changed files with 59 additions and 398 deletions.
diff --git a/README.md b/README.md
@@ -2,23 +2,38 @@
 
 ![globohomo art style](pic/header.png)
 
-Powered with cutting edge *Foretold Termination™* technology, famous "less than 10 seconds" calculator on kubernetes.
-*Foretold Termination™* technology saves time on container unload.
+Powered with cutting edge *Foretold Termination™* technology (saves time on container unload), famous "less than 10 seconds" calculator on kubernetes.
 
->Deploying applications to Kubernetes is not a straightforward process
 
-### Cluster creation with `kind`
+## Prerequisites
+
++ [docker](https://docs.docker.com/engine/install/ubuntu/)
++ [kind](https://kind.sigs.k8s.io/docs/user/quick-start/#installation) (or any other k8s cluster)
++ [kubectl](https://kubernetes.io/docs/tasks/tools/)
++ [helm](https://helm.sh/docs/intro/install/)
+
+
+## Installation and usage
 
 ```
+# cluster creation with `kind`
 kind create cluster --config=./kind.yaml
+
+# installlation
+helm install k8-calc k8-calc/
+
+# verification -- should output "69"
+curl http://localhost:30000/
 ```
 
-### Folders
+For different calculation *simply* run `kubectl edit configmap calculateme-configmap` and change `calculateme: 60+9` line.
+
+Run `kind delete cluster` to remove everything.
+
 
-**NB:** each folder has it's own README.md
+## How it works
 
-+ arraysurfer -- k8s version with init pod
-+ bc_container -- from scratch docker container for calculations
-+ compose -- docker compose version
-+ k8-calc -- help chart ready folder of k8s folder
-+ k8s -- k8s version with reloader and nginx
+- There is env string variable `calculateme` defined in the ConfigMap
+- A [busybox](https://busybox.net/) pod runs it through [bc](https://www.gnu.org/software/bc/), writes an answer to a file in the mounted volume and dies
+- A [nginx](https://www.nginx.com/) pod mounts this file as index.html, so it is accessible via an HTTP request
+- The [Reloader](https://github.com/stakater/Reloader) watches ConfigMap and restarts busybox pod if it changed
diff --git a/TODO.md b/TODO.md
diff --git a/arraysurfer/README.md b/arraysurfer/README.md
diff --git a/arraysurfer/calc-vars.yaml b/arraysurfer/calc-vars.yaml
diff --git a/arraysurfer/calculation.yaml b/arraysurfer/calculation.yaml
diff --git a/bc_container/Dockerfile b/bc_container/Dockerfile
diff --git a/bc_container/Makefile b/bc_container/Makefile
diff --git a/bc_container/README.md b/bc_container/README.md
diff --git a/bc_container/prepare_bc.sh b/bc_container/prepare_bc.sh
diff --git a/compose/Makefile b/compose/Makefile
diff --git a/compose/README.md b/compose/README.md
diff --git a/compose/compose-bc.yml b/compose/compose-bc.yml
diff --git a/compose/compose-busybox.yml b/compose/compose-busybox.yml
diff --git a/compose/compose.env b/compose/compose.env
diff --git a/k8-calc/Chart.yaml b/k8-calc/Chart.yaml
@@ -1,27 +1,9 @@
 apiVersion: v2
 name: k8_calc
-description: A Helm chart for Kubernetes
-
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
+description: https://github.com/banderlog/k8s_calc
 type: application
-
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
 version: 0.1.0
-
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
-appVersion: "1.16.0"
+appVersion: "1.0.0"
 
 dependencies:
   - name: reloader

diff --git a/k8-calc/README.md b/k8-calc/README.md
diff --git a/k8-calc/templates/bc-deployment.yaml b/k8-calc/templates/bc-deployment.yaml
@@ -8,8 +8,6 @@ metadata:
   name: bc
 spec:
   replicas: 1
-  # strategy:
-    # type: Recreate
   selector:
     matchLabels:
       app: bc
@@ -18,25 +16,21 @@ spec:
       labels:
         app: bc
     spec:
-      # https://stackoverflow.com/questions/63400156/configure-restart-policy-of-pod-from-deployment-config
-      # restartPolicy: Never
       containers:
-        - name: bc
-          image: busybox
-          command: ['sh']
-          # args: ["-c", "echo WOLOLO; echo ${INPUT} | bc  > '/tmp/index.html' && ping 8.8.8.8"]
-          args: ["-c", "echo WOLOLO; echo ${INPUT} | bc -l > '/tmp/index.html'"]
-          env:
-            - name: INPUT
-              valueFrom:
-                  configMapKeyRef:
-                      name: calculateme-configmap
-                      key: calculateme
-          volumeMounts:
-            - mountPath: /tmp
-              name: exch-vol
-      restartPolicy: Always
+      - name: bc
+        image: busybox
+        env:
+        - name: INPUT
+          valueFrom:
+            configMapKeyRef:
+              name: calculateme-configmap
+              key: calculateme
+        command: ['sh']
+        args: ["-c", "echo ${INPUT} | bc -l > '/tmp/index.html'"]
+        volumeMounts:
+        - mountPath: /tmp
+          name: exch-vol
       volumes:
-        - name: exch-vol
-          persistentVolumeClaim:
-            claimName: exch-vol
+      - name: exch-vol
+        persistentVolumeClaim:
+          claimName: exch-vol
diff --git a/k8-calc/templates/exch-vol-persistentvolumeclaim.yaml b/k8-calc/templates/exch-vol-persistentvolumeclaim.yaml
@@ -7,7 +7,7 @@ metadata:
   name: exch-vol
 spec:
   accessModes:
-    - ReadWriteOnce
+  - ReadWriteOnce
   resources:
     requests:
       storage: 1Mi
diff --git a/k8-calc/templates/http-output-deployment.yaml b/k8-calc/templates/http-output-deployment.yaml
@@ -15,17 +15,15 @@ spec:
         app: output
     spec:
       containers:
-        - name: output
-          image: nginx
-          # command: ['sh']
-          # args: ["-c", "cat /tmp/out.txt > /usr/share/nginx/html/index.html && ping 8.8.8.8"]
-          volumeMounts:
-            - mountPath: /usr/share/nginx/html/
-              name: exch-vol
+      - name: output
+        image: nginx
+        volumeMounts:
+        - mountPath: /usr/share/nginx/html/
+          name: exch-vol
       volumes:
-        - name: exch-vol
-          persistentVolumeClaim:
-            claimName: exch-vol
+      - name: exch-vol
+        persistentVolumeClaim:
+          claimName: exch-vol
 ---
 apiVersion: v1
 kind: Service
@@ -36,7 +34,7 @@ spec:
   selector:
     app: output
   ports:
-    - protocol: TCP
-      port: 80
-      targetPort: 80
-      nodePort: 32000
+  - protocol: TCP
+    port: 80
+    targetPort: 80
+    nodePort: 32000
diff --git a/k8s/README.md b/k8s/README.md