Release v2.0.1 (#13)

Signed-off-by: Oliver Bähler <[email protected]>

Author: oliverbaehler

scripts/helpers/config.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 CONFIG_SUPPORTED_VALUES=( "HELM_DOCS_DISABLE" "HELM_DOCS_ALLOW_FAIL" "KUBE_LINTER_DISABLE" "KUBE_LINTER_CONFIG" "KUBE_LINTER_ALLOW_FAIL" "UNIT_TEST_DISABLE" "UNIT_TEST_ARGS" "UNIT_TEST_ALLOW_FAIL");
-CONFIG_NAME=".chart-config"
+CONFIG_NAME="${INPUT_CHARTCONFIG:-.chart-config}"
+
 
 function config_unset {
   for config in "${CONFIG_SUPPORTED_VALUES[@]}"

scripts/linter.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 . /scripts/helpers/base.sh
 LINTER_CONFIG_NAME=".kube-linter.yaml"
+LINTER_CONFIG=""
 LINTER_EXTRA_ARGS=""
 
 head "Initialize KubeLinter"
@@ -11,17 +12,26 @@ for chart in ${INPUT_CHARTS}; do
     log "${chart}" "${Green}Kube-Linter disabled${Off} ✔"; 
   else 
     if [[ -f "./$LINTER_CONFIG_NAME" ]] && [[ -f "${chart}/$LINTER_CONFIG_NAME" ]]; then 
-       spruce merge "./$LINTER_CONFIG_NAME" "${chart}/$LINTER_CONFIG_NAME" > "${chart%/}/.merged-kube-linter"
-       LINTER_EXTRA_ARGS="--config ${chart%/}/.merged-kube-linter"
-       log "${chart}" "${Yellow}Using Merged kube-linter configuration${Off}";
+       spruce merge "./$LINTER_CONFIG_NAME" "${chart}/$LINTER_CONFIG_NAME" > "./${chart%/}/merged-linter.yaml"
+       if [ $? -eq 0 ]; then 
+         LINTER_CONFIG="./${chart%/}/merged-linter.yaml"
+       else 
+         LINTER_CONFIG="./$LINTER_CONFIG_NAME"
+         log "${chart}" "${Red}Merge failed! Using only global configuration (./$LINTER_CONFIG_NAME)${Off}";
+       fi
     elif [[ -f "./$LINTER_CONFIG_NAME" ]]; then 
-       LINTER_EXTRA_ARGS="--config ./$LINTER_CONFIG_NAME"
-       log "${chart}" "${Yellow}Using Global kube-linter configuration (./$LINTER_CONFIG_NAME)${Off}";
+       LINTER_CONFIG="./$LINTER_CONFIG_NAME";
     elif [[ -f "${chart}/$LINTER_CONFIG_NAME" ]]; then
-       LINTER_EXTRA_ARGS="--config ${chart}/$LINTER_CONFIG_NAME"
-       log "${chart}" "${Yellow}Using Chart kube-linter configuration (${chart}/$LINTER_CONFIG_NAME)${Off}";
+       LINTER_CONFIG="${chart}/$LINTER_CONFIG_NAME"
     fi
 
+    if [ -f "${LINTER_CONFIG}" ]; then 
+      log "${chart}" "${Yellow}Using Configuration ($LINTER_CONFIG):${Off}\n$(cat $LINTER_CONFIG | sed 's/^/  /')";
+      LINTER_EXTRA_ARGS="--config $LINTER_CONFIG"
+    else 
+      log "${chart}" "${Red}Linter Configuration not found/invalid${Off}";
+    fi 
+
     log "${chart}" "${Yellow}Execute KubeLinter${Off}"; 
     kube-linter lint --verbose ${LINTER_EXTRA_ARGS} ${chart} 
     if [ $? -eq 0 ]; then