From 96b8c98b3b7c6db1a7eb59acc85650fc6322cc3e Mon Sep 17 00:00:00 2001 From: Theron Voran Date: Mon, 11 Oct 2021 14:12:55 -0700 Subject: [PATCH] Updating acceptance tests (#624) GKE's stable K8s version is now 1.19. Also adding VAULT_LICENSE_CI to the `make test-acceptance` target to make it easier to run the acceptance tests manually, and mentioned it in the test README. --- Makefile | 1 + test/README.md | 2 ++ test/terraform/main.tf | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e4e9df1..0ac6850 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,7 @@ else -e GOOGLE_CREDENTIALS=${GOOGLE_CREDENTIALS} \ -e CLOUDSDK_CORE_PROJECT=${CLOUDSDK_CORE_PROJECT} \ -e KUBECONFIG=/helm-test/.kube/config \ + -e VAULT_LICENSE_CI=${VAULT_LICENSE_CI} \ -w /helm-test \ $(TEST_IMAGE) \ make acceptance diff --git a/test/README.md b/test/README.md index fdd586f..951a061 100644 --- a/test/README.md +++ b/test/README.md @@ -4,6 +4,8 @@ The Makefile at the top level of this repo contains a few target that should help with running acceptance tests in your own GKE instance or in a kind cluster. +Note that for the Vault Enterprise tests to pass, a `VAULT_LICENSE_CI` environment variable needs to be set to the contents of a valid Vault Enterprise license. + ### Running in a GKE cluster * Set the `GOOGLE_CREDENTIALS` and `CLOUDSDK_CORE_PROJECT` variables at the top of the file. `GOOGLE_CREDENTIALS` should contain the local path to your Google Cloud Platform account credentials in JSON format. `CLOUDSDK_CORE_PROJECT` should be set to the ID of your GCP project. diff --git a/test/terraform/main.tf b/test/terraform/main.tf index c56f409..5c3570f 100644 --- a/test/terraform/main.tf +++ b/test/terraform/main.tf @@ -8,7 +8,7 @@ resource "random_id" "suffix" { data "google_container_engine_versions" "main" { location = "${var.zone}" - version_prefix = "1.18." + version_prefix = "1.19." } data "google_service_account" "gcpapi" {