Commit ef89e38b authored by Bertrand Goareguer's avatar Bertrand Goareguer Committed by Cédric OLIVIER
Browse files

fix: "Add registry name in all Docker images"

parent c4e5f8a1

README.md

+2 −2
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ The Kubernetes template uses some global configuration used throughout all jobs. 


| Name                  | description                            | default value     |

| --------------------- | -------------------------------------- | ----------------- |

| `K8S_KUBECTL_IMAGE`    | the Docker image used to run Kubernetes `kubectl` commands <br/>:warning: **set the version required by your Kubernetes server** | `bitnami/kubectl:latest` |

| `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` |

| `K8S_BASE_APP_NAME`    | default application name              | `$CI_PROJECT_NAME` ([see GitLab doc](https://docs.gitlab.com/ee/ci/variables/predefined_variables.html)) |

| `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_ |

| :lock: `K8S_DEFAULT_KUBE_CONFIG`| The default kubeconfig to use (either content or file variable) | **required if not using exploded kubeconfig parameters** |
@@ -442,7 +442,7 @@ Here are its parameters: 


| Name                   | description                                                          | default value     |

| ---------------------- | -------------------------------------------------------------------- | ----------------- |

| `K8S_KUBE_SCORE_IMAGE` | Docker image to run [kube-score](https://github.com/zegl/kube-score) | `zegl/kube-score:latest-kustomize` **it is recommended to set a tool version compatible with your Kubernetes cluster** |

| `K8S_KUBE_SCORE_IMAGE` | Docker image to run [kube-score](https://github.com/zegl/kube-score) | `registry.hub.docker.com/zegl/kube-score:latest-kustomize` **it is recommended to set a tool version compatible with your Kubernetes cluster** |

| `K8S_SCORE_DISABLED`   | Set to `true` to disable the `kube-score` analysis                             | _none_ (enabled) |

| `K8S_SCORE_EXTRA_OPTS` | [Additional options](https://github.com/zegl/kube-score#configuration) to `kube-score` command line | _none_ |

kicker.json

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
    {

      "name": "K8S_KUBECTL_IMAGE",

      "description": "The Docker image used to run Kubernetes `kubectl` commands - **set the version required by your Kubernetes server**",

      "default": "bitnami/kubectl:latest"

      "default": "registry.hub.docker.com/bitnami/kubectl:latest"

    },

    {

      "name": "K8S_DEFAULT_KUBE_CONFIG",
@@ -63,7 +63,7 @@ 
        {

          "name": "  K8S_KUBE_SCORE_IMAGE",

          "description": "Docker image to run [kube-score](https://github.com/zegl/kube-score)",

          "default": "zegl/kube-score:latest-kustomize"

          "default": "registry.hub.docker.com/zegl/kube-score:latest-kustomize"

        },

        {

          "name": "K8S_SCORE_EXTRA_OPTS",

templates/gitlab-ci-k8s.yml

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ variables: 
  TBC_TRACKING_IMAGE: "$CI_REGISTRY/to-be-continuous/tools/tracking:master"



  # Docker Image with Kubernetes CLI tool (can be overridden)

  K8S_KUBECTL_IMAGE: "bitnami/kubectl:latest"

  K8S_KUBE_SCORE_IMAGE: "zegl/kube-score:latest"

  K8S_KUBECTL_IMAGE: "registry.hub.docker.com/bitnami/kubectl:latest"

  K8S_KUBE_SCORE_IMAGE: "registry.hub.docker.com/zegl/kube-score:latest"

  K8S_BASE_APP_NAME: "$CI_PROJECT_NAME"

  K8S_SCRIPTS_DIR: "."

  K8S_REVIEW_ENVIRONMENT_SCHEME: "https"