Skip to content

Conversation

@blanchardma
Copy link
Contributor

Issue #2583

Description of changes:

This PR addresses an issue encountered when rendering a Helm chart that includes additional volumes, such as an emptyDir. The change ensures with - that leading whitespace is trimmed and using nindent instead of indent prevents unwanted blank lines. The issue originates from the following pull request #608.

To manually validate the fix of this PR in a chart based on the code-generator follow the steps below:

# Pull and extract the ACM chart, which is based on the code-generator: 
$ helm pull oci://public.ecr.aws/aws-controllers-k8s/acm-chart --version 1.0.14 && tar -xzf acm-chart-1.0.14.tgz

# Apply the fix from this PR to the chart
$ sed -i '208s|.*|        {{- toYaml .Values.deployment.extraVolumes \| nindent 8 }}|' ./acm-chart/templates/deployment.yaml

# Render the chart and verify the output:
$ helm template ./acm-chart --set deployment.extraVolumes[0].name=test --set deployment.extraVolumes[0].emptyDir.sizeLimit=1Mi

# Expected output snippet:
...
      hostPID: false
      hostNetwork: false
      dnsPolicy: ClusterFirst
      volumes:
        - emptyDir:
            sizeLimit: 1Mi
          name: test

To reproduce the issue with the current version, refer to the steps outlined in the mentioned issue at top.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@ack-prow ack-prow bot requested review from jlbutler and michaelhtm July 30, 2025 10:24
@ack-prow ack-prow bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 30, 2025
@ack-prow
Copy link

ack-prow bot commented Jul 30, 2025

Hi @blanchardma. Thanks for your PR.

I'm waiting for a aws-controllers-k8s member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@knottnt
Copy link
Contributor

knottnt commented Jul 30, 2025

@blanchardma Thanks for the PR!

/ok-to-test

@ack-prow ack-prow bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 30, 2025
@knottnt
Copy link
Contributor

knottnt commented Jul 30, 2025

/test eks-controller-test

1 similar comment
@knottnt
Copy link
Contributor

knottnt commented Jul 30, 2025

/test eks-controller-test

@ack-prow
Copy link

ack-prow bot commented Jul 31, 2025

@blanchardma: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
verify-attribution d2f81bb link false /test verify-attribution
s3-olm-test d2f81bb link false /test s3-olm-test

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@knottnt
Copy link
Contributor

knottnt commented Aug 1, 2025

/test eks-controller-test

Copy link
Contributor

@knottnt knottnt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@blanchardma Thanks for the contribution!

@ack-prow ack-prow bot added the lgtm Indicates that a PR is ready to be merged. label Aug 1, 2025
@ack-prow
Copy link

ack-prow bot commented Aug 1, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: blanchardma, knottnt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ack-prow ack-prow bot added the approved label Aug 1, 2025
@ack-prow ack-prow bot merged commit b4fbf4e into aws-controllers-k8s:main Aug 1, 2025
17 of 19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants