Commit 352f5237 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch '31-yaml-file-extension-inconsistencies' into 'master' 

Keep priority policy even when mixing YAML file extension

Closes #31

See merge request to-be-continuous/kubernetes!47
parents b8a759a8 078019da

templates/gitlab-ci-k8s.yml

+2 −2
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ stages: 


    if [[ "${K8S_KUSTOMIZE_ENABLED}" == "true" ]]

    then

      kustofile=$(ls -1 "$K8S_SCRIPTS_DIR/${environment_type}/kustomization.yaml" 2>/dev/null || ls -1 "$K8S_SCRIPTS_DIR/kustomization.yaml" 2>/dev/null || ls -1 "$K8S_SCRIPTS_DIR/${environment_type}/kustomization.yml" 2>/dev/null || ls -1 "$K8S_SCRIPTS_DIR/kustomization.yml" 2>/dev/null || echo "")

      kustofile=$(ls -1 "$K8S_SCRIPTS_DIR/${environment_type}/kustomization.yml" 2>/dev/null || ls -1 "$K8S_SCRIPTS_DIR/${environment_type}/kustomization.yaml" 2>/dev/null || ls -1 "$K8S_SCRIPTS_DIR/kustomization.yml" 2>/dev/null || ls -1 "$K8S_SCRIPTS_DIR/kustomization.yaml" 2>/dev/null || echo "")

      if [[ -z "$kustofile" ]]

      then

        log_error "--- kustomize enabled but nor ${environment_type}/kustomization.yaml neither kustomization.yaml was found"
@@ -550,7 +550,7 @@ stages: 
    export environment_type=$1

    if [[ "$K8S_KUSTOMIZE_ENABLED" == "true" ]]

    then

      kustofile=$(ls -1 "$K8S_SCRIPTS_DIR/${environment_type}/kustomization.yaml" 2>/dev/null || ls -1 "$K8S_SCRIPTS_DIR/kustomization.yaml" 2>/dev/null || ls -1 "$K8S_SCRIPTS_DIR/${environment_type}/kustomization.yml" 2>/dev/null || ls -1 "$K8S_SCRIPTS_DIR/kustomization.yml" 2>/dev/null || echo "")

      kustofile=$(ls -1 "$K8S_SCRIPTS_DIR/${environment_type}/kustomization.yml" 2>/dev/null || ls -1 "$K8S_SCRIPTS_DIR/${environment_type}/kustomization.yaml" 2>/dev/null || ls -1 "$K8S_SCRIPTS_DIR/kustomization.yml" 2>/dev/null || ls -1 "$K8S_SCRIPTS_DIR/kustomization.yaml" 2>/dev/null || echo "")

      if [[ -z "$kustofile" ]]

      then

        log_error "--- kustomize enabled but nor ${environment_type}/kustomization.yaml neither kustomization.yaml was found"