turn on gkehubfeaturemembership direct controller

ziyue-101 · Nov 15, 2024 · af9ea23 · af9ea23
1 parent b113a9a
commit af9ea23
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 477 deletions.
diff --git a/apis/gkehub/v1beta1/featuremembership_types.go b/apis/gkehub/v1beta1/featuremembership_types.go
@@ -303,7 +303,7 @@ type GKEHubFeatureMembershipStatus struct {
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:resource:categories=gcp,shortName=gcpgkehubfeaturemembership;gcpgkehubfeaturememberships
 // +kubebuilder:subresource:status
-// +kubebuilder:metadata:labels="cnrm.cloud.google.com/dcl2crd=true";"cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/stability-level=stable";"cnrm.cloud.google.com/system=true"
+// +kubebuilder:metadata:labels="cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/stability-level=stable";"cnrm.cloud.google.com/system=true"
 // +kubebuilder:printcolumn:name="Age",JSONPath=".metadata.creationTimestamp",type="date"
 // +kubebuilder:printcolumn:name="Ready",JSONPath=".status.conditions[?(@.type=='Ready')].status",type="string",description="When 'True', the most recent reconcile of the resource succeeded"
 // +kubebuilder:printcolumn:name="Status",JSONPath=".status.conditions[?(@.type=='Ready')].reason",type="string",description="The reason for the value in 'Ready'"

diff --git a/...io_v1_customresourcedefinition_gkehubfeaturememberships.gkehub.cnrm.cloud.google.com.yaml b/...io_v1_customresourcedefinition_gkehubfeaturememberships.gkehub.cnrm.cloud.google.com.yaml
@@ -5,7 +5,6 @@ metadata:
     cnrm.cloud.google.com/version: 0.0.0-dev
   creationTimestamp: null
   labels:
-    cnrm.cloud.google.com/dcl2crd: "true"
     cnrm.cloud.google.com/managed-by-kcc: "true"
     cnrm.cloud.google.com/stability-level: stable
     cnrm.cloud.google.com/system: "true"

diff --git a/pkg/clients/generated/apis/gkehub/v1beta1/gkehubfeaturemembership_types.go b/pkg/clients/generated/apis/gkehub/v1beta1/gkehubfeaturemembership_types.go
diff --git a/tests/e2e/testdata/scenarios/fields/gkehubfeaturemembership/set_unset/_http03.log b/tests/e2e/testdata/scenarios/fields/gkehubfeaturemembership/set_unset/_http03.log
@@ -1,6 +1,5 @@
-GET https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement?alt=json
-Content-Type: application/json
-User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
+GET https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement?alt=json&prettyPrint=false
+User-Agent: kcc/controller-manager
 
 200 OK
 Cache-Control: private
@@ -22,83 +21,14 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement?alt=json
+PATCH https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement?alt=json&prettyPrint=false&updateMask=membershipSpecs
 Content-Type: application/json
-User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
-
-200 OK
-Cache-Control: private
-Content-Type: application/json; charset=UTF-8
-Server: ESF
-Vary: Origin
-Vary: X-Origin
-Vary: Referer
-X-Content-Type-Options: nosniff
-X-Frame-Options: SAMEORIGIN
-X-Xss-Protection: 0
-
-{
-  "labels": {
-    "managed-by-cnrm": "true"
-  },
-  "name": "projects/${projectId}/locations/global/features/configmanagement"
-}
-
----
-
-GET https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement?alt=json
-Content-Type: application/json
-User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
-
-200 OK
-Cache-Control: private
-Content-Type: application/json; charset=UTF-8
-Server: ESF
-Vary: Origin
-Vary: X-Origin
-Vary: Referer
-X-Content-Type-Options: nosniff
-X-Frame-Options: SAMEORIGIN
-X-Xss-Protection: 0
-
-{
-  "labels": {
-    "managed-by-cnrm": "true"
-  },
-  "name": "projects/${projectId}/locations/global/features/configmanagement"
-}
-
----
-
-GET https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement?alt=json
-Content-Type: application/json
-User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
-
-200 OK
-Cache-Control: private
-Content-Type: application/json; charset=UTF-8
-Server: ESF
-Vary: Origin
-Vary: X-Origin
-Vary: Referer
-X-Content-Type-Options: nosniff
-X-Frame-Options: SAMEORIGIN
-X-Xss-Protection: 0
+User-Agent: kcc/controller-manager
 
 {
   "labels": {
     "managed-by-cnrm": "true"
   },
-  "name": "projects/${projectId}/locations/global/features/configmanagement"
-}
-
----
-
-PATCH https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement?alt=json&updateMask=membershipSpecs
-Content-Type: application/json
-User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
-
-{
   "membershipSpecs": {
     "projects/${projectId}/locations/global/memberships/gkehubmembership-${uniqueId}": {
       "configmanagement": {
@@ -107,7 +37,8 @@ User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
         }
       }
     }
-  }
+  },
+  "name": "projects/${projectId}/locations/global/features/configmanagement"
 }
 
 200 OK
