last checkin before implementing script installation

NCEAS · Jun 17, 2024 · 1dade31 · 1dade31
1 parent ccb643e
commit 1dade31
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/helm/config/install.sh b/helm/config/install.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # A script that installs MetacatUI
 
-# EXPECTS THESE FOLLOWING ENV VARS TO BE PRE-SET
+# EXPECTS THE FOLLOWING ENV VARS TO BE PRE-SET
 # REQUIRED:
 # * tag - MetacatUI tag/version or branch name - e.g. 2.29.1
 # * hostedRepoTheme - boolean

diff --git a/helm/templates/configmap.yaml b/helm/templates/configmap.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ .Release.Name }}-metacatui-configjs
+  name: {{ .Release.Name }}-metacatui-configfiles
   labels:
     {{- include "metacatui.labels" . | nindent 4 }}
 data:

diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
@@ -51,8 +51,8 @@ spec:
             - -c
             - >
               start=$(date +%s);
-              # # # # # # TODO - RUN THE MOUNTED /TMP/SCRIPT.SH INSTEAD # # # # # #
-              VERSION={{ .Values.source.package.version | default .Chart.AppVersion }}
+              echo "Starting at $start";
+              VERSION={{ .Values.source.package.version | default .Chart.AppVersion }};
               FILENAME=$VERSION.zip;
               wget -O ./$FILENAME {{ .Values.source.package.location }}/$FILENAME;
               unzip $FILENAME -d /tmp/;
@@ -104,7 +104,7 @@ spec:
         {{- if .Values.appConfig.enabled }}
         - name: {{ .Release.Name }}-mcui-config-vol
           configMap:
-            name: {{ .Release.Name }}-metacatui-configjs
+            name: {{ .Release.Name }}-metacatui-configfiles
             defaultMode: 0644
         {{- end }}
         {{- if not .Values.source.pvc }}

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -57,14 +57,14 @@ appConfig:
 
 ## Probes
 ##
-livenessProbe:
-  httpGet:
-    path: /
-    port: http
-readinessProbe:
-  httpGet:
-    path: /
-    port: http
+#livenessProbe:
+#  httpGet:
+#    path: /
+#    port: http
+#readinessProbe:
+#  httpGet:
+#    path: /
+#    port: http
 
 service:
   type: ClusterIP
@@ -75,11 +75,11 @@ service:
 ##
 ingress:
   enabled: false
-  className: traefik    # enable in rancher desktop
+  className: traefik # enable in rancher desktop
   annotations:
     kubernetes.io/ingress.class: traefik
   hosts:
-    - host: myMacbookPro.local    # example hostname of local machine
+    - host: myMacbookPro.local # example hostname of local machine
       paths:
       - path: /
         pathType: Prefix
@@ -109,6 +109,7 @@ source:
   ## @param source.package (default): Download the official release version defined in Chart.yaml
   ## Note these settings ignored unless 'source.from:' is set to 'package'
   ## example:
+  ##    source.from: package
   ##    source.package.location: "https://github.com/NCEAS/metacatui/archive"
   ##    source.package.version: "2.26.0"
   ## ...will download:   https://github.com/NCEAS/metacatui/archive/2.26.0.zip
@@ -121,7 +122,7 @@ source:
     ## source.package.version override the release version defined in Chart.yaml
     ## Assumes release is a zipfile named <version>.zip
     ## LEAVE COMMENTED UNLESS YOU NEED TO OVERRIDE THE CHART SETTING!
-#    version: "2.29.1"
+  #    version: "2.29.1"
 
   ## @param source.git clone a specific branch or tag from the metacatui git repository, and install
   ## the files in local pod storage (emptyDir{})
@@ -140,6 +141,8 @@ source:
 
 ## volumes: Uncomment and provide values if you want to use a pre-configured PVC instead of doing a
 ## git checkout
+## Note these settings ignored unless 'source.from:' is set to 'pvc'
+##
 #volumes:
 #  ## volumes.name substitute your own release name, but do NOT change the '-mcui-source-files' part
 #  - name: <Your-Release-Name>-mcui-source-files