solution

.infrastructure/confgiMap.yml

@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: todoapp-config
+  namespace: mateapp
+data:
+  PYTHONUNBUFFERED: "1"

.infrastructure/deployment.yml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: todoapp
-  namespace: todoapp
+  namespace: mateapp
 spec:
   strategy:
     type: RollingUpdate
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
       - name: todoapp
-        image: ikulyk404/todoapp:3.0.0
+        image: andr1yk/todoapp:3.1.0
         resources:
           requests:
             memory: "256Mi"
@@ -29,7 +29,15 @@ spec:
             cpu: "150m"
         env:
         - name: PYTHONUNBUFFERED
-          value: "1"
+          valueFrom:
+            configMapKeyRef:
+              name: todoapp-config
+              key: PYTHONUNBUFFERED
+        - name: SECRET_KEY
+          valueFrom:
+            secretKeyRef:
+              name: todoapp-secret
+              key: SECRET_KEY
         ports:
         - containerPort: 8080
         livenessProbe:

.infrastructure/secret.yml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: todoapp-secret
+  namespace: mateapp
+type: Opaque
+data:
+  SECRET_KEY: "QGUyKHl4KXYmdGdoM19zPTB5amEtaSFkcGVieHN6XmRnNDd4KS1rJmtxXzN6Zio5ZSo="

README.md

@@ -44,3 +44,37 @@ Create a kubernetes manifest for a pod which will containa ToDo app container:
 1. `README.md` should have commands to apply all the changes
 1. `README.md` should have instructuions on how to validate the changes
 1. Create PR with your changes and attach it for validation on a platform.
+
+## How to apply changes
+
+```bash
+kubectl apply -f .infrasctructure/configMap.yml
+kubectl apply -f .infrasctructure/secret.yml
+kubectl apply -f .infrasctructure/deployment.yml
+```
+
+## How to validate changes
+
+Check if ConfigMap and Secret were created:
+
+```bash
+kubectl get configmap todoapp-config -o jsonpath='{.data.PYTHONUNBUFFERED}'
+kubectl get secret todoapp-secret -o jsonpath='{.data.SECRET_KEY}'
+```
+
+Check environment variables in the deployment:
+
+```bash
+kubectl exec -it deployment/todoapp -- env | grep PYTHONUNBUFFERED
+kubectl exec -it deployment/todoapp -- env | grep SECRET_KEY
+```
+
+Check if application is working:
+
+```bash
+kubectl port-forward deployment/todoapp 8080:8080
+```
+
+And then open http://localhost:8080/ in your browser.
+
+

src/todolist/settings.py

@@ -18,7 +18,7 @@
 # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
 
 # SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = "@e2(yx)v&tgh3_s=0yja-i!dpebxsz^dg47x)-k&kq_3zf*9e*"
+SECRET_KEY = os.environ.get("SECRET_KEY", None)
 
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True