Skip to content

Commit 3df745d

Browse files
authored
chore: integration test fixes (#1301)
1 parent 19f59c4 commit 3df745d

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

modules/acm/creds.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ resource "time_sleep" "wait_acm" {
2525
count = (var.create_ssh_key == true || var.ssh_auth_key != null) ? 1 : 0
2626
depends_on = [google_gke_hub_feature_membership.main]
2727

28-
create_duration = "30s"
28+
create_duration = "60s"
2929
}
3030

3131
resource "kubernetes_secret_v1" "creds" {

test/integration/simple_autopilot_public/controls/gcloud.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
describe "cluster" do
3434
it "is running" do
35-
expect(data['status']).to eq 'RUNNING'
35+
expect(data['status']).to eq('RUNNING').or eq('RECONCILING')
3636
end
3737

3838
it "is autopilot" do

test/setup/main.tf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ module "gke-project-1" {
5353
org_id = var.org_id
5454
folder_id = var.folder_id
5555
billing_account = var.billing_account
56+
# due to https://github.com/hashicorp/terraform-provider-google/issues/9505 for AP
57+
default_service_account = "keep"
5658

5759
auto_create_network = true
5860

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

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

98104
activate_apis = local.apis
99105
}

0 commit comments

Comments
 (0)