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

Jump to bottom

fix: various fix to address CI issues #1248

Merged
merged 1 commit into from
May 12, 2022
Merged

fix: various fix to address CI issues #1248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion examples/node_pool/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ module "gke" {
accelerator_count = 1
accelerator_type = "nvidia-tesla-a100"
gpu_partition_size = "1g.5gb"
image_type = "COS"
auto_repair = false
service_account = var.compute_engine_service_account
},
Expand Down
1 change: 0 additions & 1 deletion examples/node_pool_update_variant/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ module "gke" {
disk_type = "pd-standard"
accelerator_count = 1
accelerator_type = "nvidia-tesla-p4"
image_type = "COS"
auto_repair = false
service_account = var.compute_engine_service_account
},
Expand Down
1 change: 0 additions & 1 deletion examples/node_pool_update_variant_beta/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ module "gke" {
disk_type = "pd-standard"
accelerator_count = 1
accelerator_type = "nvidia-tesla-p4"
image_type = "COS"
auto_repair = false
service_account = var.compute_engine_service_account
},
Expand Down
1 change: 0 additions & 1 deletion examples/node_pool_update_variant_public_beta/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ module "gke" {
disk_type = "pd-standard"
accelerator_count = 1
accelerator_type = "nvidia-tesla-p4"
image_type = "COS"
auto_repair = false
service_account = var.compute_engine_service_account
},
Expand Down
1 change: 0 additions & 1 deletion examples/regional_private_node_pool_oauth_scopes/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ module "gke" {
max_count = 1
disk_size_gb = 100
disk_type = "pd-ssd"
image_type = "COS"
auto_repair = true
auto_upgrade = false
preemptible = false
Expand Down
1 change: 1 addition & 0 deletions examples/safer_cluster_iap_bastion/apis.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ module "enabled_google_apis" {
disable_services_on_destroy = false

activate_apis = [
"serviceusage.googleapis.com",
"iam.googleapis.com",
"compute.googleapis.com",
"logging.googleapis.com",
Expand Down
1 change: 0 additions & 1 deletion examples/simple_regional_private/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ module "gke" {
local_ssd_count = 0
disk_size_gb = 100
disk_type = "pd-standard"
image_type = "COS"
auto_repair = true
auto_upgrade = true
service_account = var.compute_engine_service_account
Expand Down
1 change: 0 additions & 1 deletion test/fixtures/sandbox_enabled/example.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ module "example" {
node_pools = [
{
name = "default-node-pool"
image_type = "COS_CONTAINERD"
machine_type = "n1-standard-2"
},
]
Expand Down
5 changes: 5 additions & 0 deletions test/fixtures/simple_zonal/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,8 @@ output "ca_certificate" {
value = module.example.ca_certificate
sensitive = true
}

output "service_account" {
description = "The service account to default running nodes as if not overridden in `node_pools`."
value = module.example.service_account
}
2 changes: 1 addition & 1 deletion test/integration/node_pool/controls/gcloud.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@
including(
"name" => "pool-02",
"config" => including(
"imageType" => "COS",
"imageType" => "COS_CONTAINERD",
),
)
)
Expand Down
2 changes: 1 addition & 1 deletion test/integration/simple_autopilot_private/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