allow set annotations for admission Jobs

[onimsha]

Signed-off-by: Alex Co [email protected]

What this PR does / why we need it:

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

fixes #7978

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: [email protected]

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.

[linux-foundation-easycla]

The committers are authorized under a signed CLA.

• ✅ Alex Co (6a9e97f)

[k8s-ci-robot]

Welcome @onimsha!

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 @onimsha. 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.

[cpanato]

/triage accepted
/priority important-soon
/kind feature

[cpanato]

thanks for this PR
can you please bump the chart version and add the changelog text?

thanks

[onimsha]

thanks for this PR can you please bump the chart version and add the changelog text?

thanks

Sure. Will do

[tao12345666333]

/ok-to-test

[rikatz]

/label tide/merge-method-squash
/lgtm
/approve
Thanks

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: onimsha, rikatz

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 [rikatz]

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

[vlev]

Hi,
I'm trying to utilize annotations on admission webhooks and I'm getting "Error: UPGRADE FAILED: YAML parse error on ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml: error converting YAML to JSON: yaml: line 8: mapping values are not allowed in this context".

@onimsha, I believe, the reason for that is the use of "indent" instead of "nindent" in job-createSecret.yaml

{{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled -}}
apiVersion: batch/v1
kind: Job
metadata:
  name: {{ include "ingress-nginx.fullname" . }}-admission-create
  namespace: {{ .Release.Namespace }}
  annotations:
    "helm.sh/hook": pre-install,pre-upgrade
    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
    {{- with .Values.controller.admissionWebhooks.annotations }}
    {{- toYaml . | indent 4 }}
    {{- end }}
  labels:
    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: admission-webhook
    {{- with .Values.controller.admissionWebhooks.patch.labels }}
    {{- toYaml . | nindent 4 }}
    {{- end }}

Could you please look into it?

[onimsha]

Hi, I'm trying to utilize annotations on admission webhooks and I'm getting "Error: UPGRADE FAILED: YAML parse error on ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml: error converting YAML to JSON: yaml: line 8: mapping values are not allowed in this context".

@onimsha, I believe, the reason for that is the use of "indent" instead of "nindent" in job-createSecret.yaml

{{- if and .Values.controller.admissionWebhooks.enabled .Values.controller.admissionWebhooks.patch.enabled -}}
apiVersion: batch/v1
kind: Job
metadata:
  name: {{ include "ingress-nginx.fullname" . }}-admission-create
  namespace: {{ .Release.Namespace }}
  annotations:
    "helm.sh/hook": pre-install,pre-upgrade
    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
    {{- with .Values.controller.admissionWebhooks.annotations }}
    {{- toYaml . | indent 4 }}
    {{- end }}
  labels:
    {{- include "ingress-nginx.labels" . | nindent 4 }}
    app.kubernetes.io/component: admission-webhook
    {{- with .Values.controller.admissionWebhooks.patch.labels }}
    {{- toYaml . | nindent 4 }}
    {{- end }}

Could you please look into it?

i'm not sure if it was the reason. Could your share what was your values of the controller.admissionWebhooks.annotations in values.yaml ?

[vlev]

@onimsha
Here is the values.yaml I was using:

controller:
  ## Annotations to be added to the controller Deployment or DaemonSet
  ##
  podAnnotations:
    nginx.ingress.kubernetes.io/service-upstream: "true"
    traffic.sidecar.istio.io/excludeInboundPorts: 80,443
    traffic.sidecar.istio.io/includeInboundPorts: ""
    traffic.sidecar.istio.io/excludeOutboundIPRanges: "10.96.0.1"

  admissionWebhooks:
    annotations:
      traffic.sidecar.istio.io/excludeOutboundIPRanges: "10.96.0.1"


  ## Labels to be added to the controller Deployment or DaemonSet and other resources that do not have option to specify labels
  ##
  labels:
    keel.sh/policy: patch
    keel.sh/trigger: poll

[onimsha]

@vlev there's a new chart version, 4.0.13 which uses nindent rather than indent. Can you test with the new version to see if the problem still persist ?

[vlev]

@onimsha, Same error.
Also, I don't see relevant changes in helm-chart-4.0.12...helm-chart-4.0.13

Are you sure that the fix was included?