Skip to content

K
k3s
Commit 512f7c3e authored by Marek Grabowski's avatar Marek Grabowski
Browse files
Options

Merge pull request #14973 from gmarek/fix-jenkins

Avoid overriding kubemark config variables defined in kubemark/config-default.sh script
parents 562ea716 b283fdde
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cluster/kubemark/util.sh
View file @ 512f7c3e
...@@ -15,5 +15,5 @@ ...@@ -15,5 +15,5 @@
# limitations under the License. # limitations under the License.
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../.. KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
source ${KUBE_ROOT}/cluster/kubemark/config-default.sh
source ${KUBE_ROOT}/cluster/gce/util.sh source ${KUBE_ROOT}/cluster/gce/util.sh
source ${KUBE_ROOT}/cluster/kubemark/config-default.sh
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment