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

Commit d8d83ed

Browse files
QqkyuQqkyu
committed
gce: allow TCP metrics ports in GCE firewall for Calico CNI
1 parent 3d2208a commit d8d83ed

2 files changed

Lines changed: 8 additions & 1 deletion

File tree

‎pkg/model/gcemodel/firewall.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,10 @@ 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("tcp:%d", wellknownports.KubeControllerManagerMetricsPort))
153+
t.Allowed = append(t.Allowed, fmt.Sprintf("tcp:%d", wellknownports.KubeSchedulerMetricsPort))
154+
t.Allowed = append(t.Allowed, fmt.Sprintf("tcp:%d", wellknownports.KubeProxyMetricsPort))
155+
t.Allowed = append(t.Allowed, fmt.Sprintf("tcp:%d", wellknownports.EtcdMetricsPort))
152156
}
153157
if b.NetworkingIsCilium() {
154158
t.Allowed = append(t.Allowed, fmt.Sprintf("udp:%d", wellknownports.VxlanUDP))

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ KUBETEST2_ARGS+=("--pre-test-cmd=${REPO_ROOT}/tests/e2e/scenarios/scalability/pr
163163
if [[ -n "${KUBE_FEATURE_GATES:-}" ]]; then
164164
KUBETEST2_ARGS+=("--kubernetes-feature-gates=${KUBE_FEATURE_GATES}")
165165
fi
166-
if [[ "${JOB_TYPE}" == "presubmit" && "${REPO_OWNER}/${REPO_NAME}" == "kubernetes/kops" ]]; then
166+
if [[ "${FORCE_BUILD_KOPS:-}" == "true" ]] || [[ "${JOB_TYPE}" == "presubmit" && "${REPO_OWNER}/${REPO_NAME}" == "kubernetes/kops" ]]; then
167167
KUBETEST2_ARGS+=("--build")
168168
KUBETEST2_ARGS+=("--kops-binary-path=${GOPATH}/src/k8s.io/kops/.build/dist/linux/$(go env GOARCH)/kops")
169169
elif [[ "${JOB_TYPE}" == "presubmit" && "${REPO_OWNER}/${REPO_NAME}" == "kubernetes/kubernetes" ]]; then
@@ -184,6 +184,9 @@ if [[ "${CLOUD_PROVIDER}" == "gce" ]]; then
184184
else
185185
KUBETEST2_ARGS+=("--boskos-resource-type=${BOSKOS_RESOURCE_TYPE:-scalability-project}")
186186
fi
187+
if [[ -n "${STAGE_LOCATION:-}" ]]; then
188+
KUBETEST2_ARGS+=("--stage-location=${STAGE_LOCATION}")
189+
fi
187190
KUBETEST2_ARGS+=("--control-plane-instance-group-overrides=spec.rootVolume.type=hyperdisk-balanced")
188191
KUBETEST2_ARGS+=("--control-plane-instance-group-overrides=spec.rootVolume.iops=10000")
189192
KUBETEST2_ARGS+=("--control-plane-instance-group-overrides=spec.rootVolume.throughput=1000")

0 commit comments

Comments
 (0)