@@ -133,9 +64,8 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement/operations/${operationID}?alt=json
-Content-Type: application/json
-User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
+GET https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement/operations/${operationID}?alt=json&prettyPrint=false
+User-Agent: kcc/controller-manager
 
 200 OK
 Cache-Control: private
@@ -177,38 +107,4 @@ X-Xss-Protection: 0
     },
     "updateTime": "2024-04-01T12:34:56.123456Z"
   }
-}
-
----
-
-GET https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement?alt=json
-Content-Type: application/json
-User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
-
-200 OK
-Cache-Control: private
-Content-Type: application/json; charset=UTF-8
-Server: ESF
-Vary: Origin
-Vary: X-Origin
-Vary: Referer
-X-Content-Type-Options: nosniff
-X-Frame-Options: SAMEORIGIN
-X-Xss-Protection: 0
-
-{
-  "labels": {
-    "managed-by-cnrm": "true"
-  },
-  "membershipSpecs": {
-    "projects/${projectId}/locations/global/memberships/gkehubmembership-${uniqueId}": {
-      "configmanagement": {
-        "configSync": {
-          "sourceFormat": "unstructured"
-        }
-      }
-    }
-  },
-  "name": "projects/${projectId}/locations/global/features/configmanagement",
-  "updateTime": "2024-04-01T12:34:56.123456Z"
 }
diff --git a/tests/e2e/testdata/scenarios/fields/gkehubfeaturemembership/set_unset/_http04.log b/tests/e2e/testdata/scenarios/fields/gkehubfeaturemembership/set_unset/_http04.log
@@ -1,40 +1,5 @@
-GET https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement?alt=json
-Content-Type: application/json
-User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
-
-200 OK
-Cache-Control: private
-Content-Type: application/json; charset=UTF-8
-Server: ESF
-Vary: Origin
-Vary: X-Origin
-Vary: Referer
-X-Content-Type-Options: nosniff
-X-Frame-Options: SAMEORIGIN
-X-Xss-Protection: 0
-
-{
-  "labels": {
-    "managed-by-cnrm": "true"
-  },
-  "membershipSpecs": {
-    "projects/${projectId}/locations/global/memberships/gkehubmembership-${uniqueId}": {
-      "configmanagement": {
-        "configSync": {
-          "sourceFormat": "unstructured"
-        }
-      }
-    }
-  },
-  "name": "projects/${projectId}/locations/global/features/configmanagement",
-  "updateTime": "2024-04-01T12:34:56.123456Z"
-}
-
----
-
-GET https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement?alt=json
-Content-Type: application/json
-User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
+GET https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement?alt=json&prettyPrint=false
+User-Agent: kcc/controller-manager
 
 200 OK
 Cache-Control: private
@@ -66,79 +31,14 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement?alt=json
+PATCH https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement?alt=json&prettyPrint=false&updateMask=membershipSpecs
 Content-Type: application/json
