From a9eaaf4a7c51d11afd5821d6176e35f4d664d4ff Mon Sep 17 00:00:00 2001 From: John Murret Date: Tue, 20 Sep 2022 10:27:54 -0600 Subject: [PATCH] Update consul-helm-test image and CI to go 1.18 (#1498) * using the current circleci go image for 1.18 * updating consul-helm-test image to v0.12.0 --- .circleci/config.yml | 22 +++++++++++----------- .github/workflows/test.yml | 2 +- charts/consul/test/docker/Test.dockerfile | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f2264efd61..35d86cb13c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -485,7 +485,7 @@ jobs: unit-test-helm-templates: docker: - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.11.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.12.0 steps: - checkout @@ -596,7 +596,7 @@ jobs: ########################## cleanup-gcp-resources: docker: - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.11.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.12.0 steps: - run: name: cleanup leftover resources @@ -614,7 +614,7 @@ jobs: cleanup-azure-resources: docker: - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.11.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.12.0 steps: - run: name: cleanup leftover resources @@ -632,7 +632,7 @@ jobs: cleanup-eks-resources: docker: - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.11.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.12.0 steps: - checkout - run: @@ -659,7 +659,7 @@ jobs: - TEST_RESULTS: /tmp/test-results docker: # This image is built from test/docker/Test.dockerfile - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.11.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.12.0 steps: - run: @@ -727,7 +727,7 @@ jobs: - TEST_RESULTS: /tmp/test-results docker: # This image is built from test/docker/Test.dockerfile - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.11.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.12.0 steps: - run: @@ -795,7 +795,7 @@ jobs: - TEST_RESULTS: /tmp/test-results docker: # This image is built from test/docker/Test.dockerfile - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.11.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.12.0 steps: - checkout @@ -852,7 +852,7 @@ jobs: - TEST_RESULTS: /tmp/test-results docker: # This image is built from test/docker/Test.dockerfile - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.11.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.12.0 steps: - checkout @@ -908,7 +908,7 @@ jobs: - TEST_RESULTS: /tmp/test-results docker: # This image is built from test/docker/Test.dockerfile - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.11.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.12.0 steps: - checkout @@ -971,7 +971,7 @@ jobs: - TEST_RESULTS: /tmp/test-results docker: # This image is built from test/docker/Test.dockerfile - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.11.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.12.0 steps: - checkout @@ -1034,7 +1034,7 @@ jobs: parallelism: 1 docker: # This image is built from test/docker/Test.dockerfile - - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.11.0 + - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.12.0 steps: - checkout diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4d651e8769..ce1033a540 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -74,7 +74,7 @@ jobs: - unit-helm-gen runs-on: ubuntu-latest container: - image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.11.0 + image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.12.0 options: --user 1001 steps: - name: Checkout code diff --git a/charts/consul/test/docker/Test.dockerfile b/charts/consul/test/docker/Test.dockerfile index fdf51b162e..2fccf196d3 100644 --- a/charts/consul/test/docker/Test.dockerfile +++ b/charts/consul/test/docker/Test.dockerfile @@ -6,7 +6,7 @@ # a script to configure kubectl, potentially install Helm, and run the tests # manually. This image only has the dependencies pre-installed. -FROM circleci/golang:1.18 +FROM cimg/go:1.18 # change the user to root so we can install stuff USER root