Skip to content

Commit 01c38e2

Browse files
code review changes
1 parent 7d20b84 commit 01c38e2

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

build/int.cloudbuild.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -471,6 +471,21 @@ steps:
471471
- verify simple-fleet-app-operator-permissions
472472
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
473473
args: ['/bin/bash', '-c', 'cft test run TestSimpleFleetAppOperatorPermissions --stage teardown --verbose']
474+
- id: apply test-confidential-safer-cluster
475+
waitFor:
476+
- create-all
477+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
478+
args: ['/bin/bash', '-c', 'cft test run TestConfidentialSaferCluster --stage apply --verbose']
479+
- id: verify test-confidential-safer-cluster
480+
waitFor:
481+
- apply test-confidential-safer-cluster
482+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
483+
args: ['/bin/bash', '-c', 'cft test run TestConfidentialSaferCluster --stage verify --verbose']
484+
- id: teardown test-confidential-safer-cluster
485+
waitFor:
486+
- verify test-confidential-safer-cluster
487+
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
488+
args: ['/bin/bash', '-c', 'cft test run TestConfidentialSaferCluster --stage teardown --verbose']
474489
tags:
475490
- 'ci'
476491
- 'integration'

examples/confidential_safer_cluster/network.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,11 @@
1616

1717
module "gcp-network" {
1818
source = "terraform-google-modules/network/google"
19-
version = ">= 7.5"
19+
version = "~> 10.0"
2020

2121
project_id = var.project_id
2222
network_name = local.network_name
23+
routing_mode = "GLOBAL"
2324

2425
subnets = [
2526
{

examples/confidential_safer_cluster/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">= 0.13"
18+
required_version = ">= 1.3"
1919
required_providers {
2020
google = {
2121
source = "hashicorp/google"

test/integration/confidential_safer_cluster/confidential_safer_cluster_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ func TestConfidentialSaferCluster(t *testing.T) {
3232
bpt.DefineVerify(func(assert *assert.Assertions) {
3333
// Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token
3434
// bpt.DefaultVerify(assert)
35+
testutils.TGKEVerify(t, bpt, assert)
3536

3637
projectId := bpt.GetStringOutput("project_id")
3738
location := bpt.GetStringOutput("location")

0 commit comments

Comments
 (0)