Merge branch 'fix/alpha-release' into 'main'

Fix/alpha release

See merge request software/fcoscore-chart!3

.gitignore

@@ -6,3 +6,4 @@
 temp
 charts
 .pre-commit-config.yaml
+dist

.helmignore

@@ -27,3 +27,5 @@
 # Nix
 .direnv
 .pre-commit-config.yaml
+
+dist

Chart.yaml

@@ -1,7 +1,7 @@
 ---
 name: fcoscore
 description: Fab City OS Core Kubernetes Helm Chart
-version: 0.1.1
+version: 0.1.3
 type: application
 appVersion: latest
 apiVersion: v2

Makefile

@@ -104,10 +104,10 @@ uninstall: ## Run helm uninstall.
 reinstall: uninstall install ## Run helm reinstall.
 
 package: ## Package the helm chart.
-	@helm package . --destination charts
+	@helm package . --destination dist
 
 push: ## Publish the helm chart.
-	@helm cm-push charts/fcoscore-*.tgz fcoscore-alpha
+	@helm cm-push dist/fcoscore-$(grep '^version:' Chart.yaml | awk '{print $2}').tgz fcoscore-alpha
 
 %:
 	@true

templates/_helpers.tpl

@@ -152,7 +152,11 @@ If release name contains chart name it will be used as a full name.
 {{- end -}}
 
 {{- define "fcoscore.gateway.url" -}}
-{{- printf "http://%s:%s" (include "fcoscore.gateway.host" . ) (include "fcoscore.gateway.port" . ) -}}
+    {{- if .Values.gateway.url  }}
+        {{- .Values.gateway.url -}}
+    {{- else -}}
+        {{- print "gateway.example.org" -}}
+    {{- end -}}
 {{- end -}}
 
 {{/*

templates/frontend/service.yaml

@@ -6,9 +6,9 @@ metadata:
   labels:
     {{- include "fcoscore.labels" . | nindent 4 }}
 spec:
-  type: {{ .Values.zenflow.service.type }}
+  type: {{ .Values.frontend.service.type }}
   ports:
-    - port: {{ .Values.zenflow.service.port }}
+    - port: {{ .Values.frontend.service.port }}
       targetPort: http
       protocol: TCP
       name: http

values.yaml

@@ -279,6 +279,7 @@ gateway:
   service:
     type: ClusterIP
     port: 4040
+  url: ""
 
 ## Persistence Parameters
 ## ref: https://kubernetes.io/docs/user-guide/persistent-volumes/