Modify status page ingress.

.gitignore

@@ -24,7 +24,6 @@ yarn-error.log*
 
 yarn.lock
 Untitled-1
-cleanup.sh
 *.local.sh
 *.local.yaml
 

ci/scripts/cleanup.sh

@@ -0,0 +1,24 @@
+#
+echo "Running Cleanup Script..."
+# Stop microk8s VM
+echo "Stopping microk8s..."
+# Delete microk8s cluster so it can be fresh for next job. 
+echo "Delete microk8s Cluster..."
+echo "RUNNING COMMAND:  sudo usermod -a -G microk8s $USER"
+sudo usermod -a -G microk8s $USER || echo "microk8s group not found"
+echo "RUNNING COMMAND: microk8s.reset || 'microk8s cannot delete'"
+microk8s.reset || 'microk8s cannot delete'
+echo "RUNNING COMMAND: microk8s.stop || 'microk8s cannot Stop'"
+microk8s.stop || "microk8s cannot Stop"
+echo "RUNNING COMMAND: sudo snap remove microk8s || 'microk8s cannot be removed.'"
+sudo snap remove microk8s || 'microk8s cannot be removed.'
+# Stop all docker containers
+echo "Stop and Delete all docker containers..."
+echo "RUNNING COMMAND: sudo docker stop \$(sudo docker ps -aq) || echo 'No docker containers'"
+sudo docker stop $(sudo docker ps -aq) || echo 'No docker containers'
+# Remove all docker containers.
+echo "RUNNING COMMAND: sudo docker rm \$(sudo docker ps -aq) || echo 'No docker containers'"
+sudo docker rm $(sudo docker ps -aq) || echo 'No docker containers'
+# Delete all locally built images. (Comment this out to reduce build times)
+# echo "RUNNING COMMAND: sudo docker rmi -f \$(sudo docker images -q) || echo 'No docker containers'"
+# sudo docker rmi -f $(sudo docker images -q) || echo 'No docker containers'

helm-chart/public/fyipe/templates/admin-dashboard.yaml

@@ -25,7 +25,7 @@ spec:
                       value: 'true'
                     {{- else }}
                     - name: LICENSE_URL
-                      value: {{ .Values.fyipe.licenseUrl }}
+                      value: {{ .Values.fyipe.licensingUrl }}
                     {{- end }}
                     - name: NODE_ENV
                       value: 'production'

helm-chart/public/fyipe/templates/ingress.yaml

@@ -70,35 +70,3 @@ spec:
           {{- end }}   
 ---
 ##########################################################################
-
-############----STATUS-PAGE-INGRESS--#####################################
-{{- if .Values.enableStatusPageIngress }} 
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  annotations:
-    kubernetes.io/ingress.class: nginx
-    ingress.kubernetes.io/ssl-redirect: "true"
-  name: {{ printf "%s-%s" .Release.Name "status-page"  }}
-spec:
-  {{- if .Values.fyipe.tls.enabled }} 
-  tls:
-    - hosts:
-      - {{ .Values.fyipe.host }} 
-      secretName: {{ printf "%s-%s" .Release.Name "tlssecret"  }}
-  {{- end }}
-  rules:
-    {{- if .Values.fyipe.host }} 
-    - host: {{ printf "%s.%s" "status-page" .Values.fyipe.host }} 
-      http:
-    {{- else }}
-    - http:
-    {{- end }}
-        paths:
-          - path: /
-            backend:
-              serviceName: {{ printf "%s-%s" .Release.Name "status-page"  }}
-              servicePort: 80
----
-{{- end}}
-##################################

helm-chart/public/fyipe/templates/statusPageIngress.yaml

@@ -0,0 +1,31 @@
+############----STATUS-PAGE-INGRESS--#####################################
+{{- if .Values.statusPage.enableIngress }} 
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  annotations:
+    kubernetes.io/ingress.class: nginx
+    ingress.kubernetes.io/ssl-redirect: "true"
+  name: {{ printf "%s-%s" .Release.Name "status-page"  }}
+spec:
+  {{- if .Values.statusPage.tls.enabled }} 
+  tls:
+    - hosts:
+      - {{ .Values.statusPage.host }} 
+      secretName: {{ printf "%s-%s" .Release.Name "statuspagesecret"  }}
+  {{- end }}
+  rules:
+    {{- if .Values.statusPage.host }} 
+    - host: {{ .Values.statusPage.host }} 
+      http:
+    {{- else }}
+    - http:
+    {{- end }}
+        paths:
+          - path: /
+            backend:
+              serviceName: {{ printf "%s-%s" .Release.Name "status-page"  }}
+              servicePort: 80
+---
+{{- end}}
+##################################

helm-chart/public/fyipe/templates/statusPageTls.yaml

@@ -0,0 +1,11 @@
+{{- if .Values.fyipe.tls.enabled }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ printf "%s-%s" .Release.Name "statuspagesecret"  }}
+type: Opaque
+data:
+  tls.crt: {{ .Values.statusPage.tls.crt }}
+  tls.key: {{ .Values.statusPage.tls.key }}
+---
+{{- end }}

helm-chart/public/fyipe/values.yaml

@@ -4,19 +4,41 @@
 
 saas: 
   isSaasService: false
+  stripe: 
+    publicKey: 
+    privateKey: 
+  airtable: 
+    key: 
+    baseId: 
+  amplitude: 
+    key: 
+  licensing:
+    airtable: 
+      key: 
+      baseId: 
+    tokenSecret: 
+  support: 
+    slackToken: 
+
+statusPage: 
+  enableIngress: false
+  statusPageIngressHost: 
+  tls:
+    enabled: false
+    crt: 
+    key: 
 
-enableStatusPageIngress: false
 ###################################################################################
 fyipe:
   host: 
   tls:
-    enabled:
+    enabled: false
     crt: 
     key:  
   emailEnabled: true
   callEnabled: true
   smsEnabled: true
-  licenseUrl: https://fyipe.com/license
+  licensingUrl: https://fyipe.com/license
   
 
 host: 

kubernetes/values-saas-staging.yaml

@@ -23,4 +23,11 @@ saas:
     support: 
       slackToken: xoxp-369430749728-370026359715-370129302482-08f43c6a1306d2e8f4be4b0d8abbdb80
 
-enableStatusPageIngress: true
+
+statusPage: 
+  enableIngress: true
+  host: status.flowappplatform.com
+  tls:
+    enabled: false
+    crt: 
+    key: