turn on ComputeTCPProxy direct controller

gemmahou · Nov 20, 2024 · 7121574 · 7121574
1 parent 603f8c8
commit 7121574
Show file tree

Hide file tree

Showing 29 changed files with 92 additions and 1,367 deletions.
diff --git a/apis/compute/v1beta1/targettcpproxy_types.go b/apis/compute/v1beta1/targettcpproxy_types.go
@@ -87,7 +87,7 @@ type ComputeTargetTCPProxyObservedState struct {
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +kubebuilder:resource:categories=gcp,shortName=gcpcomputetargettcpproxy;gcpcomputetargettcpproxies
 // +kubebuilder:subresource:status
-// +kubebuilder:metadata:labels="cnrm.cloud.google.com/tf2crd=true";"cnrm.cloud.google.com/stability-level=stable";"cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/system=true"
+// +kubebuilder:metadata:labels="cnrm.cloud.google.com/stability-level=stable";"cnrm.cloud.google.com/managed-by-kcc=true";"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_computetargettcpproxies.compute.cnrm.cloud.google.com.yaml b/...io_v1_customresourcedefinition_computetargettcpproxies.compute.cnrm.cloud.google.com.yaml
@@ -8,7 +8,6 @@ metadata:
     cnrm.cloud.google.com/managed-by-kcc: "true"
     cnrm.cloud.google.com/stability-level: stable
     cnrm.cloud.google.com/system: "true"
-    cnrm.cloud.google.com/tf2crd: "true"
   name: computetargettcpproxies.compute.cnrm.cloud.google.com
 spec:
   group: compute.cnrm.cloud.google.com

diff --git a/...ompute_v1beta1_computebackendservice.yaml → ...ompute_v1beta1_computebackendservice.yaml b/...ompute_v1beta1_computebackendservice.yaml → ...ompute_v1beta1_computebackendservice.yaml
diff --git a/...y/compute_v1beta1_computehealthcheck.yaml → ...y/compute_v1beta1_computehealthcheck.yaml b/...y/compute_v1beta1_computehealthcheck.yaml → ...y/compute_v1beta1_computehealthcheck.yaml
diff --git a/...ompute_v1beta1_computetargettcpproxy.yaml → ...ompute_v1beta1_computetargettcpproxy.yaml b/...ompute_v1beta1_computetargettcpproxy.yaml → ...ompute_v1beta1_computetargettcpproxy.yaml
@@ -17,6 +17,6 @@ kind: ComputeTargetTCPProxy
 metadata:
   name: computetargettcpproxy-sample
 spec:
-  description: "A sample TCP proxy."
+  description: "A sample global TCP proxy."
   backendServiceRef:
     name: computetargettcpproxy-dep
diff --git a/...putetargettcpproxy-full/dependencies.yaml → ...ompute_v1beta1_computebackendservice.yaml b/...putetargettcpproxy-full/dependencies.yaml → ...ompute_v1beta1_computebackendservice.yaml
@@ -1,35 +1,28 @@
-# Copyright 2022 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: compute.cnrm.cloud.google.com/v1beta1
-kind: ComputeHealthCheck
-metadata:
-  name: computehealthcheck-${uniqueId}
-spec:
-  checkIntervalSec: 10
-  tcpHealthCheck:
-    port: 443
-  location: global
----
 apiVersion: compute.cnrm.cloud.google.com/v1beta1
 kind: ComputeBackendService
 metadata:
-  name: computebackendservice-${uniqueId}
+  name: computetargettcpproxy-dep
 spec:
   healthChecks:
     - healthCheckRef:
-        name: computehealthcheck-${uniqueId}
-  location: global
+        name: computetargettcpproxy-dep
+  location: europe-west4
   protocol: TCP
-
+  # Default loadBalancingScheme for regional backend service is INTERNAL
+  # Set to INTERNAL_MANAGED when being referenced by Regional Target TCP Proxy
+  # googleapi error: Regional Target TCP Proxy cannot be used with BackendServices with schema INTERNAL
+  loadBalancingScheme: INTERNAL_MANAGED
diff --git a/...alcomputetargettcpproxy-basic/update.yaml → ...y/compute_v1beta1_computehealthcheck.yaml b/...alcomputetargettcpproxy-basic/update.yaml → ...y/compute_v1beta1_computehealthcheck.yaml
@@ -1,10 +1,10 @@
-# Copyright 2022 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,11 +13,11 @@
 # limitations under the License.
 
 apiVersion: compute.cnrm.cloud.google.com/v1beta1
-kind: ComputeTargetTCPProxy
+kind: ComputeHealthCheck
 metadata:
-  annotations:
-    cnrm.cloud.google.com/project-id: ${projectId}
-  name: computetargettcpproxy-${uniqueId}
+  name: computetargettcpproxy-dep
 spec:
-  backendServiceRef:
-    name: computebackendservice-${uniqueId}
+  checkIntervalSec: 10
+  tcpHealthCheck:
+    port: 443
+  location: europe-west4
diff --git a/...balcomputetargettcpproxy-full/create.yaml → ...ompute_v1beta1_computetargettcpproxy.yaml b/...balcomputetargettcpproxy-full/create.yaml → ...ompute_v1beta1_computetargettcpproxy.yaml
@@ -1,10 +1,10 @@
-# Copyright 2022 Google LLC
+# Copyright 2020 Google LLC
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#      http://www.apache.org/licenses/LICENSE-2.0
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,12 +15,11 @@
 apiVersion: compute.cnrm.cloud.google.com/v1beta1
 kind: ComputeTargetTCPProxy
 metadata:
-  annotations:
-    cnrm.cloud.google.com/project-id: ${projectId}
-  name: computetargettcpproxy-${uniqueId}
+  name: computetargettcpproxy-sample
 spec:
-  description: "test target tcp proxy"
+  description: "A sample regional TCP proxy."
   backendServiceRef:
-    name: computebackendservice-${uniqueId}
+    name: computetargettcpproxy-dep
   proxyBind: false
   proxyHeader: NONE
+  location: europe-west4
diff --git a/pkg/clients/generated/apis/compute/v1beta1/computetargettcpproxy_types.go b/pkg/clients/generated/apis/compute/v1beta1/computetargettcpproxy_types.go
diff --git a/pkg/gvks/supportedgvks/gvks_generated.go b/pkg/gvks/supportedgvks/gvks_generated.go
diff --git a/pkg/snippet/snippetgeneration/snippetgeneration.go b/pkg/snippet/snippetgeneration/snippetgeneration.go
@@ -68,6 +68,7 @@ var preferredSampleForResource = map[string]string{
 	"computesslcertificate":              "global-compute-ssl-certificate",
 	"computesslpolicy":                   "modern-tls-1-1-ssl-policy",
 	"computetargethttpsproxy":            "target-https-proxy-with-ssl-certificates",
+	"computetargettcpproxy":              "global-target-tcp-proxy",
 	"computeurlmap":                      "global-compute-url-map",
 	"configcontrollerinstance":           "autopilot-config-controller-instance",
 	"containerattachedcluster":           "container-attached-cluster-basic",

diff --git a/...proxy-basic-direct/_generated_object_globalcomputetargettcpproxy-basic-direct.golden.yaml b/...proxy-basic-direct/_generated_object_globalcomputetargettcpproxy-basic-direct.golden.yaml
@@ -2,7 +2,6 @@ apiVersion: compute.cnrm.cloud.google.com/v1beta1
 kind: ComputeTargetTCPProxy
 metadata:
   annotations:
-    alpha.cnrm.cloud.google.com/reconciler: direct
     cnrm.cloud.google.com/management-conflict-prevention-policy: none
     cnrm.cloud.google.com/project-id: ${projectId}
   finalizers:

diff --git a/...ompute/v1beta1/computetargettcpproxy/globalcomputetargettcpproxy-basic-direct/create.yaml b/...ompute/v1beta1/computetargettcpproxy/globalcomputetargettcpproxy-basic-direct/create.yaml
@@ -17,7 +17,6 @@ kind: ComputeTargetTCPProxy
 metadata:
   annotations:
     cnrm.cloud.google.com/project-id: ${projectId}
-    alpha.cnrm.cloud.google.com/reconciler: "direct"
   name: computetargettcpproxy-${uniqueId}
 spec:
   backendServiceRef:

diff --git a/...ompute/v1beta1/computetargettcpproxy/globalcomputetargettcpproxy-basic-direct/update.yaml b/...ompute/v1beta1/computetargettcpproxy/globalcomputetargettcpproxy-basic-direct/update.yaml
@@ -17,7 +17,6 @@ kind: ComputeTargetTCPProxy
 metadata:
   annotations:
     cnrm.cloud.google.com/project-id: ${projectId}
-    alpha.cnrm.cloud.google.com/reconciler: "direct"
   name: computetargettcpproxy-${uniqueId}
 spec:
   backendServiceRef:

diff --git a/...mputetargettcpproxy-basic/_generated_object_globalcomputetargettcpproxy-basic.golden.yaml b/...mputetargettcpproxy-basic/_generated_object_globalcomputetargettcpproxy-basic.golden.yaml