Commit 0113213b authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch '42-allow-to-specify-kube-version-in-helm-template-command' into 'master' 

Resolve "Allow to specify --kube-version in helm template command"

Closes #42

See merge request to-be-continuous/helm!69
parents 2db20be1 a8865154

README.md

+1 −0
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ This job runs [Kube-Score](https://kube-score.com/) on the resources to be creat 
| `HELM_KUBE_SCORE_DISABLED`   | Set to `true` to disable [Kube-Score](https://kube-score.com/)   | _none_ (enabled) |

| `HELM_KUBE_SCORE_IMAGE`   | The Docker image used to run [Kube-Score](https://kube-score.com/)   | `registry.hub.docker.com/zegl/kube-score` |

| `HELM_KUBE_SCORE_ARGS`   | Arguments used by the helm-score job   | _none_ |

| `HELM_K8S_VERSION`    | Kubernetes version (_so that `.Capabilities.KubeVersion.Version` can be correctly interpreted_).<br/> Expected format: `vX.YY` | _none_ |



### `helm-package` job

kicker.json

+5 −0
Original line number Diff line number Diff line
@@ -153,6 +153,11 @@ 
          "name": "HELM_KUBE_SCORE_ARGS",

          "description": "Arguments used by the kube-score job",

          "advanced": true

        },

        {

          "name": "HELM_K8S_VERSION",

          "description": "Kubernetes version (_so that `.Capabilities.KubeVersion.Version` can be correctly interpreted_). \n\n Expected format: `vX.YY`",

          "advanced": true

        }

      ]

    },

templates/gitlab-ci-helm.yml

+1 −1
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ helm-score: 
    - awkenvsubst < "${HELM_COMMON_VALUES:-/dev/null}" > generated-values-common.yml

    - env_values=$(eval echo "\$HELM_${VAR_PREFIX}_VALUES")

    - awkenvsubst < "$env_values" > generated-values-env.yml

    - helm template $helm_package --values generated-values-common.yml --values generated-values-env.yml | kube-score score ${HELM_KUBE_SCORE_ARGS} -

    - helm template $helm_package ${HELM_K8S_VERSION:+--kube-version "$HELM_K8S_VERSION"} --values generated-values-common.yml --values generated-values-env.yml | kube-score score ${HELM_K8S_VERSION:+--kubernetes-version "$HELM_K8S_VERSION"} ${HELM_KUBE_SCORE_ARGS} -

  rules:

    # exclude tags

    - if: $CI_COMMIT_TAG