Loading k8s/generic.yaml +25 −19 Original line number Diff line number Diff line Loading @@ -8,13 +8,19 @@ variables: environment: name: production action: prepare before_script: script: - gl-use-kube-context - chmod 400 ${KUBECONFIG} needs: [] .kubectl: extends: .kube-context artifacts: paths: - ${K8S_CONFIG_DIR}/ when: always .kubectl:envsubst: extends: .kubectl script: - | echo "[*] Checking for configuration in ${K8S_CONFIG_DIR}..." Loading @@ -30,8 +36,11 @@ variables: fi done fi .kubectl:apply: extends: .kubectl script: - | if [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" ]; then if test -f ${K8S_CONFIG_DIR}/apply/namespace.yaml; then echo "[*] Ensuring namespace availability..." kubectl apply --wait -f ${K8S_CONFIG_DIR}/apply/namespace.yaml Loading @@ -44,8 +53,5 @@ variables: echo "[*] Running create folder..." kubectl create --recursive -f ${K8S_CONFIG_DIR}/create fi fi artifacts: paths: - ${K8S_CONFIG_DIR}/ when: always rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH k8s/helm/deploy.yaml +22 −8 Original line number Diff line number Diff line Loading @@ -3,14 +3,14 @@ include: - local: k8s/generic.yaml .helm: extends: .kube-context variables: DEFAULT_ARGS: > DEFAULT_ARGS: --install --create-namespace --dependency-update --atomic --wait-for-jobs --render-subchart-notes EXTRA_ARGS: "" script: - !reference [.kubectl, script] - !reference [".kubectl:envsubst", script] - | if test -f "${K8S_CONFIG_DIR}/values.yaml"; then echo "[+] Including '${K8S_CONFIG_DIR}/values.yaml'." Loading @@ -27,15 +27,29 @@ include: EXTRA_ARGS=${EXTRA_ARGS} NAMESPACE=${NAMESPACE:=default}" - helm repo add ${REPO_NAME} ${REPO_URL} .helm:render: extends: .helm script: - !reference [.helm, script] - helm template ${REPO_NAME} ${CHART} ${VALUES_ARG} --namespace ${NAMESPACE:=default} --output-dir rendered - | if [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" ]; then helm upgrade ${DEFAULT_ARGS} --namespace ${NAMESPACE:=default} ${RELEASE} ${CHART} ${VALUES_ARG} ${EXTRA_ARGS} else echo "[-] Not running on the default branch. Not deploying." fi artifacts: paths: - rendered when: always .helm:deploy: extends: - .helm - .kube-context script: - !reference [.kube-context, script] - !reference [.helm, script] - helm upgrade ${DEFAULT_ARGS} --namespace ${NAMESPACE:=default} ${RELEASE} ${CHART} ${VALUES_ARG} ${EXTRA_ARGS} artifacts: paths: - rendered when: always rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH tests/jobs/helm.yaml +2 −2 Original line number Diff line number Diff line Loading @@ -5,8 +5,8 @@ include: variables: K8S_CONFIG_DIR: tests/mockup_projects/k8s/helm/deploy helm:deploy:test: extends: .helm helm:render: extends: .helm:render variables: REPO_NAME: gitlab REPO_URL: https://charts.gitlab.io Loading Loading
k8s/generic.yaml +25 −19 Original line number Diff line number Diff line Loading @@ -8,13 +8,19 @@ variables: environment: name: production action: prepare before_script: script: - gl-use-kube-context - chmod 400 ${KUBECONFIG} needs: [] .kubectl: extends: .kube-context artifacts: paths: - ${K8S_CONFIG_DIR}/ when: always .kubectl:envsubst: extends: .kubectl script: - | echo "[*] Checking for configuration in ${K8S_CONFIG_DIR}..." Loading @@ -30,8 +36,11 @@ variables: fi done fi .kubectl:apply: extends: .kubectl script: - | if [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" ]; then if test -f ${K8S_CONFIG_DIR}/apply/namespace.yaml; then echo "[*] Ensuring namespace availability..." kubectl apply --wait -f ${K8S_CONFIG_DIR}/apply/namespace.yaml Loading @@ -44,8 +53,5 @@ variables: echo "[*] Running create folder..." kubectl create --recursive -f ${K8S_CONFIG_DIR}/create fi fi artifacts: paths: - ${K8S_CONFIG_DIR}/ when: always rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
k8s/helm/deploy.yaml +22 −8 Original line number Diff line number Diff line Loading @@ -3,14 +3,14 @@ include: - local: k8s/generic.yaml .helm: extends: .kube-context variables: DEFAULT_ARGS: > DEFAULT_ARGS: --install --create-namespace --dependency-update --atomic --wait-for-jobs --render-subchart-notes EXTRA_ARGS: "" script: - !reference [.kubectl, script] - !reference [".kubectl:envsubst", script] - | if test -f "${K8S_CONFIG_DIR}/values.yaml"; then echo "[+] Including '${K8S_CONFIG_DIR}/values.yaml'." Loading @@ -27,15 +27,29 @@ include: EXTRA_ARGS=${EXTRA_ARGS} NAMESPACE=${NAMESPACE:=default}" - helm repo add ${REPO_NAME} ${REPO_URL} .helm:render: extends: .helm script: - !reference [.helm, script] - helm template ${REPO_NAME} ${CHART} ${VALUES_ARG} --namespace ${NAMESPACE:=default} --output-dir rendered - | if [ "${CI_COMMIT_BRANCH}" = "${CI_DEFAULT_BRANCH}" ]; then helm upgrade ${DEFAULT_ARGS} --namespace ${NAMESPACE:=default} ${RELEASE} ${CHART} ${VALUES_ARG} ${EXTRA_ARGS} else echo "[-] Not running on the default branch. Not deploying." fi artifacts: paths: - rendered when: always .helm:deploy: extends: - .helm - .kube-context script: - !reference [.kube-context, script] - !reference [.helm, script] - helm upgrade ${DEFAULT_ARGS} --namespace ${NAMESPACE:=default} ${RELEASE} ${CHART} ${VALUES_ARG} ${EXTRA_ARGS} artifacts: paths: - rendered when: always rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
tests/jobs/helm.yaml +2 −2 Original line number Diff line number Diff line Loading @@ -5,8 +5,8 @@ include: variables: K8S_CONFIG_DIR: tests/mockup_projects/k8s/helm/deploy helm:deploy:test: extends: .helm helm:render: extends: .helm:render variables: REPO_NAME: gitlab REPO_URL: https://charts.gitlab.io Loading