Commit 74e2cef0 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

fix: replace deprecated Docker Hub registry FQDN

parent 594027b9
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ include:
    # 2: set/override component inputs
    inputs:
      # ⚠ this is only an example
      kubectl-image: registry.hub.docker.com/bitnami/kubectl:1.26
      kubectl-image: docker.io/bitnami/kubectl:1.26
      base-app-name: wonderapp
      review-space: myapp-nonprod
      staging-space: myapp-nonprod
@@ -41,7 +41,7 @@ include:
variables:
  # 2: set/override template variables
  # ⚠ this is only an example
  K8S_KUBECTL_IMAGE: registry.hub.docker.com/bitnami/kubectl:1.26
  K8S_KUBECTL_IMAGE: docker.io/bitnami/kubectl:1.26
  K8S_BASE_APP_NAME: wonderapp
  K8S_REVIEW_SPACE: myapp-nonprod
  K8S_STAGING_SPACE: myapp-nonprod
@@ -372,7 +372,7 @@ The Kubernetes template uses some global configuration used throughout all jobs.

| Input / Variable | Description                                                                                                                                                             | Default value                                                                                          |
| --------------------- | -------------------------------------- | ----------------- |
| `kubectl-image` / `K8S_KUBECTL_IMAGE` | the Docker image used to run Kubernetes `kubectl` commands <br/>:warning: **set the version required by your Kubernetes server**                                        | `registry.hub.docker.com/bitnami/kubectl:latest`                                                       <br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-K8S_KUBECTL_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-K8S_KUBECTL_IMAGE) |
| `kubectl-image` / `K8S_KUBECTL_IMAGE` | the Docker image used to run Kubernetes `kubectl` commands <br/>:warning: **set the version required by your Kubernetes server**                                        | `docker.io/bitnami/kubectl:latest`                                                       <br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-K8S_KUBECTL_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-K8S_KUBECTL_IMAGE) |
| `base-app-name` / `K8S_BASE_APP_NAME` | Default application name                                                                                                                                                | `$CI_PROJECT_NAME` ([see GitLab doc](https://docs.gitlab.com/ci/variables/predefined_variables/)) |
| `environment-url` / `K8S_ENVIRONMENT_URL`    | Default environments url _(only define for static environment URLs declaration)_<br/>_supports late variable expansion (ex: `https://%{environment_name}.k8s.acme.com`)_ | _none_                                                                                                 |
| `KUBE_CONTEXT`      | Defines the context to be used in `KUBECONFIG`. When using [GitLab agents with the CI/CD workflow](https://docs.gitlab.com/user/clusters/agent/ci_cd_workflow/), the value should be like `path/to/agent/project:agent-name`. To use different agents per environment, define an [environment-scoped CI/CD variable](https://docs.gitlab.com/ci/environments/#limit-the-environment-scope-of-a-cicd-variable) for each agent. | _none_ |
@@ -471,7 +471,7 @@ Here are its parameters:

| Input / Variable | Description                                                          | Default value     |
| ---------------------- | -------------------------------------------------------------------- | ----------------- |
| `kube-score-image` / `K8S_KUBE_SCORE_IMAGE` | Docker image to run [kube-score](https://github.com/zegl/kube-score) | `registry.hub.docker.com/zegl/kube-score:latest` **it is recommended to set a tool version compatible with your Kubernetes cluster** <br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-K8S_KUBE_SCORE_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-K8S_KUBE_SCORE_IMAGE) |
| `kube-score-image` / `K8S_KUBE_SCORE_IMAGE` | Docker image to run [kube-score](https://github.com/zegl/kube-score) | `docker.io/zegl/kube-score:latest` **it is recommended to set a tool version compatible with your Kubernetes cluster** <br/>[![Trivy Badge](https://to-be-continuous.gitlab.io/doc/secu/trivy-badge-K8S_KUBE_SCORE_IMAGE.svg)](https://to-be-continuous.gitlab.io/doc/secu/trivy-K8S_KUBE_SCORE_IMAGE) |
| `score-disabled` / `K8S_SCORE_DISABLED` | Set to `true` to disable the `kube-score` analysis                             | _none_ (enabled) |
| `score-extra-opts` / `K8S_SCORE_EXTRA_OPTS` | [Additional options](https://github.com/zegl/kube-score#configuration) to `kube-score` command line | _none_ |

@@ -526,7 +526,7 @@ include:
  - component: $CI_SERVER_FQDN/to-be-continuous/kubernetes/gitlab-ci-k8s@7.3.1
    inputs:
      # ⚠ oc-container image (includes required curl)
      kubectl-image: registry.hub.docker.com/docker.io/appuio/oc:v4.14
      kubectl-image: docker.io/docker.io/appuio/oc:v4.14
  # Vault variant
  - component: $CI_SERVER_FQDN/to-be-continuous/kubernetes/gitlab-ci-k8s-vault@7.3.1
    inputs:
+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@
    {
      "name": "K8S_KUBECTL_IMAGE",
      "description": "The Docker image used to run Kubernetes `kubectl` commands - **set the version required by your Kubernetes server**",
      "default": "registry.hub.docker.com/bitnami/kubectl:latest"
      "default": "docker.io/bitnami/kubectl:latest"
    },
    {
      "name": "K8S_DEFAULT_KUBE_CONFIG",
@@ -76,7 +76,7 @@
        {
          "name": "K8S_KUBE_SCORE_IMAGE",
          "description": "Docker image to run [kube-score](https://github.com/zegl/kube-score)",
          "default": "registry.hub.docker.com/zegl/kube-score:latest"
          "default": "docker.io/zegl/kube-score:latest"
        },
        {
          "name": "K8S_SCORE_EXTRA_OPTS",
+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ spec:
  inputs:
    kubectl-image:
      description: The Docker image used to run Kubernetes `kubectl` commands - **set the version required by your Kubernetes server**
      default: registry.hub.docker.com/bitnami/kubectl:latest
      default: docker.io/bitnami/kubectl:latest
    url:
      description: Global Kubernetes API url (only define if using exploded kubeconfig parameters)
      default: ''
@@ -53,7 +53,7 @@ spec:
      default: false
    kube-score-image:
      description: Docker image to run [kube-score](https://github.com/zegl/kube-score)
      default: registry.hub.docker.com/zegl/kube-score:latest
      default: docker.io/zegl/kube-score:latest
    score-extra-opts:
      description: Additional [kube-score options](https://github.com/zegl/kube-score#configuration)
      default: ''