Merge pull request #26671 from vishh/node-e2e-images

Automatic merge from submit-queue

Support images and instances to exist in different GCP projects for node

Forked off from #26314
This commit is contained in:
k8s-merge-robot
2016-06-03 13:38:02 -07:00
10 changed files with 46 additions and 13 deletions

View File

@@ -70,6 +70,7 @@ docs/getting-started-guides/coreos/azure/lib/deployment_logic/kubernetes.js:var
examples/cassandra/image/run.sh: cluster_name \
examples/cluster-dns/images/frontend/client.py: service_address = socket.gethostbyname(hostname)
examples/vitess/env.sh: node_ip=$(get_node_ip)
hack/jenkins/e2e-runner.sh: local image_project="$1"
hack/local-up-cluster.sh: runtime_config="--runtime-config=${RUNTIME_CONFIG}"
hack/local-up-cluster.sh: runtime_config=""
hack/test-update-storage-objects.sh: local storage_media_type=${2:-""}

View File

@@ -194,6 +194,7 @@ ignore-daemonsets
ignore-not-found
image-gc-high-threshold
image-gc-low-threshold
image-project
image-pull-policy
include-extended-apis
included-types-overrides
@@ -411,6 +412,7 @@ service-node-ports
service-overrides
service-sync-period
session-affinity
setup-node
show-all
show-events
show-labels