Simplify creation of internal LB

README.md

@@ -122,13 +122,16 @@ Due to API limitations, only one subnet from each zone must be present in each N
     * Mandatory.
 * `YANDEX_CLOUD_DEFAULT_LB_LISTENER_SUBNET_ID` – default SubnetID to use for created NetworkLoadBalancers' listeners.
     * **Caution!** All newly created NLBs will be INTERNAL. This can be overriden via `yandex.cpi.flant.com/loadbalancer-external` [Service annotation](#Service-annotations).
+* `YANDEX_CLOUD_DEFAULT_INTERNAL_LB_LISTENER_SUBNET_ID` - default SubnetID to use for created internal NetworkLoadBalancers' listeners.
 
 ##### Service annotations
 
 * `yandex.cpi.flant.com/target-group-network-id` – override `YANDEX_CLOUD_DEFAULT_LB_TARGET_GROUP_NETWORK_ID` on a per-service basis.
 * `yandex.cpi.flant.com/listener-subnet-id` – default SubnetID to use for Listeners in created NetworkLoadBalancers. NetworkLoadBalancers will be INTERNAL.
 * `yandex.cpi.flant.com/listener-address-ipv4` – select pre-defined IPv4 address. Works both on internal and external NetworkLoadBalancers.
 * `yandex.cpi.flant.com/loadbalancer-external` – override `YANDEX_CLOUD_DEFAULT_LB_LISTENER_SUBNET_ID` per-service.
+* `yandex.cpi.flant.com/loadbalancer-internal` – Create an internal NetworkLoadBalancers. The SubnetID from `YANDEX_CLOUD_DEFAULT_INTERNAL_LB_LISTENER_SUBNET_ID` will be used.
+
 * `yandex.cpi.flant.com/target-group-name-prefix` - set target group for LB to target group with name `yandex.cpi.flant.com/target-group-name-prefix` annotation value + yandex cluster name + `YANDEX_CLOUD_DEFAULT_LB_TARGET_GROUP_NETWORK_ID`.
 
 ##### Node annotations

pkg/cloudprovider/yandex/cloud.go

@@ -29,26 +29,28 @@
 const (
 	providerName = "yandex"
 
-	envClusterName        = "YANDEX_CLUSTER_NAME"
-	envRouteTableID       = "YANDEX_CLOUD_ROUTE_TABLE_ID"
-	envServiceAccountJSON = "YANDEX_CLOUD_SERVICE_ACCOUNT_JSON"
-	envFolderID           = "YANDEX_CLOUD_FOLDER_ID"
-	envLbListenerSubnetID = "YANDEX_CLOUD_DEFAULT_LB_LISTENER_SUBNET_ID"
-	envLbTgNetworkID      = "YANDEX_CLOUD_DEFAULT_LB_TARGET_GROUP_NETWORK_ID"
-	envInternalNetworkIDs = "YANDEX_CLOUD_INTERNAL_NETWORK_IDS"
-	envExternalNetworkIDs = "YANDEX_CLOUD_EXTERNAL_NETWORK_IDS"
+	envClusterName                = "YANDEX_CLUSTER_NAME"
+	envRouteTableID               = "YANDEX_CLOUD_ROUTE_TABLE_ID"
+	envServiceAccountJSON         = "YANDEX_CLOUD_SERVICE_ACCOUNT_JSON"
+	envFolderID                   = "YANDEX_CLOUD_FOLDER_ID"
+	envLbListenerSubnetID         = "YANDEX_CLOUD_DEFAULT_LB_LISTENER_SUBNET_ID"
+	envInternalLbListenerSubnetID = "YANDEX_CLOUD_DEFAULT_INTERNAL_LB_LISTENER_SUBNET_ID"
+	envLbTgNetworkID              = "YANDEX_CLOUD_DEFAULT_LB_TARGET_GROUP_NETWORK_ID"
+	envInternalNetworkIDs         = "YANDEX_CLOUD_INTERNAL_NETWORK_IDS"
+	envExternalNetworkIDs         = "YANDEX_CLOUD_EXTERNAL_NETWORK_IDS"
 )
 
 // CloudConfig includes all the necessary configuration for creating Cloud object
 type CloudConfig struct {
 	ClusterName string
 
-	lbListenerSubnetID string
-	lbTgNetworkID      string
-	FolderID           string
-	LocalRegion        string
-	LocalZone          string
-	RouteTableID       string
+	lbListenerSubnetID         string
+	internalLbListenerSubnetID string
+	lbTgNetworkID              string
+	FolderID                   string
+	LocalRegion                string
+	LocalZone                  string
+	RouteTableID               string
 
 	InternalNetworkIDsSet map[string]struct{}
 	ExternalNetworkIDsSet map[string]struct{}
@@ -127,6 +129,8 @@
 
 	cloudConfig.lbListenerSubnetID = os.Getenv(envLbListenerSubnetID)
 
+	cloudConfig.internalLbListenerSubnetID = os.Getenv(envInternalLbListenerSubnetID)
+
 	cloudConfig.lbTgNetworkID = os.Getenv(envLbTgNetworkID)
 	if len(cloudConfig.lbTgNetworkID) == 0 {
 		log.Fatalf("%q env is required", envLbTgNetworkID)

pkg/cloudprovider/yandex/load_balancer.go

@@ -19,6 +19,7 @@
 	externalLoadBalancerAnnotation        = "yandex.cpi.flant.com/loadbalancer-external"
 	listenerSubnetIdAnnotation            = "yandex.cpi.flant.com/listener-subnet-id"
 	listenerAddressIPv4                   = "yandex.cpi.flant.com/listener-address-ipv4"
+	loadBalancerInternal                  = "yandex.cpi.flant.com/loadbalancer-internal"
 
 	nodesHealthCheckPath = "/healthz"
 	// NOTE: Please keep the following port in sync with ProxyHealthzPort in pkg/cluster/ports/ports.go
@@ -219,6 +220,11 @@
 		lbParams.listenerSubnetID = yc.config.lbListenerSubnetID
 		_, isExternal := svc.ObjectMeta.Annotations[externalLoadBalancerAnnotation]
 		lbParams.internal = !isExternal
+	} else if len(yc.config.internalLbListenerSubnetID) != 0 {
+		if _, isInternal := svc.ObjectMeta.Annotations[loadBalancerInternal]; isInternal {
+			lbParams.internal = true
+			lbParams.listenerSubnetID = yc.config.internalLbListenerSubnetID
+		}
 	}
 
 	if value, ok := svc.ObjectMeta.Annotations[targetGroupNetworkIdAnnotation]; ok {