Sitelet https://github.com/kubernetes/kops/commit/9207ae4cebe4907728958e85349e172338522f05
Skip to content

Commit 9207ae4

Browse files
QqkyuQqkyu
committed
gce: allow TCP metrics ports in GCE firewall for Calico mode
1 parent 3dd8fc7 commit 9207ae4

3 files changed

Lines changed: 0 additions & 12 deletions

File tree

‎pkg/model/gcemodel/firewall.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ func (b *FirewallModelBuilder) Build(c *fi.CloudupModelBuilderContext) error {
149149
if b.NetworkingIsCalico() {
150150
t.Allowed = append(t.Allowed, "ipip")
151151
t.Allowed = append(t.Allowed, fmt.Sprintf("tcp:%d", wellknownports.BGP))
152-
t.Allowed = append(t.Allowed, fmt.Sprintf("udp:%d", wellknownports.CalicoVxlanUDP))
153152
t.Allowed = append(t.Allowed, fmt.Sprintf("tcp:%d", wellknownports.KubeControllerManagerMetricsPort))
154153
t.Allowed = append(t.Allowed, fmt.Sprintf("tcp:%d", wellknownports.KubeSchedulerMetricsPort))
155154
t.Allowed = append(t.Allowed, fmt.Sprintf("tcp:%d", wellknownports.KubeProxyMetricsPort))

‎pkg/wellknownports/wellknownports.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,6 @@ const (
104104
// VxlanUDP is the port used by VXLAN tunneling over UDP
105105
VxlanUDP = 8472
106106

107-
// CalicoVxlanUDP is the port used by Calico VXLAN tunneling over UDP
108-
CalicoVxlanUDP = 4789
109-
110107
// AWSLBCMetricsPort is reserved for the AWS Load Balancer Controller's metrics.
111108
AWSLBCMetricsPort = 9442
112109

‎tests/e2e/scenarios/scalability/run-test.sh‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ if [[ "${CLOUD_PROVIDER}" == "gce" ]]; then
9393
create_args+=("--set spec.etcdClusters[*].etcdMembers[*].volumeType=hyperdisk-balanced")
9494
fi
9595
create_args+=("--networking=${CNI_PLUGIN:-calico}")
96-
if [[ -z "${CNI_PLUGIN:-}" || "${CNI_PLUGIN}" == "calico" ]]; then
97-
create_args+=("--set spec.networking.calico.encapsulationMode=vxlan")
98-
fi
9996
if [[ "${CNI_PLUGIN}" == "amazonvpc" ]]; then
10097
create_args+=("--set spec.networking.amazonVPC.env=ENABLE_PREFIX_DELEGATION=true")
10198
fi
@@ -256,11 +253,6 @@ else
256253
CLUSTERLOADER2_ARGS+=("--v=2")
257254
fi
258255

259-
if [[ "${CLOUD_PROVIDER}" == "gce" ]]; then
260-
CLUSTERLOADER2_ARGS+=("--prometheus-pvc-storage-class=ssd")
261-
CLUSTERLOADER2_ARGS+=("--extra-args=--prometheus-storage-class-provisioner=pd.csi.storage.gke.io")
262-
fi
263-
264256

265257

266258
# ToDo: remove this once we can run the huge-service test on AWS

0 commit comments

Comments
 (0)