Merge pull request #2019 from yuwenma/cbwp-acronym

chore: change CBWP 'Ip' to 'IP'
GoogleCloudPlatform · Jun 17, 2024 · 64a90f7 · 64a90f7
2 parents 56d2909 + e22ad86
commit 64a90f7
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 21 deletions.
diff --git a/apis/cloudbuild/v1alpha1/conversion.go b/apis/cloudbuild/v1alpha1/conversion.go
@@ -63,7 +63,7 @@ func Convert_NetworkConfig_API_v1_To_KRM(in *cloudbuildpb.PrivatePoolV1Config_Ne
 	}
 
 	out.PeeredNetwork = in.PeeredNetwork
-	out.PeeredNetworkIpRange = in.PeeredNetworkIpRange
+	out.PeeredNetworkIPRange = in.PeeredNetworkIpRange
 	return nil
 }
 
@@ -119,7 +119,7 @@ func Convert_PrivatePoolV1Config_NetworkConfig_KRM_To_API_v1(in *NetworkConfig,
 		return nil
 	}
 	obj := in.DeepCopy()
-	out.PeeredNetworkIpRange = obj.PeeredNetworkIpRange
+	out.PeeredNetworkIpRange = obj.PeeredNetworkIPRange
 
 	// custom
 	switch obj.EgressOption {

diff --git a/apis/cloudbuild/v1alpha1/workerpool_types.go b/apis/cloudbuild/v1alpha1/workerpool_types.go
@@ -55,7 +55,7 @@ type NetworkConfig struct {
 	// +optional
 	EgressOption string `json:"egressOption,omitempty"`
 	// +optional
-	PeeredNetworkIpRange string `json:"peeredNetworkIpRange,omitempty"`
+	PeeredNetworkIPRange string `json:"PeeredNetworkIPRange,omitempty"`
 }
 
 // CloudBuildWorkerPoolStatus defines the observed state of Instance
@@ -96,7 +96,7 @@ type NetworkConfigState struct {
 	// +optional
 	EgressOption string `json:"egressOption,omitempty"`
 	// +optional
-	PeeredNetworkIpRange string `json:"peeredNetworkIpRange,omitempty"`
+	PeeredNetworkIPRange string `json:"peeredNetworkIPRange,omitempty"`
 }
 
 // +kubebuilder:metadata:labels="cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/stability-level=beta"

diff --git a/...o_v1_customresourcedefinition_cloudbuildworkerpools.cloudbuild.cnrm.cloud.google.com.yaml b/...o_v1_customresourcedefinition_cloudbuildworkerpools.cloudbuild.cnrm.cloud.google.com.yaml
@@ -49,9 +49,9 @@ spec:
                 properties:
                   networkConfig:
                     properties:
-                      egressOption:
+                      PeeredNetworkIPRange:
                         type: string
-                      peeredNetworkIpRange:
+                      egressOption:
                         type: string
                       peeredNetworkRef:
                         oneOf:
@@ -186,7 +186,7 @@ spec:
                         type: string
                       peeredNetwork:
                         type: string
-                      peeredNetworkIpRange:
+                      peeredNetworkIPRange:
                         type: string
                     type: object
                   updateTime:

diff --git a/pkg/clients/generated/apis/cloudbuild/v1alpha1/cloudbuildworkerpool_types.go b/pkg/clients/generated/apis/cloudbuild/v1alpha1/cloudbuildworkerpool_types.go
diff --git a/pkg/clients/generated/apis/cloudbuild/v1alpha1/zz_generated.deepcopy.go b/pkg/clients/generated/apis/cloudbuild/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/controller/direct/cloudbuild/workerpool_controller.go b/pkg/controller/direct/cloudbuild/workerpool_controller.go
@@ -230,7 +230,7 @@ func (a *Adapter) Update(ctx context.Context, u *unstructured.Unstructured) erro
 				updateMask.Paths = append(updateMask.Paths, "private_pool_v1_config.network_config.egress_option")
 			}
 		}
-		expectedIPRange := desiredConfig.NetworkConfig.PeeredNetworkIpRange
+		expectedIPRange := desiredConfig.NetworkConfig.PeeredNetworkIPRange
 		if expectedIPRange != "" && !reflect.DeepEqual(expectedIPRange, actualConfig.NetworkConfig.PeeredNetworkIpRange) {
 			updateMask.Paths = append(updateMask.Paths, "private_pool_v1_config.network_config.peered_network_ip_range")
 		}

diff --git a/...oudbuild/v1alpha1/cloudbuildworkerpool/_generated_object_cloudbuildworkerpool.golden.yaml b/...oudbuild/v1alpha1/cloudbuildworkerpool/_generated_object_cloudbuildworkerpool.golden.yaml
@@ -14,8 +14,8 @@ spec:
   location: us-central1
   privatePoolV1Config:
     networkConfig:
+      PeeredNetworkIPRange: /29
       egressOption: NO_PUBLIC_EGRESS
-      peeredNetworkIpRange: /29
       peeredNetworkRef:
         external: projects/${projectId}/global/networks/computenetwork-${uniqueId}
     workerConfig:
@@ -36,7 +36,7 @@ status:
     networkConfig:
       egressOption: NO_PUBLIC_EGRESS
       peeredNetwork: projects/${projectId}/global/networks/computenetwork-${uniqueId}
-      peeredNetworkIpRange: /29
+      peeredNetworkIPRange: /29
     updateTime: "1970-01-01T00:00:00Z"
     workerConfig:
       diskSizeGb: 100

diff --git a/pkg/test/resourcefixture/testdata/basic/cloudbuild/v1alpha1/cloudbuildworkerpool/create.yaml b/pkg/test/resourcefixture/testdata/basic/cloudbuild/v1alpha1/cloudbuildworkerpool/create.yaml
@@ -28,5 +28,5 @@ spec:
       peeredNetworkRef:
         external: projects/${projectId}/global/networks/computenetwork-${uniqueId}
       egressOption: NO_PUBLIC_EGRESS
-      peeredNetworkIpRange: /29
+      PeeredNetworkIPRange: /29
 
diff --git a/pkg/test/resourcefixture/testdata/basic/cloudbuild/v1alpha1/cloudbuildworkerpool/update.yaml b/pkg/test/resourcefixture/testdata/basic/cloudbuild/v1alpha1/cloudbuildworkerpool/update.yaml
@@ -28,5 +28,5 @@ spec:
       peeredNetworkRef:
         external: projects/${projectId}/global/networks/computenetwork-${uniqueId}
       egressOption: NO_PUBLIC_EGRESS
-      peeredNetworkIpRange: /29
+      PeeredNetworkIPRange: /29