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.

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

Deployment/DaemonSet: Fix templating & value. #10240

Merged
merged 1 commit into from
Sep 10, 2023

Conversation

Gacko
Copy link
Member

@Gacko Gacko commented Jul 22, 2023

What this PR does / why we need it:

This PR fixes the templating of Deployment & DaemonSet and the type of controller.hostAliases in the values.yaml which should be an array.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • CVE Report (Scanner found CVE and adding report)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Documentation only

Which issue/s this PR fixes

How Has This Been Tested?

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I've read the CONTRIBUTION guide
  • I have added unit and/or e2e tests to cover my changes.
  • All new and existing tests passed.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 22, 2023
@netlify
Copy link

netlify bot commented Jul 22, 2023

Deploy Preview for kubernetes-ingress-nginx canceled.

Name Link
🔨 Latest commit e92250e
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/64fb047e314bd30008b80ba4

@k8s-ci-robot k8s-ci-robot added needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. area/helm Issues or PRs related to helm charts labels Jul 22, 2023
@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If Ingress contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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.

@k8s-ci-robot
Copy link
Contributor

Hi @Gacko. Thanks for your PR.

I'm waiting for a kubernetes 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.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Jul 22, 2023
@k8s-ci-robot k8s-ci-robot added needs-priority size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 22, 2023
@Gacko
Copy link
Member Author

Gacko commented Jul 22, 2023

@strongjz: I created this PR in favor of #9744 since the base repository changed.

@Gacko Gacko force-pushed the pull/3 branch 3 times, most recently from cf937c2 to 2d4e85e Compare July 31, 2023 12:18
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 31, 2023
@Gacko Gacko changed the title Deployment/DaemonSet: Fix & align extraModules templating. Deployment/DaemonSet: Align values & templating. Jul 31, 2023
@Gacko
Copy link
Member Author

Gacko commented Jul 31, 2023

@tao12345666333 This one also fixes an issue introduced in #10180. The PR added hostAliases to the Deployment, but not to the DaemonSet, and uses an object in the values.yaml while the pod template expects it to be an array (see the docs).

@Gacko Gacko force-pushed the pull/3 branch 3 times, most recently from b00acd3 to 4d3c480 Compare August 2, 2023 11:32
@Gacko Gacko changed the title Deployment/DaemonSet: Align values & templating. Deployment/DaemonSet: Fix templating. Aug 2, 2023
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 2, 2023
@Gacko Gacko changed the title Deployment/DaemonSet: Fix templating. Deployment/DaemonSet: Align values & templating. Aug 2, 2023
@Gacko Gacko force-pushed the pull/3 branch 2 times, most recently from 2dc3251 to 6eddfc6 Compare August 3, 2023 20:00
Copy link
Member

@tao12345666333 tao12345666333 left a comment

Choose a reason for hiding this comment

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

Thank you for your contribution, I left one comment

charts/ingress-nginx/templates/controller-daemonset.yaml Outdated Show resolved Hide resolved
@Gacko Gacko force-pushed the pull/3 branch 2 times, most recently from 260b18a to d2a4985 Compare August 13, 2023 16:41
@tao12345666333
Copy link
Member

#10240 (comment)

@Gacko
Copy link
Member Author

Gacko commented Aug 14, 2023

I removed the explicit distroloss argument from the extraModules section.

@Gacko Gacko force-pushed the pull/3 branch 2 times, most recently from 7869f48 to a0ee576 Compare August 24, 2023 13:15
@Gacko
Copy link
Member Author

Gacko commented Aug 26, 2023

@tao12345666333 I removed the distroless argument from the normal extra modules section as you proposed. Is there anything else preventing this PR from getting merged? Can I support you somewhere? :)

@Gacko Gacko force-pushed the pull/3 branch 5 times, most recently from e42402a to a53b822 Compare September 4, 2023 05:55
@Gacko Gacko force-pushed the pull/3 branch 3 times, most recently from 1d9701e to e1e4556 Compare September 6, 2023 20:42
Copy link
Member

@tao12345666333 tao12345666333 left a comment

Choose a reason for hiding this comment

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

sorry for the delay. Only one comment, others LGTM

Copy link
Member

@tao12345666333 tao12345666333 left a comment

Choose a reason for hiding this comment

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

sorry for the delay.

I think it can be merged.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 10, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Gacko, tao12345666333

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 10, 2023
@k8s-ci-robot k8s-ci-robot merged commit 2d03da6 into kubernetes:main Sep 10, 2023
39 checks passed
@Gacko Gacko deleted the pull/3 branch September 10, 2023 16:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/helm Issues or PRs related to helm charts cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants