redirect to secure site, since it's supported

eindopdracht/azure/kubernetes/api.yaml

@@ -17,16 +17,17 @@ spec:
       containers:
       - name: api-container
         image: 4grxfq/api
+        imagePullPolicy: Always
         ports:
         - containerPort: 5001
           name: api-port
         env:
           - name: OPENID_SECRET
-            value: CHANGEME
+            value:
           - name: DNS_SERVER
-            value: "IP"
+            value: dnsns.mashallah.nl
           - name: MONGO_CONNECTIONSTRING
-            value: CHANGEME
+            value:
 ---
 apiVersion: v1
 kind: Service
@@ -36,7 +37,27 @@ metadata:
     run: api-service
 spec:
   ports:
-  - port: 5001
+  - port: 80
+    targetPort: 5001
     protocol: TCP
   selector:
     app: api-deployment
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: api-ingress
+  annotations:
+    kubernetes.io/ingress.class: addon-http-application-routing
+spec:
+  rules:
+  - host: dnsapi.mashallah.nl
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: api-service
+            port:
+              number: 80

eindopdracht/azure/kubernetes/gui.yaml

@@ -17,16 +17,17 @@ spec:
       containers:
       - name: gui-container
         image: 4grxfq/gui
+        imagePullPolicy: Always
         ports:
         - containerPort: 5000
           name: gui-port
         env:
           - name: OPENID_SECRET
-            value: CHANGEME
+            value:
           - name: DNS_API
-            value: "http://api:5001"
+            value: http://api-service:80
           - name: MONGO_CONNECTIONSTRING
-            value: CHANGEME
+            value:
 ---
 apiVersion: v1
 kind: Service
@@ -36,7 +37,27 @@ metadata:
     run: gui-service
 spec:
   ports:
-  - port: 5000
+  - port: 80
+    targetPort: 5000
     protocol: TCP
   selector:
     app: gui-deployment
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: gui-ingress
+  annotations:
+    kubernetes.io/ingress.class: addon-http-application-routing
+spec:
+  rules:
+  - host: dnsgui.mashallah.nl
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: gui-service
+            port:
+              number: 80

eindopdracht/dns_api/Dockerfile

@@ -6,5 +6,6 @@ RUN pip install --no-cache-dir -r /app/requirements.txt
 COPY openid.py /app/
 COPY dnszone.py /app/
 COPY openid.py /app/
+COPY mango.py /app
 COPY api.py /app/
 CMD ["python3", "/app/api.py"]

eindopdracht/dns_api/openid.py

@@ -14,7 +14,7 @@ class GoogleOID:
 
         self.settings = {'client_id': '954325872153-1v466clrtgg6h4ptt2ne5pgpb9mhilr5.apps.googleusercontent.com',
                          'client_secret': client_secret,
-                         'callback_uri': 'http://dnsdash.mashallah.nl:5000/login/gcp/callback',
+                         'callback_uri': 'https://dnsgui.mashallah.nl/login/gcp/callback',
                          'key_server': 'https://www.googleapis.com/oauth2/v3/certs'}  # global oid settings
 
     def settings(self):  # make it so that the settings variable is callable

eindopdracht/dns_gui/openid.py

@@ -14,7 +14,7 @@ class GoogleOID:
 
         self.settings = {'client_id': '954325872153-1v466clrtgg6h4ptt2ne5pgpb9mhilr5.apps.googleusercontent.com',
                          'client_secret': client_secret,
-                         'callback_uri': 'http://dnsdash.mashallah.nl:5000/login/gcp/callback',
+                         'callback_uri': 'https://dnsgui.mashallah.nl/login/gcp/callback',
                          'key_server': 'https://www.googleapis.com/oauth2/v3/certs'}  # global oid settings
 
     def settings(self):  # make it so that the settings variable is callable