Merge pull request #1 from czoczo/develop

0.1.1 Release

CHANGELOG.md

@@ -0,0 +1,9 @@
+# CasaVue Changelog
+
+## 0.1.1
+- App: added self skip on Kubernetes Ingress crawl.
+- Helm Chart: fixed passing empty static items list array to CasaVue via ConfigMap.
+- WebUI: added auto refresh after PWA update button click.
+
+## 0.1.0
+- Initial release.

VERSION_APP.txt

@@ -1 +1 @@
-0.1.0
+0.1.1

VERSION_CHART.txt

@@ -1 +1 @@
-0.1.0
+0.1.1

deployment/helm/templates/config_items.yaml

@@ -1,10 +1,13 @@
-{{- with .Values.config.items }}
+{{- $items := .Values.config.items }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: casavue-cfg-items
 data:
   items.yaml: |-
+    {{- if $items }}
     items:
-      {{- toYaml . | nindent 4 }}
-{{- end }}
+    {{- toYaml $items | nindent 4 }}
+    {{- else }}
+    items: []
+    {{- end }}

deployment/helm/templates/deployment.yaml

@@ -47,11 +47,9 @@ spec:
             subPath: main.yaml
             name: casavue-cfg-main
           {{- end }}
-          {{- if .Values.config.items }}      
           - mountPath: /app/config/items.yaml
             subPath: items.yaml
             name: casavue-cfg-items
-          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- if or .Values.config.items .Values.config.main }}      
@@ -63,12 +61,10 @@ spec:
             defaultMode: 420
             name: casavue-cfg-main
         {{- end }}
-        {{- if .Values.config.items }}      
         - name: casavue-cfg-items
           configMap:
             defaultMode: 420
             name: casavue-cfg-items
-        {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

frontend/src/mixins/update.js

@@ -37,6 +37,7 @@ export default {
         if (!this.registration || !this.registration.waiting) return
         // send message to SW to skip the waiting and activate the new SW
         this.registration.waiting.postMessage({ type: 'SKIP_WAITING' })
+        window.location.reload(true)
       },
     },
-  }
+  }

kubernetes.go

@@ -108,6 +108,15 @@ func getAndWatchKubernetesIngressItems() {
 					log.Debug("Skipping item '" + ingress.Name + "' due to pattern")
 					return
 				}
+
+				// skip self
+				if val, ok := ingress.Labels["app.kubernetes.io/name"]; ok {
+					if val == "casavue" {
+						log.Debug("Skipping self: ", ingress.Name)
+						return
+					}
+				}
+
 				_, annotationPresent := ingress.Annotations["casavue.app/enable"]
 				if config.Content_filters.Item.Mode == "ingressAnnotation" && !annotationPresent {
 					log.Debug("Skipping item '" + ingress.Name + "' due to Ingress Annotation mode and lack of annotation.")