From 6d109471a51d639562daa42da6545ac4b840b797 Mon Sep 17 00:00:00 2001 From: Hemant Kunda Date: Thu, 8 Feb 2024 19:03:53 +0000 Subject: [PATCH] change forwarding rule subnetworkRef to use self_link --- ...ngrules.compute.cnrm.cloud.google.com.yaml | 2 +- .../compute_v1beta1_computeaddress.yaml | 25 ++++ ...compute_v1beta1_computebackendservice.yaml | 30 ++++ ...compute_v1beta1_computeforwardingrule.yaml | 34 +++++ .../compute_v1beta1_computehealthcheck.yaml | 22 +++ .../compute_v1beta1_computeinstancegroup.yaml | 22 +++ .../compute_v1beta1_computenetwork.yaml | 21 +++ .../compute_v1beta1_computesubnetwork.yaml | 23 +++ ...mpute_v1beta1_computesubnetwork_proxy.yaml | 25 ++++ ...ompute_v1beta1_computetargethttpproxy.yaml | 22 +++ .../compute_v1beta1_computeurlmap.yaml | 23 +++ config/servicemappings/compute.yaml | 2 + .../compute/computeforwardingrule.md | 136 +++++++++++++++++- 13 files changed, 385 insertions(+), 2 deletions(-) create mode 100644 config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computeaddress.yaml create mode 100644 config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computebackendservice.yaml create mode 100644 config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computeforwardingrule.yaml create mode 100644 config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computehealthcheck.yaml create mode 100644 config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computeinstancegroup.yaml create mode 100644 config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computenetwork.yaml create mode 100644 config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computesubnetwork.yaml create mode 100644 config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computesubnetwork_proxy.yaml create mode 100644 config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computetargethttpproxy.yaml create mode 100644 config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computeurlmap.yaml diff --git a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_computeforwardingrules.compute.cnrm.cloud.google.com.yaml b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_computeforwardingrules.compute.cnrm.cloud.google.com.yaml index 5aa2719ea9..5ffced62b0 100644 --- a/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_computeforwardingrules.compute.cnrm.cloud.google.com.yaml +++ b/config/crds/resources/apiextensions.k8s.io_v1_customresourcedefinition_computeforwardingrules.compute.cnrm.cloud.google.com.yaml @@ -465,7 +465,7 @@ spec: - external properties: external: - description: 'Allowed value: The `name` field of a `ComputeSubnetwork` + description: 'Allowed value: The `selfLink` field of a `ComputeSubnetwork` resource.' type: string name: diff --git a/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computeaddress.yaml b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computeaddress.yaml new file mode 100644 index 0000000000..cc4c233b7f --- /dev/null +++ b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computeaddress.yaml @@ -0,0 +1,25 @@ +# 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 +# +# 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: ComputeAddress +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy +spec: + addressType: INTERNAL + location: us-central1 + ipVersion: IPV4 + purpose: SHARED_LOADBALANCER_VIP + subnetworkRef: + name: computeforwardingrule-dep-global-internal-http-proxy diff --git a/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computebackendservice.yaml b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computebackendservice.yaml new file mode 100644 index 0000000000..f58e4d50e2 --- /dev/null +++ b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computebackendservice.yaml @@ -0,0 +1,30 @@ +# 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 +# +# 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: ComputeBackendService +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy +spec: + healthChecks: + - healthCheckRef: + name: computeforwardingrule-dep-global-internal-http-proxy + loadBalancingScheme: INTERNAL_MANAGED + location: global + protocol: HTTP + backend: + - balancingMode: UTILIZATION + group: + instanceGroupRef: + name: computeforwardingrule-dep-global-internal-http-proxy diff --git a/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computeforwardingrule.yaml b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computeforwardingrule.yaml new file mode 100644 index 0000000000..233452ced8 --- /dev/null +++ b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computeforwardingrule.yaml @@ -0,0 +1,34 @@ +# 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 +# +# 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: ComputeForwardingRule +metadata: + name: computeforwardingrule-sample-global-internal-http-proxy +spec: + target: + targetHTTPProxyRef: + name: computeforwardingrule-dep-global-internal-http-proxy + ipAddress: + addressRef: + name: computeforwardingrule-dep-global-internal-http-proxy + ipProtocol: "TCP" + loadBalancingScheme: INTERNAL_MANAGED + location: global + networkRef: + name: computeforwardingrule-dep-global-internal-http-proxy + subnetworkRef: + name: computeforwardingrule-dep-global-internal-http-proxy + portRange: '80-80' + allowGlobalAccess: true diff --git a/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computehealthcheck.yaml b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computehealthcheck.yaml new file mode 100644 index 0000000000..61b09b5504 --- /dev/null +++ b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computehealthcheck.yaml @@ -0,0 +1,22 @@ +# 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 +# +# 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: computeforwardingrule-dep-global-internal-http-proxy +spec: + httpHealthCheck: + port: 80 + location: global diff --git a/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computeinstancegroup.yaml b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computeinstancegroup.yaml new file mode 100644 index 0000000000..5fd7a07c18 --- /dev/null +++ b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computeinstancegroup.yaml @@ -0,0 +1,22 @@ +# 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 +# +# 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: ComputeInstanceGroup +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy +spec: + zone: us-central1-a + networkRef: + name: computeforwardingrule-dep-global-internal-http-proxy diff --git a/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computenetwork.yaml b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computenetwork.yaml new file mode 100644 index 0000000000..e9444c8a6a --- /dev/null +++ b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computenetwork.yaml @@ -0,0 +1,21 @@ +# 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 +# +# 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: ComputeNetwork +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy +spec: + routingMode: REGIONAL + autoCreateSubnetworks: false diff --git a/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computesubnetwork.yaml b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computesubnetwork.yaml new file mode 100644 index 0000000000..cba79e9c1e --- /dev/null +++ b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computesubnetwork.yaml @@ -0,0 +1,23 @@ +# Copyright 2022 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 +# +# 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: ComputeSubnetwork +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy +spec: + ipCidrRange: 10.2.0.0/28 + region: us-central1 + networkRef: + name: computeforwardingrule-dep-global-internal-http-proxy diff --git a/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computesubnetwork_proxy.yaml b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computesubnetwork_proxy.yaml new file mode 100644 index 0000000000..6ada43677b --- /dev/null +++ b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computesubnetwork_proxy.yaml @@ -0,0 +1,25 @@ +# Copyright 2022 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 +# +# 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: ComputeSubnetwork +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy-proxy +spec: + ipCidrRange: 10.3.0.0/26 + region: us-central1 + purpose: GLOBAL_MANAGED_PROXY + role: ACTIVE + networkRef: + name: computeforwardingrule-dep-global-internal-http-proxy diff --git a/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computetargethttpproxy.yaml b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computetargethttpproxy.yaml new file mode 100644 index 0000000000..d265931473 --- /dev/null +++ b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computetargethttpproxy.yaml @@ -0,0 +1,22 @@ +# 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 +# +# 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: ComputeTargetHTTPProxy +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy +spec: + urlMapRef: + name: computeforwardingrule-dep-global-internal-http-proxy + location: global diff --git a/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computeurlmap.yaml b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computeurlmap.yaml new file mode 100644 index 0000000000..e6bf13eac9 --- /dev/null +++ b/config/samples/resources/computeforwardingrule/global-internal-forwarding-rule-with-target-http-proxy/compute_v1beta1_computeurlmap.yaml @@ -0,0 +1,23 @@ +# 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 +# +# 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: ComputeURLMap +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy +spec: + defaultService: + backendServiceRef: + name: computeforwardingrule-dep-global-internal-http-proxy + location: global diff --git a/config/servicemappings/compute.yaml b/config/servicemappings/compute.yaml index fab0962732..f3d64ef299 100644 --- a/config/servicemappings/compute.yaml +++ b/config/servicemappings/compute.yaml @@ -524,6 +524,7 @@ spec: kind: ComputeSubnetwork version: v1beta1 group: compute.cnrm.cloud.google.com + targetField: self_link - key: backendServiceRef tfField: backend_service description: |- @@ -672,6 +673,7 @@ spec: kind: ComputeSubnetwork version: v1beta1 group: compute.cnrm.cloud.google.com + targetField: self_link containers: - type: project tfField: project diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/compute/computeforwardingrule.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/compute/computeforwardingrule.md index 8ed5c36cfe..6bff2e6577 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/compute/computeforwardingrule.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/compute/computeforwardingrule.md @@ -782,7 +782,7 @@ subnetwork must be specified.{% endverbatim %}

