Skip to content

fix(eks): truncate kubectl error output to avoid CloudFormation respo… #37384

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

Open
ashoknarayan wants to merge 3 commits into
base: main
Choose a base branch
from
+32 −4
Open

fix(eks): truncate kubectl error output to avoid CloudFormation respo… #37384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2efc278
fix(eks): truncate kubectl error output to avoid CloudFormation respo…
ashoknarayan Mar 27, 2026
7860ee6
Merge branch 'main' into fix/kubectl-error-truncation
ashoknarayan Mar 27, 2026
db98f15
Merge branch 'main' into fix/kubectl-error-truncation
ashoknarayan Mar 27, 2026
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
9 changes: 8 additions & 1 deletion packages/@aws-cdk/custom-resource-handlers/lib/aws-eks-v2/kubectl-handler/apply/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
logger = logging.getLogger()
logger.setLevel(logging.INFO)

MAX_ERROR_LENGTH = 2048

# these are coming from the kubectl layer
os.environ['PATH'] = '/opt/kubectl:/opt/awscli:' + os.environ['PATH']

Expand Down Expand Up @@ -86,7 +88,12 @@ def kubectl(verb, file, *opts):
retry = retry - 1
logger.info("kubectl timed out, retries left: %s" % retry)
else:
raise Exception(output)
error_msg = output.decode('utf-8', errors='replace')

if len(error_msg) > MAX_ERROR_LENGTH:
error_msg = error_msg[:MAX_ERROR_LENGTH] + "...[truncated]"

raise Exception(error_msg)
else:
logger.info(output)
return
Expand Down
9 changes: 8 additions & 1 deletion packages/@aws-cdk/custom-resource-handlers/lib/aws-eks-v2/kubectl-handler/patch/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
logger = logging.getLogger()
logger.setLevel(logging.INFO)

MAX_ERROR_LENGTH = 2048

# these are coming from the kubectl layer
os.environ['PATH'] = '/opt/kubectl:/opt/awscli:' + os.environ['PATH']

Expand Down Expand Up @@ -61,7 +63,12 @@ def kubectl(args):
retry = retry - 1
logger.info("kubectl timed out, retries left: %s" % retry)
else:
raise Exception(output)
error_msg = output.decode('utf-8', errors='replace')

if len(error_msg) > MAX_ERROR_LENGTH:
error_msg = error_msg[:MAX_ERROR_LENGTH] + "...[truncated]"

raise Exception(error_msg)
else:
logger.info(output)
return
Expand Down
9 changes: 8 additions & 1 deletion packages/@aws-cdk/custom-resource-handlers/lib/aws-eks/kubectl-handler/apply/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
logger = logging.getLogger()
logger.setLevel(logging.INFO)

MAX_ERROR_LENGTH = 2048

# these are coming from the kubectl layer
os.environ['PATH'] = '/opt/kubectl:/opt/awscli:' + os.environ['PATH']

Expand Down Expand Up @@ -88,7 +90,12 @@ def kubectl(verb, file, *opts):
retry = retry - 1
logger.info("kubectl timed out, retries left: %s" % retry)
else:
raise Exception(output)
error_msg = output.decode('utf-8', errors='replace')

if len(error_msg) > MAX_ERROR_LENGTH:
error_msg = error_msg[:MAX_ERROR_LENGTH] + "...[truncated]"

raise Exception(error_msg)
else:
logger.info(output)
return
Expand Down
9 changes: 8 additions & 1 deletion packages/@aws-cdk/custom-resource-handlers/lib/aws-eks/kubectl-handler/patch/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
logger = logging.getLogger()
logger.setLevel(logging.INFO)

MAX_ERROR_LENGTH = 2048

# these are coming from the kubectl layer
os.environ['PATH'] = '/opt/kubectl:/opt/awscli:' + os.environ['PATH']

Expand Down Expand Up @@ -63,7 +65,12 @@ def kubectl(args):
retry = retry - 1
logger.info("kubectl timed out, retries left: %s" % retry)
else:
raise Exception(output)
error_msg = output.decode('utf-8', errors='replace')

if len(error_msg) > MAX_ERROR_LENGTH:
error_msg = error_msg[:MAX_ERROR_LENGTH] + "...[truncated]"

raise Exception(error_msg)
else:
logger.info(output)
return
Expand Down
Loading