Commit 7f9fa53d authored by FulcrandG's avatar FulcrandG
Browse files

Adding VALUES_FILE and VALUES_SECRET_FILE variables in helm_review job

parent 6d8b2d21

jobs/helm_review/README.md

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ Deploy your [helm](https://helm.sh/docs/intro/quickstart/) charts as a review en 
| ---- | ----------- | ------- |

| `CHART_PATH` <img width=250/> | Path to the directory of the chart <img width=400/> | `./charts/$CI_PROJECT_NAME` |

| `VALUES_PATH` | Path to value files | `./conf/values` |

| `VALUES_FILE` | Name of the review configuration yaml file | `review.yaml` |

| `VALUES_SECRET_FILE` | Name of the secrets review configuration yaml file | `secrets.review.yaml` |

| `REGISTRY` | Registry from where to pull container image | `${CI_REGISTRY_IMAGE}` |

| `KUBECTL_URL` | Url to get kubectl binary | `https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/amd64/kubectl` |

| `HELMSECRETS_URL` | Url to get kubectl secrets plugin | `https://github.com/futuresimple/helm-secrets` |

jobs/helm_review/helm_review.yml

+5 −3
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
  variables:

    CHART_PATH: "./charts/$CI_PROJECT_NAME"

    VALUES_PATH: "./conf/values"

    VALUES_FILE: "review.yaml"

    VALUES_SECRET_FILE: "secrets.review.yaml"

    REGISTRY: "${CI_REGISTRY_IMAGE}"

    KUBECTL_URL: "https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/amd64/kubectl"

    HELMSECRETS_URL: "https://github.com/futuresimple/helm-secrets"
@@ -35,13 +37,13 @@ deploy_review: 
    - gpg --allow-secret-key-import --import "${PGP_PRIVATE}"

    - helm repo add stable ${STABLE_REPO_URL}

    - helm repo update

    - if [ -f "${VALUES_PATH}/secrets.review.yaml" ]

    - if [ -f "${VALUES_PATH}/${VALUES_SECRET_FILE}" ]

    - then

    -     SECRET_OPTION="-f ${VALUES_PATH}/secrets.review.yaml"

    -     SECRET_OPTION="-f ${VALUES_PATH}/${VALUES_SECRET_FILE}"

    - fi

    - helm secrets upgrade ${CI_PROJECT_PATH_SLUG} ${CHART_PATH}

        --namespace "${KUBE_NAMESPACE}" --install

        -f ${VALUES_PATH}/review.yaml ${SECRET_OPTION}

        -f ${VALUES_PATH}/${VALUES_FILE} ${SECRET_OPTION}

        --set-string image.registry=${REGISTRY}

        --set-string image.tag=${CI_COMMIT_SHA}

        --set-string ingress.hostPrefix="${CI_ENVIRONMENT_SLUG}."