Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Install gke-gcloud-auth-plugin into acceptance test image to fix warnings on GKE #1553

Merged
merged 2 commits into from
Sep 28, 2022
Merged

Install gke-gcloud-auth-plugin into acceptance test image to fix warnings on GKE #1553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9861a9
running TestBasicInstallation in GKE with gke-gcloud-auth-plugin
jmurret Sep 28, 2022
107e281
using current consul-helm-test image
jmurret Sep 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ jobs:

unit-test-helm-templates:
docker:
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.13.0
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.14.0

steps:
- checkout
Expand Down Expand Up @@ -597,7 +597,7 @@ jobs:
##########################
cleanup-gcp-resources:
docker:
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.13.0
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.14.0
steps:
- run:
name: cleanup leftover resources
Expand All @@ -615,7 +615,7 @@ jobs:

cleanup-azure-resources:
docker:
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.13.0
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.14.0
steps:
- run:
name: cleanup leftover resources
Expand All @@ -633,7 +633,7 @@ jobs:

cleanup-eks-resources:
docker:
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.13.0
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.14.0
steps:
- checkout
- run:
Expand All @@ -658,9 +658,10 @@ jobs:
parallelism: 2
environment:
- TEST_RESULTS: /tmp/test-results
- USE_GKE_GCLOUD_AUTH_PLUGIN: true
docker:
# This image is built from test/docker/Test.dockerfile
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.13.0
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.14.0

steps:
- run:
Expand Down Expand Up @@ -726,9 +727,10 @@ jobs:
parallelism: 2
environment:
- TEST_RESULTS: /tmp/test-results
- USE_GKE_GCLOUD_AUTH_PLUGIN: true
docker:
# This image is built from test/docker/Test.dockerfile
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.13.0
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.14.0

steps:
- run:
Expand Down Expand Up @@ -796,7 +798,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.13.0
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.14.0

steps:
- checkout
Expand Down Expand Up @@ -853,7 +855,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.13.0
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.14.0

steps:
- checkout
Expand Down Expand Up @@ -909,7 +911,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.13.0
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.14.0

steps:
- checkout
Expand Down Expand Up @@ -972,7 +974,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.13.0
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.14.0

steps:
- checkout
Expand Down Expand Up @@ -1035,7 +1037,7 @@ jobs:
parallelism: 1
docker:
# This image is built from test/docker/Test.dockerfile
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.13.0
- image: docker.mirror.hashicorp.services/hashicorpdev/consul-helm-test:0.14.0

steps:
- checkout
Expand Down
6 changes: 5 additions & 1 deletion charts/consul/test/docker/Test.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ RUN apt-get install -y \
RUN pip3 install yq

# gcloud
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && apt-get update -y && apt-get install google-cloud-sdk -y
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && \
apt-get update -y && \
apt-get install google-cloud-sdk -y && \
apt-get install google-cloud-sdk-gke-gcloud-auth-plugin

# terraform
RUN curl -sSL https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip -o /tmp/tf.zip \
Expand Down