Skip to content

Commit 9f29278

Browse files
committed
make issuer field in Membership Authority an optional field and remove test runner binding from VCR test
1 parent 6e4da71 commit 9f29278

2 files changed

Lines changed: 2 additions & 15 deletions

File tree

mmv1/products/gkehub/Membership.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,5 +162,4 @@ properties:
162162
description: |
163163
A JSON Web Token (JWT) issuer URI. `issuer` must start with `https://` and // be a valid
164164
with length <2000 characters. For example: `https://container.googleapis.com/v1/projects/my-project/locations/us-west1/clusters/my-cluster`. If the cluster is provisioned with Terraform, this is `"https://container.googleapis.com/v1/${google_container_cluster.my-cluster.id}"`.
165-
required: true
166165
immutable: true

mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_feature_test.go

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -906,12 +906,6 @@ resource "google_gke_hub_membership" "membership" {
906906
project = google_project.project.project_id
907907
}
908908
909-
resource "google_project_iam_member" "test-runner-workload-identity-admin" {
910-
project = google_project.project.project_id
911-
role = "roles/iam.workloadIdentityPoolAdmin"
912-
member = "serviceAccount:hashicorp-test-runner@ci-test-project-188019.iam.gserviceaccount.com"
913-
}
914-
915909
resource "google_project_iam_member" "fleet-p4sa-workload-identity-admin" {
916910
project = google_project.project.project_id
917911
role = "roles/iam.workloadIdentityPoolAdmin"
@@ -920,7 +914,7 @@ resource "google_project_iam_member" "fleet-p4sa-workload-identity-admin" {
920914
}
921915
922916
resource "time_sleep" "wait_for_workload_identity_binding_propagation" {
923-
depends_on = [google_project_iam_member.test-runner-workload-identity-admin, google_project_iam_member.fleet-p4sa-workload-identity-admin]
917+
depends_on = [google_project_iam_member.fleet-p4sa-workload-identity-admin]
924918
create_duration = "60s"
925919
}
926920
@@ -966,12 +960,6 @@ resource "google_gke_hub_membership" "membership" {
966960
project = google_project.project.project_id
967961
}
968962
969-
resource "google_project_iam_member" "test-runner-workload-identity-admin" {
970-
project = google_project.project.project_id
971-
role = "roles/iam.workloadIdentityPoolAdmin"
972-
member = "serviceAccount:hashicorp-test-runner@ci-test-project-188019.iam.gserviceaccount.com"
973-
}
974-
975963
resource "google_project_iam_member" "fleet-p4sa-workload-identity-admin" {
976964
project = google_project.project.project_id
977965
role = "roles/iam.workloadIdentityPoolAdmin"
@@ -980,7 +968,7 @@ resource "google_project_iam_member" "fleet-p4sa-workload-identity-admin" {
980968
}
981969
982970
resource "time_sleep" "wait_for_workload_identity_binding_propagation" {
983-
depends_on = [google_project_iam_member.test-runner-workload-identity-admin, google_project_iam_member.fleet-p4sa-workload-identity-admin]
971+
depends_on = [google_project_iam_member.fleet-p4sa-workload-identity-admin]
984972
create_duration = "60s"
985973
}
986974

0 commit comments

Comments
 (0)