-User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
-
-200 OK
-Cache-Control: private
-Content-Type: application/json; charset=UTF-8
-Server: ESF
-Vary: Origin
-Vary: X-Origin
-Vary: Referer
-X-Content-Type-Options: nosniff
-X-Frame-Options: SAMEORIGIN
-X-Xss-Protection: 0
-
-{
-  "labels": {
-    "managed-by-cnrm": "true"
-  },
-  "membershipSpecs": {
-    "projects/${projectId}/locations/global/memberships/gkehubmembership-${uniqueId}": {
-      "configmanagement": {
-        "configSync": {
-          "sourceFormat": "unstructured"
-        }
-      }
-    }
-  },
-  "name": "projects/${projectId}/locations/global/features/configmanagement",
-  "updateTime": "2024-04-01T12:34:56.123456Z"
-}
-
----
-
-GET https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement?alt=json
-Content-Type: application/json
-User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
-
-200 OK
-Cache-Control: private
-Content-Type: application/json; charset=UTF-8
-Server: ESF
-Vary: Origin
-Vary: X-Origin
-Vary: Referer
-X-Content-Type-Options: nosniff
-X-Frame-Options: SAMEORIGIN
-X-Xss-Protection: 0
+User-Agent: kcc/controller-manager
 
 {
   "labels": {
     "managed-by-cnrm": "true"
   },
-  "membershipSpecs": {
-    "projects/${projectId}/locations/global/memberships/gkehubmembership-${uniqueId}": {
-      "configmanagement": {
-        "configSync": {
-          "sourceFormat": "unstructured"
-        }
-      }
-    }
-  },
-  "name": "projects/${projectId}/locations/global/features/configmanagement",
-  "updateTime": "2024-04-01T12:34:56.123456Z"
-}
-
----
-
-PATCH https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement?alt=json&updateMask=membershipSpecs
-Content-Type: application/json
-User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
-
-{
   "membershipSpecs": {
     "projects/${projectId}/locations/global/memberships/gkehubmembership-${uniqueId}": {
       "configmanagement": {
@@ -153,13 +53,14 @@ User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
             "syncRev": "HEAD\"",
             "syncWaitSecs": "20"
           },
-          "preventDrift": false,
           "sourceFormat": "hierarchy"
         },
         "version": "1.18.1"
       }
     }
-  }
+  },
+  "name": "projects/${projectId}/locations/global/features/configmanagement",
+  "updateTime": "2024-04-01T12:34:56.123456Z"
 }
 
 200 OK
@@ -185,9 +86,8 @@ X-Xss-Protection: 0
 
 ---
 
-GET https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement/operations/${operationID}?alt=json
-Content-Type: application/json
-User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
+GET https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement/operations/${operationID}?alt=json&prettyPrint=false
+User-Agent: kcc/controller-manager
 
 200 OK
 Cache-Control: private
@@ -240,49 +140,4 @@ X-Xss-Protection: 0
     },
     "updateTime": "2024-04-01T12:34:56.123456Z"
   }
-}
-
----
-
-GET https://gkehub.googleapis.com/v1beta/projects/${projectId}/locations/global/features/configmanagement?alt=json
-Content-Type: application/json
-User-Agent: kcc/controller-manager DeclarativeClientLib/0.0.1
-
-200 OK
-Cache-Control: private
-Content-Type: application/json; charset=UTF-8
-Server: ESF
-Vary: Origin
-Vary: X-Origin
-Vary: Referer
-X-Content-Type-Options: nosniff
-X-Frame-Options: SAMEORIGIN
-X-Xss-Protection: 0
-
-{
-  "labels": {
-    "managed-by-cnrm": "true"
-  },
-  "membershipSpecs": {
-    "projects/${projectId}/locations/global/memberships/gkehubmembership-${uniqueId}": {
-      "configmanagement": {
-        "configSync": {
-          "git": {
-            "gcpServiceAccountEmail": "dummy@${projectId}.iam.gserviceaccount.com",
-            "httpsProxy": "https://github.com",
-            "policyDir": "config-connector",
-            "secretType": "none",
-            "syncBranch": "master",
-            "syncRepo": "https://github.com/GoogleCloudPlatform/cloud-foundation-toolkit",
-            "syncRev": "HEAD\"",
-            "syncWaitSecs": "20"
-          },
-          "sourceFormat": "hierarchy"
-        },
-        "version": "1.18.1"
-      }
-    }
-  },
-  "name": "projects/${projectId}/locations/global/features/configmanagement",
-  "updateTime": "2024-04-01T12:34:56.123456Z"
 }