Merge pull request #494 from crossplane-contrib/backport-487-to-relea…

…se-0.41 [Backport release-0.41] Add SSA merge strategy to container Cluster's nodeConfig to avoid fights over ownership.
crossplane-contrib · Mar 21, 2024 · fff246e · fff246e
2 parents 06973d5 + 0dbdc54
commit fff246e
Show file tree

Hide file tree

Showing 4 changed files with 69 additions and 0 deletions.
diff --git a/apis/container/v1beta1/zz_cluster_types.go b/apis/container/v1beta1/zz_cluster_types.go
diff --git a/apis/container/v1beta1/zz_generated.deepcopy.go b/apis/container/v1beta1/zz_generated.deepcopy.go
diff --git a/config/container/config.go b/config/container/config.go
@@ -121,6 +121,17 @@ func Configure(p *config.Provider) { //nolint:gocyclo
 			Type:      "github.com/upbound/provider-gcp/apis/compute/v1beta1.Subnetwork",
 			Extractor: common.PathSelfLinkExtractor,
 		}
+		r.ServerSideApplyMergeStrategies["node_config"] = config.MergeStrategy{
+			ListMergeStrategy: config.ListMergeStrategy{
+				MergeStrategy: config.ListTypeMap,
+				ListMapKeys: config.ListMapKeys{
+					InjectedKey: config.InjectedKey{
+						Key:          "index",
+						DefaultValue: `"0"`,
+					},
+				},
+			},
+		}
 		config.MarkAsRequired(r.TerraformResource, "location")
 	})
 

diff --git a/package/crds/container.gcp.upbound.io_clusters.yaml b/package/crds/container.gcp.upbound.io_clusters.yaml
@@ -1121,6 +1121,11 @@ spec:
                             The image type to use for this node. Note that changing the image type
                             will delete and recreate all nodes in the node pool.
                           type: string
+                        index:
+                          default: "0"
+                          description: This is an injected field with a default value
+                            for being able to merge items of the parent object list.
+                          type: string
                         kubeletConfig:
                           description: |-
                             Kubelet configuration, currently supported attributes can be found here.
@@ -1445,6 +1450,9 @@ spec:
                           type: array
                       type: object
                     type: array
+                    x-kubernetes-list-map-keys:
+                    - index
+                    x-kubernetes-list-type: map
                   nodeLocations:
                     description: |-
                       The list of zones in which the cluster's nodes
@@ -2834,6 +2842,11 @@ spec:
                             The image type to use for this node. Note that changing the image type
                             will delete and recreate all nodes in the node pool.
                           type: string
+                        index:
+                          default: "0"
+                          description: This is an injected field with a default value
+                            for being able to merge items of the parent object list.
+                          type: string
                         kubeletConfig:
                           description: |-
                             Kubelet configuration, currently supported attributes can be found here.
@@ -3158,6 +3171,9 @@ spec:
                           type: array
                       type: object
                     type: array
+                    x-kubernetes-list-map-keys:
+                    - index
+                    x-kubernetes-list-type: map
                   nodeLocations:
                     description: |-
                       The list of zones in which the cluster's nodes
@@ -4682,6 +4698,11 @@ spec:
                             The image type to use for this node. Note that changing the image type
                             will delete and recreate all nodes in the node pool.
                           type: string
+                        index:
+                          default: "0"
+                          description: This is an injected field with a default value
+                            for being able to merge items of the parent object list.
+                          type: string
                         kubeletConfig:
                           description: |-
                             Kubelet configuration, currently supported attributes can be found here.
@@ -4930,6 +4951,9 @@ spec:
                           type: array
                       type: object
                     type: array
+                    x-kubernetes-list-map-keys:
+                    - index
+                    x-kubernetes-list-type: map
                   nodeLocations:
                     description: |-
                       The list of zones in which the cluster's nodes