string

-

{% verbatim %}Allowed value: The `name` field of a `ComputeSubnetwork` resource.{% endverbatim %}

+

{% verbatim %}Allowed value: The `selfLink` field of a `ComputeSubnetwork` resource.{% endverbatim %}

@@ -1538,6 +1538,140 @@ spec: name: computeforwardingrule-dep-global-with-grpc-proxy ``` +### Global Internal Forwarding Rule With Target Http Proxy +```yaml +# 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 +# +# 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: ComputeForwardingRule +metadata: + name: computeforwardingrule-sample-global-internal-http-proxy +spec: + target: + targetHTTPProxyRef: + name: computeforwardingrule-dep-global-internal-http-proxy + ipAddress: + addressRef: + name: computeforwardingrule-dep-global-internal-http-proxy + ipProtocol: "TCP" + loadBalancingScheme: INTERNAL_MANAGED + location: global + networkRef: + name: computeforwardingrule-dep-global-internal-http-proxy + subnetworkRef: + name: computeforwardingrule-dep-global-internal-http-proxy + portRange: '80-80' + allowGlobalAccess: true +--- +apiVersion: compute.cnrm.cloud.google.com/v1beta1 +kind: ComputeAddress +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy +spec: + addressType: INTERNAL + location: us-central1 + ipVersion: IPV4 + purpose: SHARED_LOADBALANCER_VIP + subnetworkRef: + name: computeforwardingrule-dep-global-internal-http-proxy +--- +apiVersion: compute.cnrm.cloud.google.com/v1beta1 +kind: ComputeBackendService +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy +spec: + healthChecks: + - healthCheckRef: + name: computeforwardingrule-dep-global-internal-http-proxy + loadBalancingScheme: INTERNAL_MANAGED + location: global + protocol: HTTP + backend: + - balancingMode: UTILIZATION + group: + instanceGroupRef: + name: computeforwardingrule-dep-global-internal-http-proxy +--- +apiVersion: compute.cnrm.cloud.google.com/v1beta1 +kind: ComputeHealthCheck +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy +spec: + httpHealthCheck: + port: 80 + location: global +--- +apiVersion: compute.cnrm.cloud.google.com/v1beta1 +kind: ComputeInstanceGroup +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy +spec: + zone: us-central1-a + networkRef: + name: computeforwardingrule-dep-global-internal-http-proxy +--- +apiVersion: compute.cnrm.cloud.google.com/v1beta1 +kind: ComputeNetwork +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy +spec: + routingMode: REGIONAL + autoCreateSubnetworks: false +--- +apiVersion: compute.cnrm.cloud.google.com/v1beta1 +kind: ComputeSubnetwork +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy +spec: + ipCidrRange: 10.2.0.0/28 + region: us-central1 + networkRef: + name: computeforwardingrule-dep-global-internal-http-proxy +--- +apiVersion: compute.cnrm.cloud.google.com/v1beta1 +kind: ComputeSubnetwork +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy-proxy +spec: + ipCidrRange: 10.3.0.0/26 + region: us-central1 + purpose: GLOBAL_MANAGED_PROXY + role: ACTIVE + networkRef: + name: computeforwardingrule-dep-global-internal-http-proxy +--- +apiVersion: compute.cnrm.cloud.google.com/v1beta1 +kind: ComputeTargetHTTPProxy +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy +spec: + urlMapRef: + name: computeforwardingrule-dep-global-internal-http-proxy + location: global +--- +apiVersion: compute.cnrm.cloud.google.com/v1beta1 +kind: ComputeURLMap +metadata: + name: computeforwardingrule-dep-global-internal-http-proxy +spec: + defaultService: + backendServiceRef: + name: computeforwardingrule-dep-global-internal-http-proxy + location: global +``` + ### Regional Forwarding Rule ```yaml # Copyright 2020 Google LLC