From 0d463261e5a7045692cbe32d9a504fd1ea838e82 Mon Sep 17 00:00:00 2001
From: Marius Ensrud <marius@ensrud.net>
Date: Wed, 3 Nov 2021 16:19:26 +0100
Subject: [PATCH] fix env

---
 charts/nfs-client-provisioner/sync.sh | 14 ++++++++++++++
 charts/phpipam/sync.sh                | 14 ++++++++++++++
 charts/sogo/templates/deployment.yaml |  4 +++-
 charts/sogo/values.yaml               |  2 +-
 charts/ycast/templates/configmap.yaml | 12 ------------
 5 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100755 charts/nfs-client-provisioner/sync.sh
 create mode 100755 charts/phpipam/sync.sh
 delete mode 100644 charts/ycast/templates/configmap.yaml

diff --git a/charts/nfs-client-provisioner/sync.sh b/charts/nfs-client-provisioner/sync.sh
new file mode 100755
index 0000000..f2bbb33
--- /dev/null
+++ b/charts/nfs-client-provisioner/sync.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+chartname=$(basename $(cd $(dirname $0) && pwd))
+. $(dirname "$0")/../../utils/sync-init.sh
+
+branch=master
+version=$(curl https://raw.githubusercontent.com/containeroo/helm-charts/master/charts/nfs-client-provisioner/Chart.yaml 2>/dev/null| yq e '.version' - )
+base_repo=https://github.com/containeroo/helm-charts/
+sub_dir=charts/nfs-client-provisioner
+
+
+test -d $(dirname $0)/$version && die "$chartname: version $version exist.."
+echo "Found new version $chartname: $version"
+test ! -d $(dirname $0)/$version && is_dry && sync_repo "$branch" "$base_repo" "$sub_dir" "$version" "$chartname"
diff --git a/charts/phpipam/sync.sh b/charts/phpipam/sync.sh
new file mode 100755
index 0000000..da6f035
--- /dev/null
+++ b/charts/phpipam/sync.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+chartname=$(basename $(cd $(dirname $0) && pwd))
+. $(dirname "$0")/../../utils/sync-init.sh
+
+branch=master
+version=$(curl https://gitlab.triumf.ca/k8s/helm/charts/phpipam/-/raw/master/Chart.yaml 2>/dev/null| yq e '.version' - )
+base_repo=https://gitlab.triumf.ca/k8s/helm/
+sub_dir=charts/phpipam
+
+
+test -d $(dirname $0)/$version && die "$chartname: version $version exist.."
+echo "Found new version $chartname: $version"
+test ! -d $(dirname $0)/$version && is_dry && sync_repo "$branch" "$base_repo" "$sub_dir" "$version" "$chartname"
diff --git a/charts/sogo/templates/deployment.yaml b/charts/sogo/templates/deployment.yaml
index 424298f..dac88f8 100644
--- a/charts/sogo/templates/deployment.yaml
+++ b/charts/sogo/templates/deployment.yaml
@@ -45,8 +45,10 @@ spec:
             httpGet:
               path: /
               port: http
+          {{- with .Values.deployment.env }}
           env:
-            {{- toYaml .Values.deployment.env | nindent 12 }}
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           envFrom:
             - configMapRef:
                 name: {{ include "sogo.fullname" . }}-config
diff --git a/charts/sogo/values.yaml b/charts/sogo/values.yaml
index 6b93ad1..bcf7862 100644
--- a/charts/sogo/values.yaml
+++ b/charts/sogo/values.yaml
@@ -72,7 +72,7 @@ deployment:
 
 service:
   type: ClusterIP
-  port: 2000
+  port: 20000
 
 ingress:
   enabled: false
diff --git a/charts/ycast/templates/configmap.yaml b/charts/ycast/templates/configmap.yaml
deleted file mode 100644
index 0c36f1c..0000000
--- a/charts/ycast/templates/configmap.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "ycast.fullname" . }}
-  labels:
-    {{- include "ycast.labels" . | nindent 4 }}
-data:
-  stations.yml: |
-{{- with .Values.stations }}
-{{- toYaml . | nindent 4 }}
-{{- end }}
-