github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix log collection for kubeadm-gce tests

Browse Source 
Separate out kuberenetes-anywhere provider under cluster/ but
delegate all the functionality to the "gce" one since the code
would be the same. Except for the name of the node, the
NODE_INSTANCE_PREFIX will be different, so account for that.
This commit is contained in:
Davanum Srinivas 2017-10-25 16:40:08 -04:00
parent 58fd063a6c
commit 9a217217c1
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/gce/util.sh
View File

@ -84,7 +84,8 @@ if [[ "${ENABLE_CLUSTER_AUTOSCALER}" == "true" ]]; then
fi fi
fi fi
NODE_INSTANCE_PREFIX="${INSTANCE_PREFIX}-minion" NODE_INSTANCE_PREFIX=${NODE_INSTANCE_PREFIX:-"${INSTANCE_PREFIX}-minion"}
NODE_TAGS="${NODE_TAG}" NODE_TAGS="${NODE_TAG}"
ALLOCATE_NODE_CIDRS=true ALLOCATE_NODE_CIDRS=true

20
cluster/kubernetes-anywhere/util.sh Executable file
View File

@ -0,0 +1,20 @@
#!/bin/bash
# Copyright 2017 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.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
set -x
NODE_INSTANCE_PREFIX=${NODE_INSTANCE_PREFIX:-"${INSTANCE_PREFIX}-node"}
source "${KUBE_ROOT}/cluster/gce/util.sh"

8
cluster/log-dump/log-dump.sh
View File

@ -37,9 +37,9 @@ else
readonly use_custom_instance_list= readonly use_custom_instance_list=
fi fi
readonly master_ssh_supported_providers="gce aws" readonly master_ssh_supported_providers="gce aws kubernetes-anywhere"
readonly node_ssh_supported_providers="gce gke aws" readonly node_ssh_supported_providers="gce gke aws kubernetes-anywhere"
readonly gcloud_supported_providers="gce gke" readonly gcloud_supported_providers="gce gke kubernetes-anywhere"
readonly master_logfiles="kube-apiserver kube-apiserver-audit kube-scheduler rescheduler kube-controller-manager etcd etcd-events glbc cluster-autoscaler kube-addon-manager fluentd" readonly master_logfiles="kube-apiserver kube-apiserver-audit kube-scheduler rescheduler kube-controller-manager etcd etcd-events glbc cluster-autoscaler kube-addon-manager fluentd"
readonly node_logfiles="kube-proxy fluentd node-problem-detector" readonly node_logfiles="kube-proxy fluentd node-problem-detector"
@ -141,7 +141,7 @@ function save-logs() {
fi fi
else else
case "${KUBERNETES_PROVIDER}" in case "${KUBERNETES_PROVIDER}" in
gce|gke) gce|gke|kubernetes-anywhere)
files="${files} ${gce_logfiles}" files="${files} ${gce_logfiles}"
;; ;;
aws) aws)