Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

log-collector: refactor get_k8s_info #1652

Merged
merged 4 commits into from
Mar 6, 2024
+20 −18
Merged

log-collector: refactor get_k8s_info #1652

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7990c10
log-collector: refactor get_k8s_info
wafuwafu13 Feb 12, 2024
191522f
fix: revert meaningless change
wafuwafu13 Feb 12, 2024
0c21f2b
refactor: rename func
wafuwafu13 Feb 16, 2024
befed8c
Merge remote-tracking branch 'upstream/main' into refactor-k8sinfo
wafuwafu13 Feb 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions log-collector-script/linux/eks-log-collector.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,31 +428,33 @@ get_docker_logs() {
get_k8s_info() {
try "collect kubelet information"

if [[ -n "${KUBECONFIG:-}" ]]; then
command -v kubectl > /dev/null && kubectl get --kubeconfig="${KUBECONFIG}" svc > "${COLLECT_DIR}"/kubelet/svc.log
command -v kubectl > /dev/null && kubectl --kubeconfig="${KUBECONFIG}" config view --output yaml > "${COLLECT_DIR}"/kubelet/kubeconfig.yaml

elif [[ -f /etc/eksctl/kubeconfig.yaml ]]; then
KUBECONFIG="/etc/eksctl/kubeconfig.yaml"
command -v kubectl > /dev/null && kubectl get --kubeconfig="${KUBECONFIG}" svc > "${COLLECT_DIR}"/kubelet/svc.log
command -v kubectl > /dev/null && kubectl --kubeconfig="${KUBECONFIG}" config view --output yaml > "${COLLECT_DIR}"/kubelet/kubeconfig.yaml

elif [[ -f /etc/systemd/system/kubelet.service ]]; then
KUBECONFIG=$(grep kubeconfig /etc/systemd/system/kubelet.service | awk '{print $2}')
command -v kubectl > /dev/null && kubectl get --kubeconfig="${KUBECONFIG}" svc > "${COLLECT_DIR}"/kubelet/svc.log
command -v kubectl > /dev/null && kubectl --kubeconfig="${KUBECONFIG}" config view --output yaml > "${COLLECT_DIR}"/kubelet/kubeconfig.yaml
find_kubeconfig() {
if [[ -n "${KUBECONFIG:-}" ]]; then
echo "${KUBECONFIG}"
elif [[ -f /etc/eksctl/kubeconfig.yaml ]]; then
echo "/etc/eksctl/kubeconfig.yaml"
elif [[ -f /etc/systemd/system/kubelet.service ]]; then
echo $(grep kubeconfig /etc/systemd/system/kubelet.service | awk '{print $2}')
elif [[ -f /var/lib/kubelet/kubeconfig ]]; then
echo "/var/lib/kubelet/kubeconfig"
else
echo ""
fi
}

elif [[ -f /var/lib/kubelet/kubeconfig ]]; then
KUBECONFIG="/var/lib/kubelet/kubeconfig"
command -v kubectl > /dev/null && kubectl get --kubeconfig=${KUBECONFIG} svc > "${COLLECT_DIR}"/kubelet/svc.log
command -v kubectl > /dev/null && kubectl --kubeconfig=${KUBECONFIG} config view --output yaml > "${COLLECT_DIR}"/kubelet/kubeconfig.yaml
KUBECONFIG_PATH=$(find_kubeconfig)

if [[ -n "${KUBECONFIG_PATH}" ]]; then
command -v kubectl > /dev/null && kubectl get --kubeconfig="${KUBECONFIG_PATH}" svc > "${COLLECT_DIR}"/kubelet/svc.log
command -v kubectl > /dev/null && kubectl --kubeconfig="${KUBECONFIG_PATH}" config view --output yaml > "${COLLECT_DIR}"/kubelet/kubeconfig.yaml
else
echo "======== Unable to find KUBECONFIG, IGNORING POD DATA =========" >> "${COLLECT_DIR}"/kubelet/svc.log
fi

# Try to copy the kubeconfig file if kubectl command doesn't exist
[[ (! -f "${COLLECT_DIR}/kubelet/kubeconfig.yaml") && (-n ${KUBECONFIG}) ]] && cp ${KUBECONFIG} "${COLLECT_DIR}"/kubelet/kubeconfig.yaml
if [[ ! -f "${COLLECT_DIR}/kubelet/kubeconfig.yaml" && -n "${KUBECONFIG_PATH}" ]]; then
cp "${KUBECONFIG_PATH}" "${COLLECT_DIR}/kubelet/kubeconfig.yaml"
fi

case "${INIT_TYPE}" in
systemd)
Expand Down
Loading