From 97df059d9b272958c46fb281464eecb0a445a8f1 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Tue, 13 Jul 2021 23:38:54 +0300 Subject: [PATCH 1/2] Limit # of nodes that can be added on cluster-up --- manager/manifests/istio.yaml.j2 | 6 ------ pkg/types/clusterconfig/cluster_config.go | 10 +++++++++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/manager/manifests/istio.yaml.j2 b/manager/manifests/istio.yaml.j2 index b782830644..1f627f5d06 100644 --- a/manager/manifests/istio.yaml.j2 +++ b/manager/manifests/istio.yaml.j2 @@ -64,9 +64,6 @@ spec: - name: https port: 443 targetPort: 443 - - name: tls # used for SNI - port: 15443 - targetPort: 15443 resources: requests: cpu: 100m @@ -123,9 +120,6 @@ spec: - name: https port: 443 targetPort: 443 - - name: tls # used for SNI - port: 15443 - targetPort: 15443 resources: requests: cpu: 400m diff --git a/pkg/types/clusterconfig/cluster_config.go b/pkg/types/clusterconfig/cluster_config.go index aa7c80dbd1..e91a040176 100644 --- a/pkg/types/clusterconfig/cluster_config.go +++ b/pkg/types/clusterconfig/cluster_config.go @@ -48,8 +48,16 @@ import ( const ( // MaxNodeGroups represents the max number of node groups in a cluster MaxNodeGroups = 100 + // MaxNodesToAddOnClusterUp represents the max number of nodes to add on cluster up - MaxNodesToAddOnClusterUp = 250 + // Limited to 150 nodes (rounded down from 164 nodes) for two reasons: + // + // * To prevent overloading the API servers when the nodes are being added. + // + // * To prevent hitting the 500 targets per LB (when the cross-load balancing is enabled) limit (quota code L-B211E961); + // 500 divided by 3 target listeners - 1 operator node - 1 prometheus node => 164 + MaxNodesToAddOnClusterUp = 150 + // MaxNodesToAddOnClusterConfigure represents the max number of nodes to add on cluster up/configure MaxNodesToAddOnClusterConfigure = 100 // ClusterNameTag is the tag used for storing a cluster's name in AWS resources From 5b7606f64aff5ea60cf2ee06512e0518d3327f84 Mon Sep 17 00:00:00 2001 From: Robert Lucian Chiriac Date: Wed, 14 Jul 2021 01:13:39 +0300 Subject: [PATCH 2/2] Remove status port listener --- manager/manifests/istio.yaml.j2 | 6 ------ pkg/types/clusterconfig/cluster_config.go | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/manager/manifests/istio.yaml.j2 b/manager/manifests/istio.yaml.j2 index 1f627f5d06..ecccf38695 100644 --- a/manager/manifests/istio.yaml.j2 +++ b/manager/manifests/istio.yaml.j2 @@ -55,9 +55,6 @@ spec: app: operator-istio-gateway istio: ingressgateway-operator ports: - - name: status-port # should be first in the list, see https://github.com/istio/istio/issues/12503 - port: 15021 - targetPort: 15021 - name: http2 port: 80 targetPort: 80 @@ -111,9 +108,6 @@ spec: app: apis-istio-gateway istio: ingressgateway-apis ports: - - name: status-port # should be first in the list, see https://github.com/istio/istio/issues/12503 - port: 15021 - targetPort: 15021 - name: http2 port: 80 targetPort: 80 diff --git a/pkg/types/clusterconfig/cluster_config.go b/pkg/types/clusterconfig/cluster_config.go index e91a040176..2b47c55887 100644 --- a/pkg/types/clusterconfig/cluster_config.go +++ b/pkg/types/clusterconfig/cluster_config.go @@ -50,13 +50,13 @@ const ( MaxNodeGroups = 100 // MaxNodesToAddOnClusterUp represents the max number of nodes to add on cluster up - // Limited to 150 nodes (rounded down from 164 nodes) for two reasons: + // Limited to 200 nodes (rounded down from 248 nodes) for two reasons: // // * To prevent overloading the API servers when the nodes are being added. // // * To prevent hitting the 500 targets per LB (when the cross-load balancing is enabled) limit (quota code L-B211E961); - // 500 divided by 3 target listeners - 1 operator node - 1 prometheus node => 164 - MaxNodesToAddOnClusterUp = 150 + // 500 divided by 2 target listeners - 1 operator node - 1 prometheus node => 248 + MaxNodesToAddOnClusterUp = 200 // MaxNodesToAddOnClusterConfigure represents the max number of nodes to add on cluster up/configure MaxNodesToAddOnClusterConfigure = 100