wip: reworking manifests

argo/kustomize-helm-with-rewrite/generate.sh

@@ -2,24 +2,30 @@
 
 export HOME=/tmp
 
-echo $ARGOCD_APP_PARAMETERS | jq '.[] | select(.name == "helm-parameters") | .map' | yq -P -oy > parameters.yaml
+env > /tmp/$ARGOCD_APP_NAME.env
+
+echo "$ARGOCD_APP_PARAMETERS" | jq '.[] | select(.name == "helm-parameters") | .map' | yq -P -oy > parameters.yaml
 cp parameters.yaml /tmp/$ARGOCD_APP_NAME-parameters.yaml
 
-if [ -f chart -a $PARAM_CHART = "." ]; then
+if [ -d chart ]; then
+    CHART=chart
+elif [ -f chart -a "$PARAM_CHART" = "." ]; then
     CHART=$(cat chart)
 else
     CHART=$PARAM_CHART
 fi
 
-helm template $PARAM_FLAGS \
-    -f values.yaml \
-    -f parameters.yaml \
-    -f $PARAM_ENV/values.yaml \
-    $ARGOCD_APP_NAME $CHART > ./base/_manifest.yaml
+[ -f chart/values.yaml ] && VALUES="-f chart/values.yaml"
+[ -f values.yaml ] && VALUES="$VALUES -f values.yaml"
+[ -f $PARAM_ENV-values.yaml ] && VALUES="$VALUES -f $PARAM_ENV-values.yaml"
+VALUES="$VALUES -f parameters.yaml"
+
+mkdir -p base
+helm template $PARAM_FLAGS $VALUES $ARGOCD_APP_NAME $CHART > ./base/_manifest.yaml
 
-cp ./base/_manifest.yaml /tmp/$ARGOCD_APP_NAME-manifest.yaml
 sed -i "$PARAM_REWRITE" ./base/_manifest.yaml
-cp ./base/_manifest.yaml /tmp/$ARGOCD_APP_NAME-manifest-rw.yaml
+cp ./base/_manifest.yaml /tmp/$ARGOCD_APP_NAME-manifest.yaml
+
+[ -d "$PARAM_ENV" ] && kubectl kustomize $PARAM_ENV > /tmp/$ARGOCD_APP_NAME-manifest.yaml
 
-kubectl kustomize $PARAM_ENV > /tmp/$ARGOCD_APP_NAME-manifest.yaml
 cat /tmp/$ARGOCD_APP_NAME-manifest.yaml

argo/kustomize-helm-with-rewrite/get-values.sh

@@ -1,15 +1,22 @@
 #!/bin/sh
 
-# cat << EOF
-# [{
-#       "name": "values",
-#       "title": "Values",
-#       "collectionType": "map",
-#       "map": { "replicaCount": "1" }
-# }]
-# EOF
+if [ -f values.yaml ]; then
+    VALUES="values.yaml"
+elif [ -f chart/values.yaml ]; then
+    VALUES="chart/values.yaml"
+else
+    cat << EOF
+[{
+    "name": "helm-parameters",
+    "title": "Helm Parameters",
+    "collectionType": "map",
+    "map": { "replicaCount": "1" }
+}]
+EOF
+    exit 0
+fi
 
-yq e -o=p values.yaml | jq --slurp --raw-input '
+yq e -o=p $VALUES | jq --slurp --raw-input '
   [{
     name: "helm-parameters",
     title: "Helm Parameters",