Merge pull request #8386 from bfournie/capg-k8s-fw-tag

OCPBUGS-33481: set the node tag used by CAPG for CloudProviderConfig

Author: openshift-merge-bot[bot]

pkg/asset/manifests/gcp/cloudproviderconfig.go

@@ -36,8 +36,9 @@ func CloudProviderConfig(infraID, projectID, subnet, networkProjectID string) (s
 			Regional:  true,
 			Multizone: true,
 
-			// To make sure k8s cloud provide has tags for firewal for load balancer.
-			NodeTags:                     []string{fmt.Sprintf("%s-master", infraID), fmt.Sprintf("%s-worker", infraID)},
+			// To make sure k8s cloud provider has tags for firewall for load balancer.
+			// The CAPI gcp provider uses the node tag "control-plane" for master nodes.
+			NodeTags:                     []string{fmt.Sprintf("%s-master", infraID), fmt.Sprintf("%s-control-plane", infraID), fmt.Sprintf("%s-worker", infraID)},
 			NodeInstancePrefix:           infraID,
 			ExternalInstanceGroupsPrefix: infraID,
 

pkg/asset/manifests/gcp/cloudproviderconfig_test.go

@@ -12,6 +12,7 @@ project-id      = test-project-id
 regional        = true
 multizone       = true
 node-tags       = uid-master
+node-tags       = uid-control-plane
 node-tags       = uid-worker
 node-instance-prefix = uid
 external-instance-groups-prefix = uid
@@ -30,6 +31,7 @@ project-id      = test-project-id
 regional        = true
 multizone       = true
 node-tags       = uid-master
+node-tags       = uid-control-plane
 node-tags       = uid-worker
 node-instance-prefix = uid
 external-instance-groups-prefix = uid