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

✨ Allow customizing generated webhook K8s Service #1128

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

davidxia
Copy link
Contributor

Allow customizing the webhook K8s Service's name, namespace, and port.

example usage

Look for the new serviceName, serviceNamespace, and servicePort fields.

❯ GOBIN=(pwd)/bin go install ./cmd/*

❯ ./bin/controller-gen webhook -w

Webhook

+kubebuilder:webhook:admissionReviewVersions=<[]string>,failurePolicy=<string>,groups=<[]string>[,matchPolicy=<string>],mutating=<bool>,name=<string>[,path=<string>][,reinvocationPolicy=<string>],resources=<[]string>[,serviceName=<string>][,serviceNamespace=<string>][,servicePort=<int>][,sideEffects=<string>][,timeoutSeconds=<int>][,url=<string>],verbs=<[]string>,versions=<[]string>[,webhookVersions=<[]string>]  package  specifies how a webhook should be served.

...

contributes to #865

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 17, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @davidxia. Thanks for your PR.

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

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jan 17, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: davidxia
Once this PR has been reviewed and has the lgtm label, please assign sbueringer for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 17, 2025
Allow customizing the webhook K8s Service's name, namespace, and port.

## example usage

Look for the new `serviceName`, `serviceNamespace`, and `servicePort` fields.

```
❯ GOBIN=(pwd)/bin go install ./cmd/*

❯ ./bin/controller-gen webhook -w

Webhook

+kubebuilder:webhook:admissionReviewVersions=<[]string>,failurePolicy=<string>,groups=<[]string>[,matchPolicy=<string>],mutating=<bool>,name=<string>[,path=<string>][,reinvocationPolicy=<string>],resources=<[]string>[,serviceName=<string>][,serviceNamespace=<string>][,servicePort=<int>][,sideEffects=<string>][,timeoutSeconds=<int>][,url=<string>],verbs=<[]string>,versions=<[]string>[,webhookVersions=<[]string>]  package  specifies how a webhook should be served.

...
```

contributes to kubernetes-sigs#865

Signed-off-by: David Xia <dxia@spotify.com>
@davidxia
Copy link
Contributor Author

tested manually by

  1. GOBIN=(pwd)/bin go install ./cmd/*
  2. create new kubebuilder-scaffolded project in a directory named project
    a. kubebuilder init --domain tutorial.kubebuilder.io --repo tutorial.kubebuilder.io/project
    b. kubebuilder create api --group batch --version v1 --kind CronJob
    c. kubebuilder create webhook --group batch --version v1 --kind CronJob --defaulting --programmatic-validation
    d. comment out the line namespace: project-system in config/default/kustomization.yaml so it doesn't override the K8s Service namespace we're testing.
  3. copy the ./bin/controller-gen executable into the kubebuilder project's bin/controller-gen-vX.Y.Z path
  4. remove the kubectl apply from the kubebuilder project's Makefile's deploy target

case 1: backwards compatibility

  1. run make deploy and check that kind: MutatingWebhookConfiguration and kind: ValidatingWebhookConfiguration have the same .webhooks[0].clientConfig.service as before.

    apiVersion: admissionregistration.k8s.io/v1
    kind: MutatingWebhookConfiguration
    metadata:
      name: project-mutating-webhook-configuration
    webhooks:
    - admissionReviewVersions:
      - v1
      clientConfig:
        service:
          name: project-webhook-service
          namespace: system
          path: /mutate-batch-tutorial-kubebuilder-io-v1-cronjob
    
    apiVersion: admissionregistration.k8s.io/v1
    kind: ValidatingWebhookConfiguration
    metadata:
      name: project-validating-webhook-configuration
    webhooks:
    - admissionReviewVersions:
      - v1
      clientConfig:
        service:
          name: project-webhook-service
          namespace: system
          path: /validate-batch-tutorial-kubebuilder-io-v1-cronjob
    

case 2: modify marker only for MutatingWebhookConfiguration

  1. append serviceName=DEAD,serviceNamespace=BEEF,servicePort=1234 to the line kubebuilder:webhook:path=/mutate-batch-tutorial-kubebuilder-io-v1-cronjob,... in internal/webhook/v1/cronjob_webhook.go

  2. run make deploy and check that kind: MutatingWebhookConfiguration has the following.

    kind: MutatingWebhookConfiguration
    metadata:
      name: project-mutating-webhook-configuration
    webhooks:
    - admissionReviewVersions:
      - v1
      clientConfig:
        service:
          name: DEAD
          namespace: BEEF
          path: /mutate-batch-tutorial-kubebuilder-io-v1-cronjob
          port: 1234
    

    instead of

    kind: MutatingWebhookConfiguration
    metadata:
      name: project-mutating-webhook-configuration
    webhooks:
    - admissionReviewVersions:
      - v1
      clientConfig:
        service:
          name: project-webhook-service
          namespace: system
          path: /mutate-batch-tutorial-kubebuilder-io-v1-cronjob
    
  3. check that kind: ValidatingWebhookConfiguration has no changes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. 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.

2 participants