Merge pull request #2718 from ziyue-101/deflake-gke-hub-test

Deflake test using regional memberships
GoogleCloudPlatform · Sep 18, 2024 · 8fe8c6d · 8fe8c6d
2 parents 0d79a26 + 22af044
commit 8fe8c6d
Show file tree

Hide file tree

Showing 15 changed files with 94 additions and 145 deletions.
diff --git a/...cacmgkehubfeaturemembership/_generated_object_basicacmgkehubfeaturemembership.golden.yaml b/...cacmgkehubfeaturemembership/_generated_object_basicacmgkehubfeaturemembership.golden.yaml
@@ -25,15 +25,11 @@ spec:
         syncRev: HEAD
         syncWaitSecs: "20"
       sourceFormat: hierarchy
-    hierarchyController:
-      enableHierarchicalResourceQuota: true
-      enablePodTreeLabels: true
-      enabled: true
     version: 1.18.1
   featureRef:
     name: gkehubfeature-basic-acm-${uniqueId}
   location: global
-  membershipLocation: global
+  membershipLocation: us-central1
   membershipRef:
     name: gkehubmembership-basic-acm-${uniqueId}
   projectRef:

diff --git a/...ta/basic/gkehub/v1beta1/gkehubfeaturemembership/basicacmgkehubfeaturemembership/_http.log b/...ta/basic/gkehub/v1beta1/gkehubfeaturemembership/basicacmgkehubfeaturemembership/_http.log
@@ -974,7 +974,7 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://gkehub.googleapis.com/v1beta1/projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}?alt=json
+GET https://gkehub.googleapis.com/v1beta1/projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -992,14 +992,14 @@ X-Xss-Protection: 0
 {
   "error": {
     "code": 404,
-    "message": "membership \"projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}\" not found",
+    "message": "membership \"projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}\" not found",
     "status": "NOT_FOUND"
   }
 }
 
 ---
 
-POST https://gkehub.googleapis.com/v1beta1/projects/example-project-01/locations/global/memberships?alt=json&membershipId=gkehubmembership-basic-acm-${uniqueId}
+POST https://gkehub.googleapis.com/v1beta1/projects/example-project-01/locations/us-central1/memberships?alt=json&membershipId=gkehubmembership-basic-acm-${uniqueId}
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -1017,7 +1017,7 @@ User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
     "cnrm-test": "true",
     "managed-by-cnrm": "true"
   },
-  "name": "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}"
+  "name": "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}"
 }
 
 200 OK
@@ -1036,14 +1036,14 @@ X-Xss-Protection: 0
     "@type": "type.googleapis.com/google.cloud.gkehub.v1beta1.OperationMetadata",
     "createTime": "2024-04-01T12:34:56.123456Z",
     "endTime": "2024-04-01T12:34:56.123456Z",
-    "target": "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}"
+    "target": "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}"
   },
-  "name": "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}/operations/${operationID}"
+  "name": "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}/operations/${operationID}"
 }
 
 ---
 
-GET https://gkehub.googleapis.com/v1beta1/projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}/operations/${operationID}?alt=json
+GET https://gkehub.googleapis.com/v1beta1/projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}/operations/${operationID}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -1064,9 +1064,9 @@ X-Xss-Protection: 0
     "@type": "type.googleapis.com/google.cloud.gkehub.v1beta1.OperationMetadata",
     "createTime": "2024-04-01T12:34:56.123456Z",
     "endTime": "2024-04-01T12:34:56.123456Z",
-    "target": "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}"
+    "target": "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}"
   },
-  "name": "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}/operations/${operationID}",
+  "name": "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}/operations/${operationID}",
   "response": {
     "@type": "type.googleapis.com/google.cloud.gkehub.v1beta1.Membership",
     "authority": {
@@ -1087,7 +1087,7 @@ X-Xss-Protection: 0
       "cnrm-test": "true",
       "managed-by-cnrm": "true"
     },
-    "name": "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}",
+    "name": "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}",
     "state": {
       "code": "READY"
     },
@@ -1098,7 +1098,7 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://gkehub.googleapis.com/v1beta1/projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}?alt=json
+GET https://gkehub.googleapis.com/v1beta1/projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -1132,7 +1132,7 @@ X-Xss-Protection: 0
     "cnrm-test": "true",
     "managed-by-cnrm": "true"
   },
