Commit d784bca0 authored by Fulcrand Guilhem's avatar Fulcrand Guilhem
Browse files

Merge branch '234-job-helm_review-default-stable-repo-url-doesn-t-work' into 'latest' 

Resolve "[job][helm_review] default stable repo url doesn't work"

Closes #234

See merge request r2devops/hub!116
parents a820b3dd 739ce064

jobs/helm_review/README.md

+5 −5
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ Deploy your [helm](https://helm.sh/docs/intro/quickstart/){:target="_blank"} cha 


* Job name: `helm_review`, `cleanup_helm_review`

* Docker image:

[`lachlanevenson/k8s-helm:v3.0.2`](https://hub.docker.com/r/lachlanevenson/k8s-helm/){:target="_blank"}

[`lachlanevenson/k8s-helm:v3.4.2`](https://hub.docker.com/r/lachlanevenson/k8s-helm/){:target="_blank"}

* Default stage: `review`

* When: `always`
@@ -35,10 +35,10 @@ Deploy your [helm](https://helm.sh/docs/intro/quickstart/){:target="_blank"} cha 
| `VALUES_FILE` | Name of the review configuration yaml file | `review.yaml` | Yes |

| `VALUES_SECRET_FILE` | Name of the secrets review configuration yaml file | `secrets.review.yaml` | Only if the secret file `VALUES_SECRET_FILE` exists |

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

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

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

| `HELMSECRETS_VERSION` | Version of kubectl secrets plugin | `v2.0.2` | Only if the secret file `VALUES_SECRET_FILE` exists |

| `STABLE_REPO_URL` | Url of stable repo to add to helm | `https://kubernetes-charts.storage.googleapis.com/` | Yes |

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

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

| `HELMSECRETS_VERSION` | Version of kubectl secrets plugin | `v3.4.0` | Only if the secret file `VALUES_SECRET_FILE` exists |

| `STABLE_REPO_URL` | Url of stable repo to add to helm | `https://charts.helm.sh/stable` | Yes |

| `HELM_ADDITIONAL_OPTIONS` | Additional settings to give to helm for deployment | ` ` | No |



**Gitlab CI/CD variables:**

jobs/helm_review/helm_review.yml

+5 −5
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ stages: 


.helm:

  image:

    name: lachlanevenson/k8s-helm:v3.0.2

    name: lachlanevenson/k8s-helm:v3.4.2

    entrypoint: [""]

  variables:

    CHART_PATH: "./charts/$CI_PROJECT_NAME"
@@ -14,10 +14,10 @@ stages: 
    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"

    HELMSECRETS_VERSION: "v2.0.2"

    STABLE_REPO_URL: "https://kubernetes-charts.storage.googleapis.com/"

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

    HELMSECRETS_URL: "https://github.com/jkroepke/helm-secrets"

    HELMSECRETS_VERSION: "v3.4.0"

    STABLE_REPO_URL: "https://charts.helm.sh/stable"

    HELM_ADDITIONAL_OPTIONS: ""



helm_review:

jobs/helm_review/versions/0.2.0.md

0 → 100644
+6 −0
Original line number Diff line number Diff line 
* Upgrade `lachlanevenson/k8s-helm` image version from `v3.0.2` to `v3.4.2`

* Upgrade `kubectl` version from `v1.17.0` to `v1.20.1`

* Upgrade `helm-secrets` version to `v3.4.0`

* Update `HELMSECRETS_URL` to the new repository `https://github.com/jkroepke/helm-secrets` because the old one is now [deprecated](https://github.com/zendesk/helm-secrets#deprecation-information)

* Update `STABLE_REPO_URL` default value to the new official address: `https://charts.helm.sh/stable`