default.xml copy + update default ingress + bump version

mviewer · Oct 29, 2024 · 6c2eb9c · 6c2eb9c
1 parent d70db5b
commit 6c2eb9c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 6 deletions.
diff --git a/mviewer/CHANGELOG.md b/mviewer/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.7.1
+Add automatic copy of default.xml if not found.
+
+Update ingress so that / is default to mviewer
+
 # 0.7.0
 
 Initial version of the helm chart
diff --git a/mviewer/Chart.yaml b/mviewer/Chart.yaml
@@ -15,7 +15,7 @@ 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.7.0
+version: 0.7.1
 
 # 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

diff --git a/mviewer/README.md b/mviewer/README.md
@@ -22,7 +22,7 @@ WARNING: Change `0.7.0` by the latest version of the helm chart found in https:/
    helm install mviewer oci://ghcr.io/mviewer/helm-charts/mviewer --version 0.7.0
    ```
 
-4. Go to [https://YOURDOMAIN/mviewer](https://YOURDOMAIN/mviewer)
+4. Go to [https://YOURDOMAIN](https://YOURDOMAIN) OR [https://YOURDOMAIN/mviewerstudio](https://YOURDOMAIN/mviewerstudio)
 
 ### Customized installation
 1. Create a new separate 'values' file (or edit the existing one, not recommended).  
@@ -34,7 +34,7 @@ WARNING: Change `0.7.0` by the latest version of the helm chart found in https:/
    helm install -f your-values.yaml mviewer oci://ghcr.io/mviewer/helm-charts/mviewer --version 0.7.0
    ```
 
-4. Go to [https://YOURDOMAIN/mviewer](https://YOURDOMAIN/mviewer)
+4. Go to [https://YOURDOMAIN](https://YOURDOMAIN) OR [https://YOURDOMAIN/mviewerstudio](https://YOURDOMAIN/mviewerstudio)
 
 ## Upgrade
 

diff --git a/mviewer/templates/mviewer-deployment.yaml b/mviewer/templates/mviewer-deployment.yaml
@@ -40,6 +40,13 @@ spec:
       tolerations:
         {{- toYaml . |nindent 8 }}
       {{- end }}
+      initContainers:
+      - name: copy-default-xml-if-not-found
+        image: "{{ $webapp.image.repository }}:{{ $webapp.image.tag }}"
+        command: ["sh", "-c", "if ! [ -f /mnt/mviewer_apps/default.xml ]; then cp /usr/share/nginx/html/apps/default.xml /mnt/mviewer_apps/default.xml; fi ;"]
+        volumeMounts:
+        - name: mviewer-conf
+          mountPath: /mnt/mviewer_apps
       containers:
       - name: mviewer
         image: "{{ $webapp.image.repository }}:{{ $webapp.image.tag }}"

diff --git a/mviewer/templates/mviewerstudio-deployment.yaml b/mviewer/templates/mviewerstudio-deployment.yaml
@@ -42,7 +42,7 @@ spec:
       {{- end }}
       initContainers:
       - name: copy-starter-configmap
-        image: busybox:latest
+        image: busybox:stable
         {{- if $webapp.keepConfigFromKubernetes }}
         command: ["sh", "-c", "cp /cm/config.json /mnt/mviewerstudio/static/apps/;"]
         {{- else }}

diff --git a/mviewer/values.yaml b/mviewer/values.yaml
@@ -94,13 +94,13 @@ ingress:
   hosts:
     - host: chart-example.local
       paths:
-        - path: /mviewer/_search
+        - path: /_search
           pathType: Prefix
           svcPort: "9200"
           svcName: mviewer-es-svc
     - host: chart-example.local
       paths:
-        - path: /mviewer
+        - path: /
           pathType: Prefix
           svcPort: "80"
           svcName: mviewer-svc