Revert "Refactored kubemark into cloud-provider independent code and GCE specific code"

This commit is contained in:
Wojciech Tyczynski
2017-01-24 10:42:17 +01:00
committed by GitHub
parent bcc1dc5c15
commit fbd5c7c380
12 changed files with 361 additions and 522 deletions

View File

@@ -1,6 +1,6 @@
#!/bin/bash
# Copyright 2017 The Kubernetes Authors.
# Copyright 2015 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.

View File

@@ -15,6 +15,5 @@
# limitations under the License.
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
source ${KUBE_ROOT}/test/kubemark/cloud-provider-config.sh
source ${KUBE_ROOT}/cluster/${CLOUD_PROVIDER}/util.sh
source ${KUBE_ROOT}/cluster/kubemark/${CLOUD_PROVIDER}/config-default.sh
source ${KUBE_ROOT}/cluster/gce/util.sh
source ${KUBE_ROOT}/cluster/kubemark/config-default.sh