Skip to content

chore: integration test fixes #1301

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

Merged
merged 2 commits into from
Jun 22, 2022
Merged

chore: integration test fixes #1301

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
a52c66c
chore: integration test fixes
bharathkkb Jun 22, 2022
d1c65c3
Merge branch 'master' into int-fixes
bharathkkb Jun 22, 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
2 changes: 1 addition & 1 deletion modules/acm/creds.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ resource "time_sleep" "wait_acm" {
count = (var.create_ssh_key == true || var.ssh_auth_key != null) ? 1 : 0
depends_on = [google_gke_hub_feature_membership.main]

create_duration = "30s"
create_duration = "60s"
}

resource "kubernetes_secret_v1" "creds" {
Expand Down
2 changes: 1 addition & 1 deletion test/integration/simple_autopilot_public/controls/gcloud.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

describe "cluster" do
it "is running" do
expect(data['status']).to eq 'RUNNING'
expect(data['status']).to eq('RUNNING').or eq('RECONCILING')
end

it "is autopilot" do
Expand Down
6 changes: 6 additions & 0 deletions test/setup/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ module "gke-project-1" {
org_id = var.org_id
folder_id = var.folder_id
billing_account = var.billing_account
# due to https://github.com/hashicorp/terraform-provider-google/issues/9505 for AP
default_service_account = "keep"

auto_create_network = true

Expand All @@ -74,6 +76,8 @@ module "gke-project-2" {
org_id = var.org_id
folder_id = var.folder_id
billing_account = var.billing_account
# due to https://github.com/hashicorp/terraform-provider-google/issues/9505 for AP
default_service_account = "keep"

activate_apis = local.apis
activate_api_identities = [
Expand All @@ -94,6 +98,8 @@ module "gke-project-asm" {
org_id = var.org_id
folder_id = var.folder_id
billing_account = var.billing_account
# due to https://github.com/hashicorp/terraform-provider-google/issues/9505 for AP
default_service_account = "keep"

activate_apis = local.apis
}