mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #51892 from shyamjvs/logdump-for-kubemark
Automatic merge from submit-queue Correct logdump logic for kubemark master Ref https://github.com/kubernetes/kubernetes/pull/51837#issuecomment-326920300
This commit is contained in:
commit
bef5cf386e
@ -176,6 +176,8 @@ function dump_masters() {
|
||||
elif [[ ! "${master_ssh_supported_providers}" =~ "${KUBERNETES_PROVIDER}" ]]; then
|
||||
echo "Master SSH not supported for ${KUBERNETES_PROVIDER}"
|
||||
return
|
||||
elif [[ -n "${KUBEMARK_MASTER_NAME:-}" ]]; then
|
||||
master_names=( "${KUBEMARK_MASTER_NAME}" )
|
||||
else
|
||||
if ! (detect-master); then
|
||||
echo "Master not detected. Is the cluster up?"
|
||||
|
@ -14,15 +14,13 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
export KUBERNETES_PROVIDER="kubemark"
|
||||
export KUBE_CONFIG_FILE="config-default.sh"
|
||||
|
||||
REPORT_DIR="${1:-_artifacts}"
|
||||
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/../..
|
||||
|
||||
source "${KUBE_ROOT}/cluster/kubemark/util.sh"
|
||||
source ${KUBE_ROOT}/test/kubemark/cloud-provider-config.sh
|
||||
source ${KUBE_ROOT}/cluster/kubemark/${CLOUD_PROVIDER}/config-default.sh
|
||||
|
||||
detect-master
|
||||
export KUBEMARK_MASTER_NAME="${MASTER_NAME}"
|
||||
|
||||
echo "Dumping logs for kubemark master: ${MASTER_NAME}"
|
||||
echo "Dumping logs for kubemark master: ${KUBEMARK_MASTER_NAME}"
|
||||
DUMP_ONLY_MASTER_LOGS=true ${KUBE_ROOT}/cluster/log-dump/log-dump.sh "${REPORT_DIR}"
|
||||
|
Loading…
Reference in New Issue
Block a user