From 7be31ce3e503cda7310d1f545f0f51ecc7d116c5 Mon Sep 17 00:00:00 2001 From: Yusuke Kuoka Date: Mon, 17 May 2021 09:36:13 +0900 Subject: [PATCH] kubectl-diff / dry-run support (#549) Resolves #266 --- api/v1alpha1/runner_webhook.go | 4 ++-- api/v1alpha1/runnerreplicaset_webhook.go | 4 ++-- .../templates/webhook_configs.yaml | 7 ++++++- config/webhook/manifests.yaml | 4 ++++ 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/api/v1alpha1/runner_webhook.go b/api/v1alpha1/runner_webhook.go index 59fe0e8e..9c0ea1f3 100644 --- a/api/v1alpha1/runner_webhook.go +++ b/api/v1alpha1/runner_webhook.go @@ -34,7 +34,7 @@ func (r *Runner) SetupWebhookWithManager(mgr ctrl.Manager) error { Complete() } -// +kubebuilder:webhook:path=/mutate-actions-summerwind-dev-v1alpha1-runner,verbs=create;update,mutating=true,failurePolicy=fail,groups=actions.summerwind.dev,resources=runners,versions=v1alpha1,name=mutate.runner.actions.summerwind.dev +// +kubebuilder:webhook:path=/mutate-actions-summerwind-dev-v1alpha1-runner,verbs=create;update,mutating=true,failurePolicy=fail,groups=actions.summerwind.dev,resources=runners,versions=v1alpha1,name=mutate.runner.actions.summerwind.dev,sideEffects=None var _ webhook.Defaulter = &Runner{} @@ -43,7 +43,7 @@ func (r *Runner) Default() { // Nothing to do. } -// +kubebuilder:webhook:path=/validate-actions-summerwind-dev-v1alpha1-runner,verbs=create;update,mutating=false,failurePolicy=fail,groups=actions.summerwind.dev,resources=runners,versions=v1alpha1,name=validate.runner.actions.summerwind.dev +// +kubebuilder:webhook:path=/validate-actions-summerwind-dev-v1alpha1-runner,verbs=create;update,mutating=false,failurePolicy=fail,groups=actions.summerwind.dev,resources=runners,versions=v1alpha1,name=validate.runner.actions.summerwind.dev,sideEffects=None var _ webhook.Validator = &Runner{} diff --git a/api/v1alpha1/runnerreplicaset_webhook.go b/api/v1alpha1/runnerreplicaset_webhook.go index b026ff6d..e9661f63 100644 --- a/api/v1alpha1/runnerreplicaset_webhook.go +++ b/api/v1alpha1/runnerreplicaset_webhook.go @@ -34,7 +34,7 @@ func (r *RunnerReplicaSet) SetupWebhookWithManager(mgr ctrl.Manager) error { Complete() } -// +kubebuilder:webhook:path=/mutate-actions-summerwind-dev-v1alpha1-runnerreplicaset,verbs=create;update,mutating=true,failurePolicy=fail,groups=actions.summerwind.dev,resources=runnerreplicasets,versions=v1alpha1,name=mutate.runnerreplicaset.actions.summerwind.dev +// +kubebuilder:webhook:path=/mutate-actions-summerwind-dev-v1alpha1-runnerreplicaset,verbs=create;update,mutating=true,failurePolicy=fail,groups=actions.summerwind.dev,resources=runnerreplicasets,versions=v1alpha1,name=mutate.runnerreplicaset.actions.summerwind.dev,sideEffects=None var _ webhook.Defaulter = &RunnerReplicaSet{} @@ -43,7 +43,7 @@ func (r *RunnerReplicaSet) Default() { // Nothing to do. } -// +kubebuilder:webhook:path=/validate-actions-summerwind-dev-v1alpha1-runnerreplicaset,verbs=create;update,mutating=false,failurePolicy=fail,groups=actions.summerwind.dev,resources=runnerreplicasets,versions=v1alpha1,name=validate.runnerreplicaset.actions.summerwind.dev +// +kubebuilder:webhook:path=/validate-actions-summerwind-dev-v1alpha1-runnerreplicaset,verbs=create;update,mutating=false,failurePolicy=fail,groups=actions.summerwind.dev,resources=runnerreplicasets,versions=v1alpha1,name=validate.runnerreplicaset.actions.summerwind.dev,sideEffects=None var _ webhook.Validator = &RunnerReplicaSet{} diff --git a/charts/actions-runner-controller/templates/webhook_configs.yaml b/charts/actions-runner-controller/templates/webhook_configs.yaml index 2cc512e8..be12e7b9 100644 --- a/charts/actions-runner-controller/templates/webhook_configs.yaml +++ b/charts/actions-runner-controller/templates/webhook_configs.yaml @@ -26,6 +26,7 @@ webhooks: - UPDATE resources: - runners + sideEffects: None - clientConfig: caBundle: Cg== service: @@ -44,6 +45,7 @@ webhooks: - UPDATE resources: - runnerdeployments + sideEffects: None - clientConfig: caBundle: Cg== service: @@ -62,7 +64,7 @@ webhooks: - UPDATE resources: - runnerreplicasets - + sideEffects: None --- apiVersion: admissionregistration.k8s.io/v1beta1 kind: ValidatingWebhookConfiguration @@ -90,6 +92,7 @@ webhooks: - UPDATE resources: - runners + sideEffects: None - clientConfig: caBundle: Cg== service: @@ -108,6 +111,7 @@ webhooks: - UPDATE resources: - runnerdeployments + sideEffects: None - clientConfig: caBundle: Cg== service: @@ -126,3 +130,4 @@ webhooks: - UPDATE resources: - runnerreplicasets + sideEffects: None diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index 4964e062..dfe65a5f 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -24,6 +24,7 @@ webhooks: - UPDATE resources: - runners + sideEffects: None - clientConfig: caBundle: Cg== service: @@ -60,6 +61,7 @@ webhooks: - UPDATE resources: - runnerreplicasets + sideEffects: None --- apiVersion: admissionregistration.k8s.io/v1beta1 @@ -86,6 +88,7 @@ webhooks: - UPDATE resources: - runners + sideEffects: None - clientConfig: caBundle: Cg== service: @@ -122,3 +125,4 @@ webhooks: - UPDATE resources: - runnerreplicasets + sideEffects: None