Merge pull request #44674 from madhusudancs/fed-dump-logs-pod-pods

Automatic merge from submit-queue (batch tested with PRs 44499, 44674) Strip "pods/" prefix from the pod names returned by kubectl get pods. Note that the result returned by kubectl get -o name has plural prefixes "pods". We were already trying to remove the prefix "pod", but that's not how the results are returned unfortunately. **Release note**: ```release-note NONE ``` cc @perotinus @kubernetes/sig-federation-pr-reviews

Merge pull request #44674 from madhusudancs/fed-dump-logs-pod-pods
4524579c · Kubernetes Submit Queue · GitHub · 505ec43d · c2a8f0ba · 4524579c
Commit 4524579c authored Apr 19, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 19, 2017
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

log-dump.sh federation/cluster/log-dump.sh +4 -4

No files found.
--- a/federation/cluster/log-dump.sh
+++ b/federation/cluster/log-dump.sh
@@ -39,18 +39,18 @@ function dump_federation_pod_logs() {
    fi

    kubectl logs "${pod_name}" --namespace="${FEDERATION_NAMESPACE}" \
-        >"${OUTPUT_DIR}/${pod_name#pod/}.log"
+        >"${OUTPUT_DIR}/${pod_name#pods/}.log"
  done
 }

 # Dumps logs from all containers in an API server pod.
 # Arguments:
-# - the name of the API server pod, with a pod/ prefix.
+# - the name of the API server pod, with a pods/ prefix.
 function dump_apiserver_pod_logs() {
  local -r apiserver_pod_containers=(apiserver etcd)
  for container in ${apiserver_pod_containers[@]}; do
    kubectl logs "${1}" -c "${container}" --namespace="${FEDERATION_NAMESPACE}" \
-        >"${OUTPUT_DIR}/${1#pod/}-${container}.log"
+        >"${OUTPUT_DIR}/${1#pods/}-${container}.log"
  done
 }

@@ -66,7 +66,7 @@ function dump_dns_pod_logs() {
    # it has three containers.
    for container in ${dns_pod_containers[@]}; do
      kubectl logs "${pod_name}" -c "${container}" --namespace=kube-system \
-          >"${OUTPUT_DIR}/${pod_name#pod/}-${container}.log"
+          >"${OUTPUT_DIR}/${pod_name#pods/}-${container}.log"
    done
  done
 }