From 593e54af579b548d60b51b500e9f17139aa0f123 Mon Sep 17 00:00:00 2001 From: Sebastian Nallar Date: Tue, 2 Sep 2025 09:59:06 -0300 Subject: [PATCH 1/2] [feature]: logs --- k8s/instance/list | 8 +++++++- k8s/instance/workflows/list.yaml | 2 ++ k8s/log/kube-logger-bash/exec | 11 +++++++++++ k8s/log/workflows/log.yaml | 2 ++ service/instance/entrypoint | 2 +- service/log/entrypoint | 2 +- 6 files changed, 24 insertions(+), 3 deletions(-) diff --git a/k8s/instance/list b/k8s/instance/list index 202470ae..ff449411 100644 --- a/k8s/instance/list +++ b/k8s/instance/list @@ -1,13 +1,19 @@ #!/bin/bash -K8S_NAMESPACE="nullplatform" +K8S_NAMESPACE=$(echo "$CONTEXT" | jq -r --arg default "$K8S_NAMESPACE" ' + .providers["container-orchestration"].cluster.namespace // $default +' 2>/dev/null || echo "nullplatform") + LABEL_SELECTOR="nullplatform=true" + if [[ -n "$APPLICATION_ID" && "$APPLICATION_ID" != "null" ]]; then LABEL_SELECTOR="$LABEL_SELECTOR,application_id=$APPLICATION_ID" fi + if [[ -n "$SCOPE_ID" && "$SCOPE_ID" != "null" ]]; then LABEL_SELECTOR="$LABEL_SELECTOR,scope_id=$SCOPE_ID" fi + if [[ -n "$DEPLOYMENT_ID" && "$DEPLOYMENT_ID" != "null" ]]; then LABEL_SELECTOR="$LABEL_SELECTOR,deployment_id=$DEPLOYMENT_ID" fi diff --git a/k8s/instance/workflows/list.yaml b/k8s/instance/workflows/list.yaml index a05c4815..6f324ff1 100644 --- a/k8s/instance/workflows/list.yaml +++ b/k8s/instance/workflows/list.yaml @@ -1,3 +1,5 @@ +include: + - "$SERVICE_PATH/values.yaml" steps: - name: build context type: script diff --git a/k8s/log/kube-logger-bash/exec b/k8s/log/kube-logger-bash/exec index e9315dcf..ac9ba987 100755 --- a/k8s/log/kube-logger-bash/exec +++ b/k8s/log/kube-logger-bash/exec @@ -16,6 +16,7 @@ LIMIT=$DEFAULT_LIMIT NEXT_PAGE_TOKEN="" FILTER_PATTERN="" START_TIME="" +PREVIOUS=true # Function to show usage usage() { @@ -31,6 +32,7 @@ OPTIONS: -t, --next-page-token TOKEN Token for pagination -f, --filter PATTERN Filter pattern --start-time TIME Start time for logs (RFC3339 format, e.g., 2024-01-01T12:00:00Z) + -p, --previous Get logs from previous terminated container instances -h, --help Show this help message EOF @@ -72,6 +74,10 @@ parse_args() { START_TIME="$2" shift 2 ;; + -p|--previous) + PREVIOUS=true + shift + ;; -h|--help) usage exit 0 @@ -171,6 +177,11 @@ get_pod_logs() { local kubectl_args="$namespace_arg logs $pod_name -c $DEFAULT_CONTAINER_NAME --timestamps=true" + # Add --previous flag if requested + if [[ "$PREVIOUS" == "true" ]]; then + kubectl_args="$kubectl_args --previous" + fi + # Add since-time if provided if [[ -n "$since_time" ]]; then kubectl_args="$kubectl_args --since-time=$since_time" diff --git a/k8s/log/workflows/log.yaml b/k8s/log/workflows/log.yaml index 615fa6d6..0021aef7 100644 --- a/k8s/log/workflows/log.yaml +++ b/k8s/log/workflows/log.yaml @@ -1,3 +1,5 @@ +include: + - "$SERVICE_PATH/values.yaml" steps: - name: build context type: script diff --git a/service/instance/entrypoint b/service/instance/entrypoint index 7d51f9b8..b13d45a6 100755 --- a/service/instance/entrypoint +++ b/service/instance/entrypoint @@ -17,7 +17,7 @@ fi WORKFLOW_PATH="$SERVICE_PATH/instance/workflows/list.yaml" OVERRIDES_WORKFLOW_PATH="$OVERRIDES_WORKFLOW_PATH/instance/workflows/list.yaml" -CMD="np service workflow exec --no-output --workflow $WORKFLOW_PATH" +CMD="np service workflow exec --no-output --build-context --workflow $WORKFLOW_PATH" if [[ -f "$OVERRIDES_WORKFLOW_PATH" ]]; then CMD="$CMD --overrides $OVERRIDES_WORKFLOW_PATH" diff --git a/service/log/entrypoint b/service/log/entrypoint index d84b4ff2..7bb8cc11 100755 --- a/service/log/entrypoint +++ b/service/log/entrypoint @@ -3,7 +3,7 @@ WORKFLOW_PATH="$SERVICE_PATH/log/workflows/log.yaml" OVERRIDES_WORKFLOW_PATH="$OVERRIDES_PATH/log/workflows/log.yaml" -CMD="np service workflow exec --no-output --workflow $WORKFLOW_PATH" +CMD="np service workflow exec --no-output --build-context --workflow $WORKFLOW_PATH" if [[ -f "$OVERRIDES_WORKFLOW_PATH" ]]; then CMD="$CMD --overrides $OVERRIDES_WORKFLOW_PATH" From c3cebebf8ee9429d2ce5cd9de2844ac9c62a75f0 Mon Sep 17 00:00:00 2001 From: Sebastian Nallar Date: Tue, 2 Sep 2025 15:22:40 -0300 Subject: [PATCH 2/2] [fixes]: revert exec --- k8s/log/kube-logger-bash/exec | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/k8s/log/kube-logger-bash/exec b/k8s/log/kube-logger-bash/exec index ac9ba987..e9315dcf 100755 --- a/k8s/log/kube-logger-bash/exec +++ b/k8s/log/kube-logger-bash/exec @@ -16,7 +16,6 @@ LIMIT=$DEFAULT_LIMIT NEXT_PAGE_TOKEN="" FILTER_PATTERN="" START_TIME="" -PREVIOUS=true # Function to show usage usage() { @@ -32,7 +31,6 @@ OPTIONS: -t, --next-page-token TOKEN Token for pagination -f, --filter PATTERN Filter pattern --start-time TIME Start time for logs (RFC3339 format, e.g., 2024-01-01T12:00:00Z) - -p, --previous Get logs from previous terminated container instances -h, --help Show this help message EOF @@ -74,10 +72,6 @@ parse_args() { START_TIME="$2" shift 2 ;; - -p|--previous) - PREVIOUS=true - shift - ;; -h|--help) usage exit 0 @@ -177,11 +171,6 @@ get_pod_logs() { local kubectl_args="$namespace_arg logs $pod_name -c $DEFAULT_CONTAINER_NAME --timestamps=true" - # Add --previous flag if requested - if [[ "$PREVIOUS" == "true" ]]; then - kubectl_args="$kubectl_args --previous" - fi - # Add since-time if provided if [[ -n "$since_time" ]]; then kubectl_args="$kubectl_args --since-time=$since_time"