gce: allow TCP metrics ports in GCE firewall for Calico CNI

Author: Qqkyu

pkg/model/gcemodel/firewall.go

@@ -149,6 +149,10 @@ func (b *FirewallModelBuilder) Build(c *fi.CloudupModelBuilderContext) error {
 		if b.NetworkingIsCalico() {
 			t.Allowed = append(t.Allowed, "ipip")
 			t.Allowed = append(t.Allowed, fmt.Sprintf("tcp:%d", wellknownports.BGP))
+			t.Allowed = append(t.Allowed, fmt.Sprintf("tcp:%d", wellknownports.KubeControllerManagerMetricsPort))
+			t.Allowed = append(t.Allowed, fmt.Sprintf("tcp:%d", wellknownports.KubeSchedulerMetricsPort))
+			t.Allowed = append(t.Allowed, fmt.Sprintf("tcp:%d", wellknownports.KubeProxyMetricsPort))
+			t.Allowed = append(t.Allowed, fmt.Sprintf("tcp:%d", wellknownports.EtcdMetricsPort))
 		}
 		if b.NetworkingIsCilium() {
 			t.Allowed = append(t.Allowed, fmt.Sprintf("udp:%d", wellknownports.VxlanUDP))

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

@@ -19,7 +19,19 @@ set -x
 
 make test-e2e-install
 
-REPO_ROOT=$(git rev-parse --show-toplevel)
+if [[ "${FORCE_BUILD_KOPS:-}" == "true" && -n "${GCP_PROJECT:-}" ]]; then
+  echo "Building and uploading kops to dynamic staging bucket inside ${GCP_PROJECT}"
+  GCS_BUCKET="gs://${GCP_PROJECT}-kops-staging"
+  gcloud storage buckets create "${GCS_BUCKET}" --project="${GCP_PROJECT}" --location=us-east1 || true
+  export GCS_LOCATION="${GCS_BUCKET}"
+  make gcs-publish-ci
+  KOPS_BASE_URL=$(cat .build/upload/latest-ci.txt)
+  export KOPS_BASE_URL
+  echo "Staged local kops build at KOPS_BASE_URL=${KOPS_BASE_URL}"
+  export PATH="${GOPATH}/src/k8s.io/kops/.build/dist/linux/\$(go env GOARCH):${PATH}"
+fi
+
+REPO_ROOT=\$(git rev-parse --show-toplevel)
 if [[ -z "${K8S_VERSION:-}" ]]; then
   K8S_VERSION=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt
 fi
@@ -163,9 +175,11 @@ KUBETEST2_ARGS+=("--pre-test-cmd=${REPO_ROOT}/tests/e2e/scenarios/scalability/pr
 if [[ -n "${KUBE_FEATURE_GATES:-}" ]]; then
   KUBETEST2_ARGS+=("--kubernetes-feature-gates=${KUBE_FEATURE_GATES}")
 fi
-if [[ "${JOB_TYPE}" == "presubmit" && "${REPO_OWNER}/${REPO_NAME}" == "kubernetes/kops" ]]; then
+if [[ "${FORCE_BUILD_KOPS:-}" == "true" ]]; then
+  KUBETEST2_ARGS+=("--kops-binary-path=${GOPATH}/src/k8s.io/kops/.build/dist/linux/\$(go env GOARCH)/kops")
+elif [[ "${JOB_TYPE}" == "presubmit" && "${REPO_OWNER}/${REPO_NAME}" == "kubernetes/kops" ]]; then
   KUBETEST2_ARGS+=("--build")
-  KUBETEST2_ARGS+=("--kops-binary-path=${GOPATH}/src/k8s.io/kops/.build/dist/linux/$(go env GOARCH)/kops")
+  KUBETEST2_ARGS+=("--kops-binary-path=${GOPATH}/src/k8s.io/kops/.build/dist/linux/\$(go env GOARCH)/kops")
 elif [[ "${JOB_TYPE}" == "presubmit" && "${REPO_OWNER}/${REPO_NAME}" == "kubernetes/kubernetes" ]]; then
   KUBETEST2_ARGS+=("--build")
   KUBETEST2_ARGS+=("--build-kubernetes=true")
@@ -184,6 +198,9 @@ if [[ "${CLOUD_PROVIDER}" == "gce" ]]; then
   else
     KUBETEST2_ARGS+=("--boskos-resource-type=${BOSKOS_RESOURCE_TYPE:-scalability-project}")
   fi
+  if [[ -n "${STAGE_LOCATION:-}" ]]; then
+    KUBETEST2_ARGS+=("--stage-location=${STAGE_LOCATION}")
+  fi
   KUBETEST2_ARGS+=("--control-plane-instance-group-overrides=spec.rootVolume.type=hyperdisk-balanced")
   KUBETEST2_ARGS+=("--control-plane-instance-group-overrides=spec.rootVolume.iops=10000")
   KUBETEST2_ARGS+=("--control-plane-instance-group-overrides=spec.rootVolume.throughput=1000")