Refactor: update DaemonSet and Deployment command params to use templates

[MeNsaaH]

I was about to make a PR to add a certain parameter, but I realized I had to update both files. We could abstract away the need to do this and make the change in a single file by leveraging helm includes

What this PR does / why we need it:

It adds an

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• 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 tests to cover my changes.
• All new and existing tests passed.

[k8s-ci-robot]

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.

---

• If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check your existing CLA data and verify that your email is set on your git commits.
• If you signed the CLA as a corporation, please sign in with your organization's credentials at https://identity.linuxfoundation.org/projects/cncf to be authorized.
• If you have done the above and are still having issues with the CLA being reported as unsigned, please log a ticket with the Linux Foundation Helpdesk: https://support.linuxfoundation.org/
• Should you encounter any issues with the Linux Foundation Helpdesk, send a message to the backup e-mail support address at: login-issues@jira.linuxfoundation.org

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.

[k8s-ci-robot]

@MeNsaaH: 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]

Welcome @MeNsaaH!

It looks like this is your first PR to kubernetes/ingress-nginx 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/ingress-nginx has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

[k8s-ci-robot]

Hi @MeNsaaH. 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.

[MeNsaaH]

CLA signed

[tao12345666333]

Thanks!

/ok-to-test

[MeNsaaH]

/retest

[tao12345666333]

The failure of CI should have nothing to do with this modification, I asked test-infra in slack https://kubernetes.slack.com/archives/C09QZ4DQB/p1632444372042500

[MeNsaaH]

Alright @tao12345666333 . I thought as much. It's failing to destroy the created resources

[MeNsaaH]

What are the next steps for this @tao12345666333 ?

[tao12345666333]

I am looking at test-infra for a good solution

[rikatz]

/retest

[rikatz]

@tao12345666333 maybe the problem is that new image. KRTE was bumped like 10 days ago automatically. What if we run the helm tests also with test e2e runner?

[rikatz]

Or maybe we should move this job to gh actions (as the other CI jobs that demands kind already runs there)

[k8s-ci-robot]

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

Test name	Commit	Details	Required	Rerun command
pull-ingress-nginx-e2e-helm-chart	22b79bff689144ca7071ad46a6e881e2ca0742c3	link	true	/test pull-ingress-nginx-e2e-helm-chart

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

[tao12345666333]

Sorry for delay.

@MeNsaaH Can you please rebase this PR on main branch?

We have move the e2e job to GitHub Action.

[MeNsaaH]

Alright @tao12345666333

[MeNsaaH]

Done @tao12345666333

[tao12345666333]

/lgtm

[tao12345666333]

The difference between this change and the original is the addition of a blank line

/hold

[tao12345666333]

diff --git a/tmp/main.yaml b/tmp/7689.yaml
index 836d6a987..6b8bb5e99 100644
--- a/tmp/main.yaml
+++ b/tmp/7689.yaml
@@ -321,6 +321,7 @@ spec:
                 - /wait-shutdown
           args:
             - /nginx-ingress-controller
+          
             - --publish-service=$(POD_NAMESPACE)/RELEASE-NAME-ingress-nginx-controller
             - --election-id=ingress-controller-leader
             - --controller-class=k8s.io/ingress-nginx

[MeNsaaH]

@tao12345666333 Just checking. Do you need anything else from me?

[cpanato]

/approve

/hold for @tao12345666333 review

[tao12345666333]

@MeNsaaH Although it does not affect the function, I would rather remove the blank line

[MeNsaaH]

@tao12345666333 Blank lines have been removed

[tao12345666333]

cool!

/lgtm
/hold cancel

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cpanato, MeNsaaH, 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:

• charts/ingress-nginx/OWNERS [cpanato]

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