github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-31 05:40:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11789 from mbforbes/nodesNetwork

Browse Source 
Implement 'Nodes Network' test for GKE
This commit is contained in:
Mike Danese
2015-07-29 17:43:33 -07:00
parent 618416baeb bd9e09ba00
commit 59a1dd4267
3 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/gke/util.sh
View File

@@ -210,18 +210,17 @@ function get-password() {
| grep password | cut -f 4 -d ' ') | grep password | cut -f 4 -d ' ')
} }
# Detect the instance name and IP for the master # Detect the IP for the master. Note that on GKE, we don't know the name of the
# master, so KUBE_MASTER is not set.
# #
# Assumed vars: # Assumed vars:
# ZONE # ZONE
# CLUSTER_NAME # CLUSTER_NAME
# Vars set: # Vars set:
# KUBE_MASTER
# KUBE_MASTER_IP # KUBE_MASTER_IP
function detect-master() { function detect-master() {
echo "... in gke:detect-master()" >&2 echo "... in gke:detect-master()" >&2
detect-project >&2 detect-project >&2
KUBE_MASTER="k8s-${CLUSTER_NAME}-master"
KUBE_MASTER_IP=$("${GCLOUD}" "${CMD_GROUP}" container clusters describe \ KUBE_MASTER_IP=$("${GCLOUD}" "${CMD_GROUP}" container clusters describe \
--project="${PROJECT}" --zone="${ZONE}" "${CLUSTER_NAME}" \ --project="${PROJECT}" --zone="${ZONE}" "${CLUSTER_NAME}" \
| grep endpoint | cut -f 2 -d ' ') | grep endpoint | cut -f 2 -d ' ')

2
hack/ginkgo-e2e.sh
View File

@@ -89,7 +89,7 @@ fi
export PATH=$(dirname "${e2e_test}"):"${PATH}" export PATH=$(dirname "${e2e_test}"):"${PATH}"
"${ginkgo}" "${ginkgo_args[@]:+${ginkgo_args[@]}}" "${e2e_test}" -- \ "${ginkgo}" "${ginkgo_args[@]:+${ginkgo_args[@]}}" "${e2e_test}" -- \
"${auth_config[@]:+${auth_config[@]}}" \ "${auth_config[@]:+${auth_config[@]}}" \
--host="https://${KUBE_MASTER_IP-}" \ --host="https://${KUBE_MASTER_IP:-}" \
--provider="${KUBERNETES_PROVIDER}" \ --provider="${KUBERNETES_PROVIDER}" \
--gce-project="${PROJECT:-}" \ --gce-project="${PROJECT:-}" \
--gce-zone="${ZONE:-}" \ --gce-zone="${ZONE:-}" \

18
test/e2e/resize_nodes.go
View File

@@ -326,22 +326,8 @@ func performTemporaryNetworkFailure(c *client.Client, ns, rcName string, replica
Failf("Couldn't get the external IP of host %s with addresses %v", node.Name, node.Status.Addresses) Failf("Couldn't get the external IP of host %s with addresses %v", node.Name, node.Status.Addresses)
} }
By(fmt.Sprintf("block network traffic from node %s to the master", node.Name)) By(fmt.Sprintf("block network traffic from node %s to the master", node.Name))
iptablesRule := fmt.Sprintf("OUTPUT --destination %s --jump DROP",
// TODO marekbiskup 2015-06-19 #10085 strings.TrimPrefix(testContext.Host, "https://"))
// The use of MasterName will cause iptables to do a DNS lookup to
// resolve the name to an IP address, which will slow down the test
// and cause it to fail if DNS is absent or broken.
// Use the IP address instead.
destination := testContext.CloudConfig.MasterName
if providerIs("aws") {
// This is the (internal) IP address used on AWS for the master
// TODO: Use IP address for all clouds?
// TODO: Avoid hard-coding this
destination = "172.20.0.9"
}
iptablesRule := fmt.Sprintf("OUTPUT --destination %s --jump DROP", destination)
defer func() { defer func() {
// This code will execute even if setting the iptables rule failed. // This code will execute even if setting the iptables rule failed.
// It is on purpose because we may have an error even if the new rule // It is on purpose because we may have an error even if the new rule