treewide: Format with shellcheck, jsonlint and yamllint
This commit is contained in:
+18
-17
@@ -1,4 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
# shellcheck disable=SC2034 # Unused variables left for readability
|
||||
|
||||
helmfile () {
|
||||
|
||||
@@ -10,30 +11,30 @@ bases:
|
||||
- ../envs/environments.yaml.gotmpl
|
||||
|
||||
commonLabels:
|
||||
tier: $tier
|
||||
tier: ${tier}
|
||||
|
||||
releases:
|
||||
- name: $name
|
||||
namespace: {{ .Environment.Name }}-$name
|
||||
chart: ../charts/$name
|
||||
condition: $name.enabled
|
||||
- name: ${name}
|
||||
namespace: {{ .Environment.Name }}-${name}
|
||||
chart: ../charts/${name}
|
||||
condition: ${name}.enabled
|
||||
values:
|
||||
- ../values/$name/values/values.yaml.gotmpl
|
||||
- ../values/$name/values/values-{{ .Environment.Name }}.yaml
|
||||
- ../values/${name}/values/values.yaml.gotmpl
|
||||
- ../values/${name}/values/values-{{ .Environment.Name }}.yaml
|
||||
postRenderer: ../bin/kustomizer
|
||||
postRendererArgs:
|
||||
- ../values/$name/kustomize/{{ .Environment.Name }}
|
||||
- ../values/${name}/kustomize/{{ .Environment.Name }}
|
||||
missingFileHandler: Info
|
||||
- name: manifests
|
||||
namespace: {{ .Environment.Name }}-$name
|
||||
namespace: {{ .Environment.Name }}-${name}
|
||||
chart: manifests
|
||||
condition: $name.enabled
|
||||
condition: ${name}.enabled
|
||||
missingFileHandler: Info
|
||||
values:
|
||||
- ../values/env.yaml
|
||||
- ../values/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml
|
||||
- ../values/$name/env.yaml.gotmpl
|
||||
- ../values/$name/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
|
||||
- ../values/${name}/env.yaml.gotmpl
|
||||
- ../values/${name}/env-{{ requiredEnv "ARGOCD_ENV_CLUSTER_NAME" }}.yaml.gotmpl
|
||||
hooks:
|
||||
- events: [ prepare, cleanup ]
|
||||
showlogs: true
|
||||
@@ -42,7 +43,7 @@ releases:
|
||||
- '{{\`{{ if eq .Event.Name "prepare" }}build{{ else }}clean{{ end }}\`}}'
|
||||
- '{{\`{{ .Release.Chart }}\`}}'
|
||||
- '{{\`{{ .Environment.Name }}\`}}'
|
||||
- ../values/$name/manifests
|
||||
- ../values/${name}/manifests
|
||||
- manifests
|
||||
EOF
|
||||
}
|
||||
@@ -59,10 +60,10 @@ done
|
||||
|
||||
name=$1
|
||||
tier=$2
|
||||
if [ -n "$ns" ]; then
|
||||
namespace="namespace: {{ .Environment.Name }}-$name"
|
||||
if [[ -n "${ns}" ]]; then
|
||||
namespace="namespace: {{ .Environment.Name }}-${name}"
|
||||
else
|
||||
namespace="namespace: $name"
|
||||
namespace="namespace: ${name}"
|
||||
fi
|
||||
|
||||
helmfile $1 $2
|
||||
helmfile "$1" "$2"
|
||||
|
||||
+13
-14
@@ -4,39 +4,38 @@ set -o pipefail
|
||||
|
||||
cmd=$1
|
||||
chart=$2
|
||||
env=$3
|
||||
manifests=${4:-manifests}
|
||||
outdir=${5:-_manifests}
|
||||
|
||||
build() {
|
||||
mkdir -p $outdir/templates
|
||||
echo "Creating $outdir/templates"
|
||||
mkdir -p "${outdir}"/templates
|
||||
echo "Creating ${outdir}/templates"
|
||||
|
||||
echo "generating $outdir/Chart.yaml" 1>&2
|
||||
echo "generating ${outdir}/Chart.yaml" 1>&2
|
||||
|
||||
cat <<EOF > $outdir/Chart.yaml
|
||||
cat <<EOF > "${outdir}"/Chart.yaml
|
||||
apiVersion: v1
|
||||
appVersion: "1.0"
|
||||
# description: A Helm chart for Kubernetes
|
||||
name: $chart
|
||||
name: ${chart}
|
||||
version: 0.1.0
|
||||
EOF
|
||||
|
||||
if [ -d $manifests ]; then
|
||||
cp -r $manifests/* $outdir/templates
|
||||
elif [ -f $manifests ]; then
|
||||
cp $manifests $outdir/templates
|
||||
if [[ -d "${manifests}" ]]; then
|
||||
cp -r "${manifests}"/* "${outdir}"/templates
|
||||
elif [[ -f "${manifests}" ]]; then
|
||||
cp "${manifests}" "${outdir}"/templates
|
||||
fi
|
||||
}
|
||||
|
||||
clean() {
|
||||
echo "cleaning $outdir" 1>&2
|
||||
rm -rf $outdir
|
||||
echo "cleaning ${outdir}" 1>&2
|
||||
rm -rf "${outdir}"
|
||||
}
|
||||
|
||||
case "$cmd" in
|
||||
case "${cmd}" in
|
||||
"build" ) build ;;
|
||||
"clean" ) clean ;;
|
||||
* ) echo "unsupported command: $cmd" 1>&2; exit 1 ;;
|
||||
* ) echo "unsupported command: ${cmd}" 1>&2; exit 1 ;;
|
||||
esac
|
||||
|
||||
|
||||
+5
-5
@@ -1,13 +1,13 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
[ $# != 1 ] && exit 1
|
||||
[[ $# != 1 ]] && exit 1
|
||||
|
||||
dir=$1
|
||||
base=$dir/../base
|
||||
base=${dir}/../base
|
||||
|
||||
if [ -f $base/kustomization.yaml -a -f $dir/kustomization.yaml ]; then
|
||||
cat > $base/_manifest.yaml
|
||||
kubectl kustomize $dir
|
||||
if [[ -f "${base}"/kustomization.yaml ]] && [[ -f "${dir}"/kustomization.yaml ]]; then
|
||||
cat > "${base}"/_manifest.yaml
|
||||
kubectl kustomize "${dir}"
|
||||
else
|
||||
cat
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user