fix(helm): avoid null volumes in deployment #608
Conversation
|
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 Once the patch is verified, the new status will be reflected by the 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. |
ack-prow
bot
added
the
needs-ok-to-test
|
/ok-to-test |
ack-prow
bot
added
ok-to-test
|
/ok-to-test |
| hostPID: false | ||
| hostNetwork: {{ "{{ .Values.deployment.hostNetwork }}" }} | ||
| dnsPolicy: {{ "{{ .Values.deployment.dnsPolicy }}" }} | ||
| {{ "{{- if or .Values.aws.credentials.secretName .Values.deployment.extraVolumes }}" }} |
There was a problem hiding this comment.
volumeMounts has a similar pattern. Should it also be omitted when .Values.aws.credentials.secretName and .Values.deployment.extraVolumeMounts are not set?
There was a problem hiding this comment.
Good point, I already integrated it into the commit.
blanchardma
force-pushed
the
fix/volumes-null
branch
from
9eab855 to
fad326f
Compare
|
@blanchardma: The following tests failed, say
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. |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: a-hilaly, 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 |
ack-prow
bot
merged commit a609690
into
aws-controllers-k8s:main
Issue [#2583](aws-controllers-k8s/community#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.
3 participants
Description of changes:
The AWS ACK Helm chart generates
"volumes": nullwhen no static secret.Values.aws.credentials.secretNameor no extra volume.Values.deployment.extraVolumeswas set. This can cause issues during the deployment, particularly with admission controllers such as policy engines. An example issue can be found here kyverno/policies#1310 by Kyverno.This PR solves such problems without using a workaround, like deploying an unused emptyDir.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.