From 0e96d077cdd2024ef5ce43632df5ecbc7f541a1b Mon Sep 17 00:00:00 2001 From: Matt Farina Date: Tue, 18 Sep 2018 11:28:25 -0400 Subject: [PATCH] Updated image details to point people to Quay (#22) --- README.md | 10 +++++----- build.sh | 4 ++++ examples/docker-for-mac/my_test.sh | 2 +- examples/gke/Dockerfile | 2 +- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 1c1a27c..cf27e36 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ It supports linting and testing charts that have changed against a target branch ## Prerequisites -It is recommended to use the provided Docker image. +It is recommended to use the provided Docker image which can be [found on Quay](quay.io/helmpack/chart-testing/). It comes with all necessary tools installed. * Bash 4.4 (https://tiswww.case.edu/php/chet/bash/bashtop.html) @@ -84,7 +84,7 @@ chart-test.sh ### Linting Charts ```shell -docker run --rm -v "$(pwd):/workdir" --workdir /workdir gcr.io/kubernetes-charts-ci/chart-testing:v1.0.5 chart_test.sh --no-install --config .mytestenv +docker run --rm -v "$(pwd):/workdir" --workdir /workdir quay.io/helmpack/chart-testing:v1.0.5 chart_test.sh --no-install --config .mytestenv ``` *Sample Output* @@ -144,8 +144,8 @@ Done. ### Installing and Testing Charts Installing a chart requires access to a Kubernetes cluster. -You may have to create your own Docker image that extends from `gcr.io/kubernetes-charts-ci/chart-testing:v1.0.5` in order to install additional tools (e. g. `google-cloud-sdk` for GKE). -You could run a container in the background, run the required steps to authenticatre and initialize the `kubectl` context before you, and eventually run `chart_test.sh`. +You may have to create your own Docker image that extends from `quay.io/helmpack/chart-testing:v1.0.5` in order to install additional tools (e. g. `google-cloud-sdk` for GKE). +A container from such an image could run steps to authenticate to a Kubernetes cluster, where it initializes the `kubectl` context, before running `chart_test.sh`. Charts are installed into newly created namespaces that will be deleted again afterwards. By default, they are named by the chart, which may not be a good idea, especially when multiple PR jobs could be running for the same chart. @@ -153,7 +153,7 @@ By default, they are named by the chart, which may not be a good idea, especiall Make sure you set it based on the pull request number. ```shell -docker run --rm -v "$(pwd):/workdir" --workdir /workdir gcr.io/kubernetes-charts-ci/chart-testing:v1.0.5 chart_test.sh --no-lint --config .mytestenv +docker run --rm -v "$(pwd):/workdir" --workdir /workdir quay.io/helmpack/chart-testing:v1.0.5 chart_test.sh --no-lint --config .mytestenv ``` #### GKE Example diff --git a/build.sh b/build.sh index eea7fab..8f9e409 100755 --- a/build.sh +++ b/build.sh @@ -19,6 +19,10 @@ set -o nounset set -o pipefail readonly IMAGE_TAG=v1.0.5 + +# The image goes into two repositories. quay.io/helmpack/chart-testing is used +# for public consumption and is built by Quay via a webhook. The below image +# is close to the CI environment used by charts where we also push it. readonly IMAGE_REPOSITORY="gcr.io/kubernetes-charts-ci/chart-testing" readonly SCRIPT_DIR=$(dirname "$(readlink -f "$0")") diff --git a/examples/docker-for-mac/my_test.sh b/examples/docker-for-mac/my_test.sh index eb674fe..1cf40a7 100755 --- a/examples/docker-for-mac/my_test.sh +++ b/examples/docker-for-mac/my_test.sh @@ -19,7 +19,7 @@ set -o nounset set -o pipefail readonly IMAGE_TAG=v1.0.5 -readonly IMAGE_REPOSITORY="gcr.io/kubernetes-charts-ci/chart-testing" +readonly IMAGE_REPOSITORY="quay.io/helmpack/chart-testing" main() { local testcontainer_id diff --git a/examples/gke/Dockerfile b/examples/gke/Dockerfile index f8fec8e..1c0a986 100644 --- a/examples/gke/Dockerfile +++ b/examples/gke/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM gcr.io/kubernetes-charts-ci/chart-testing:v1.0.5 +FROM quay.io/helmpack/chart-testing:v1.0.5 ENV PATH /google-cloud-sdk/bin:$PATH ARG CLOUD_SDK_VERSION=200.0.0