-  "name": "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}",
+  "name": "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}",
   "state": {
     "code": "READY"
   },
@@ -1176,7 +1176,7 @@ User-Agent: kcc/controller-manager
     "managed-by-cnrm": "true"
   },
   "membershipSpecs": {
-    "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}": {
+    "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}": {
       "configmanagement": {
         "configSync": {
           "sourceFormat": "unstructured"
@@ -1241,7 +1241,7 @@ X-Xss-Protection: 0
       "managed-by-cnrm": "true"
     },
     "membershipSpecs": {
-      "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}": {
+      "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}": {
         "configmanagement": {
           "configSync": {
             "sourceFormat": "unstructured"
@@ -1280,7 +1280,7 @@ X-Xss-Protection: 0
     "managed-by-cnrm": "true"
   },
   "membershipSpecs": {
-    "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}": {
+    "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}": {
       "configmanagement": {
         "configSync": {
           "sourceFormat": "unstructured"
@@ -1305,7 +1305,7 @@ User-Agent: kcc/controller-manager
     "managed-by-cnrm": "true"
   },
   "membershipSpecs": {
-    "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}": {
+    "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}": {
       "configmanagement": {
         "configSync": {
           "git": {
@@ -1320,11 +1320,6 @@ User-Agent: kcc/controller-manager
           },
           "sourceFormat": "hierarchy"
         },
-        "hierarchyController": {
-          "enableHierarchicalResourceQuota": true,
-          "enablePodTreeLabels": true,
-          "enabled": true
-        },
         "version": "1.18.1"
       }
     }
@@ -1386,7 +1381,7 @@ X-Xss-Protection: 0
       "managed-by-cnrm": "true"
     },
     "membershipSpecs": {
-      "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}": {
+      "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}": {
         "configmanagement": {
           "configSync": {
             "git": {
@@ -1401,11 +1396,6 @@ X-Xss-Protection: 0
             },
             "sourceFormat": "hierarchy"
           },
-          "hierarchyController": {
-            "enableHierarchicalResourceQuota": true,
-            "enablePodTreeLabels": true,
-            "enabled": true
-          },
           "version": "1.18.1"
         }
       }
@@ -1440,7 +1430,7 @@ X-Xss-Protection: 0
     "managed-by-cnrm": "true"
   },
   "membershipSpecs": {
-    "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}": {
+    "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}": {
       "configmanagement": {
         "configSync": {
           "git": {
@@ -1455,11 +1445,6 @@ X-Xss-Protection: 0
           },
           "sourceFormat": "hierarchy"
         },
-        "hierarchyController": {
-          "enableHierarchicalResourceQuota": true,
-          "enablePodTreeLabels": true,
-          "enabled": true
-        },
         "version": "1.18.1"
       }
     }
@@ -1480,7 +1465,7 @@ User-Agent: kcc/controller-manager
     "managed-by-cnrm": "true"
   },
   "membershipSpecs": {
-    "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}": {}
+    "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}": {}
   },
   "name": "projects/example-project-01/locations/global/features/configmanagement",
   "updateTime": "2024-04-01T12:34:56.123456Z"
@@ -1539,7 +1524,7 @@ X-Xss-Protection: 0
       "managed-by-cnrm": "true"
     },
     "membershipSpecs": {
-      "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}": {}
+      "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}": {}
     },
     "name": "projects/example-project-01/locations/global/features/configmanagement",
     "resourceState": {
@@ -1551,7 +1536,7 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://gkehub.googleapis.com/v1beta1/projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}?alt=json
+GET https://gkehub.googleapis.com/v1beta1/projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -1585,7 +1570,7 @@ X-Xss-Protection: 0
     "cnrm-test": "true",
     "managed-by-cnrm": "true"
   },
-  "name": "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}",
+  "name": "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}",
   "state": {
     "code": "READY"
   },
@@ -1595,7 +1580,7 @@ X-Xss-Protection: 0
 
 ---
 
-DELETE https://gkehub.googleapis.com/v1beta1/projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}?alt=json
+DELETE https://gkehub.googleapis.com/v1beta1/projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -1616,17 +1601,17 @@ X-Xss-Protection: 0
     "@type": "type.googleapis.com/google.cloud.gkehub.v1beta1.OperationMetadata",
     "createTime": "2024-04-01T12:34:56.123456Z",
     "endTime": "2024-04-01T12:34:56.123456Z",
-    "target": "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}"
+    "target": "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}"
   },
-  "name": "projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}/operations/${operationID}",
+  "name": "projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}/operations/${operationID}",
   "response": {
     "@type": "type.googleapis.com/google.cloud.gkehub.v1beta1.Membership"
   }
 }
 
 ---
 
-GET https://gkehub.googleapis.com/v1beta1/projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}?alt=json
+GET https://gkehub.googleapis.com/v1beta1/projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}?alt=json
 Content-Type: application/json
 User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
 
@@ -1644,7 +1629,7 @@ X-Xss-Protection: 0
 {
   "error": {
     "code": 404,
-    "message": "membership \"projects/example-project-01/locations/global/memberships/gkehubmembership-basic-acm-${uniqueId}\" not found",
+    "message": "membership \"projects/example-project-01/locations/us-central1/memberships/gkehubmembership-basic-acm-${uniqueId}\" not found",
     "status": "NOT_FOUND"
   }
 }

diff --git a/.../basic/gkehub/v1beta1/gkehubfeaturemembership/basicacmgkehubfeaturemembership/create.yaml b/.../basic/gkehub/v1beta1/gkehubfeaturemembership/basicacmgkehubfeaturemembership/create.yaml
@@ -20,6 +20,7 @@ spec:
   projectRef:
     name: gkehubfm-${uniqueId}
   location: global
+  membershipLocation: us-central1
   membershipRef:
     name: gkehubmembership-basic-acm-${uniqueId}
   featureRef:

diff --git a/.../gkehub/v1beta1/gkehubfeaturemembership/basicacmgkehubfeaturemembership/dependencies.yaml b/.../gkehub/v1beta1/gkehubfeaturemembership/basicacmgkehubfeaturemembership/dependencies.yaml
@@ -102,7 +102,7 @@ metadata:
     cnrm.cloud.google.com/project-id: ${TEST_DEPENDENT_ORG_PROJECT_ID}
   name: gkehubmembership-basic-acm-${uniqueId}
 spec:
-  location: global
+  location: us-central1
   authority:
     issuer: https://container.googleapis.com/v1/projects/${TEST_DEPENDENT_ORG_PROJECT_ID_WITHOUT_QUOTATION}/locations/us-central1-a/clusters/gke-basic-acm-${uniqueId}
   description: A sample GKE Hub membership

diff --git a/.../basic/gkehub/v1beta1/gkehubfeaturemembership/basicacmgkehubfeaturemembership/update.yaml b/.../basic/gkehub/v1beta1/gkehubfeaturemembership/basicacmgkehubfeaturemembership/update.yaml
@@ -20,7 +20,7 @@ spec:
   projectRef:
     name: gkehubfm-${uniqueId}
   location: global
-  membershipLocation: global
+  membershipLocation: us-central1
   membershipRef:
     name: gkehubmembership-basic-acm-${uniqueId}
   featureRef:
@@ -38,8 +38,4 @@ spec:
         syncWaitSecs: "20"
         syncRev: "HEAD"
         secretType: "none"
-    hierarchyController:
-      enabled: true
-      enablePodTreeLabels: true
-      enableHierarchicalResourceQuota: true
     version: "1.18.1"
diff --git a/...llacmgkehubfeaturemembership/_generated_object_fullacmgkehubfeaturemembership.golden.yaml b/...llacmgkehubfeaturemembership/_generated_object_fullacmgkehubfeaturemembership.golden.yaml
@@ -25,15 +25,11 @@ spec:
         syncRev: 264b37c21ef77165d8639d77b23d4ebb8fee053c
         syncWaitSecs: "30"
       sourceFormat: hierarchy
-    hierarchyController:
-      enableHierarchicalResourceQuota: false
-      enablePodTreeLabels: false
-      enabled: false
     version: 1.18.2
   featureRef:
     name: gkehubfeature-full-acm-${uniqueId}
   location: global
-  membershipLocation: global
+  membershipLocation: us-central1
   membershipRef:
     name: gkehubmembership-full-acm-${uniqueId}
   projectRef: