Skip to content

Commit 9418bf8

Browse files
committed
More missing webhooks
1 parent 99c44c3 commit 9418bf8

5 files changed

Lines changed: 160 additions & 30 deletions

File tree

cmd/main.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import (
4141
clientcontroller "github.com/openstack-k8s-operators/openstack-operator/internal/controller/client"
4242
corecontroller "github.com/openstack-k8s-operators/openstack-operator/internal/controller/core"
4343
dataplanecontroller "github.com/openstack-k8s-operators/openstack-operator/internal/controller/dataplane"
44+
webhookclientv1beta1 "github.com/openstack-k8s-operators/openstack-operator/internal/webhook/client/v1beta1"
4445
webhookcorev1beta1 "github.com/openstack-k8s-operators/openstack-operator/internal/webhook/core/v1beta1"
4546
webhookdataplanev1beta1 "github.com/openstack-k8s-operators/openstack-operator/internal/webhook/dataplane/v1beta1"
4647

@@ -382,10 +383,25 @@ func main() {
382383
os.Exit(1)
383384
}
384385
// nolint:goconst
386+
if err := webhookclientv1beta1.SetupOpenStackClientWebhookWithManager(mgr); err != nil {
387+
setupLog.Error(err, "unable to create webhook", "webhook", "OpenStackClient")
388+
os.Exit(1)
389+
}
390+
// nolint:goconst
385391
if err := webhookdataplanev1beta1.SetupOpenStackDataPlaneNodeSetWebhookWithManager(mgr); err != nil {
386392
setupLog.Error(err, "unable to create webhook", "webhook", "OpenStackDataPlaneNodeSet")
387393
os.Exit(1)
388394
}
395+
// nolint:goconst
396+
if err := webhookdataplanev1beta1.SetupOpenStackDataPlaneDeploymentWebhookWithManager(mgr); err != nil {
397+
setupLog.Error(err, "unable to create webhook", "webhook", "OpenStackDataPlaneDeployment")
398+
os.Exit(1)
399+
}
400+
// nolint:goconst
401+
if err := webhookdataplanev1beta1.SetupOpenStackDataPlaneServiceWebhookWithManager(mgr); err != nil {
402+
setupLog.Error(err, "unable to create webhook", "webhook", "OpenStackDataPlaneService")
403+
os.Exit(1)
404+
}
389405
}
390406
// +kubebuilder:scaffold:builder
391407

config/webhook/manifests.yaml

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,26 @@ kind: MutatingWebhookConfiguration
44
metadata:
55
name: mutating-webhook-configuration
66
webhooks:
7+
- admissionReviewVersions:
8+
- v1
9+
clientConfig:
10+
service:
11+
name: webhook-service
12+
namespace: system
13+
path: /mutate-client-openstack-org-v1beta1-openstackclient
14+
failurePolicy: Fail
15+
name: mopenstackclient-v1beta1.kb.io
16+
rules:
17+
- apiGroups:
18+
- client.openstack.org
19+
apiVersions:
20+
- v1beta1
21+
operations:
22+
- CREATE
23+
- UPDATE
24+
resources:
25+
- openstackclients
26+
sideEffects: None
727
- admissionReviewVersions:
828
- v1
929
clientConfig:
@@ -44,6 +64,26 @@ webhooks:
4464
resources:
4565
- openstackversions
4666
sideEffects: None
67+
- admissionReviewVersions:
68+
- v1
69+
clientConfig:
70+
service:
71+
name: webhook-service
72+
namespace: system
73+
path: /mutate-dataplane-openstack-org-v1beta1-openstackdataplanedeployment
74+
failurePolicy: Fail
75+
name: mopenstackdataplanedeployment-v1beta1.kb.io
76+
rules:
77+
- apiGroups:
78+
- dataplane.openstack.org
79+
apiVersions:
80+
- v1beta1
81+
operations:
82+
- CREATE
83+
- UPDATE
84+
resources:
85+
- openstackdataplanedeployments
86+
sideEffects: None
4787
- admissionReviewVersions:
4888
- v1
4989
clientConfig:
@@ -64,6 +104,26 @@ webhooks:
64104
resources:
65105
- openstackdataplanenodesets
66106
sideEffects: None
107+
- admissionReviewVersions:
108+
- v1
109+
clientConfig:
110+
service:
111+
name: webhook-service
112+
namespace: system
113+
path: /mutate-dataplane-openstack-org-v1beta1-openstackdataplaneservice
114+
failurePolicy: Fail
115+
name: mopenstackdataplaneservice-v1beta1.kb.io
116+
rules:
117+
- apiGroups:
118+
- dataplane.openstack.org
119+
apiVersions:
120+
- v1beta1
121+
operations:
122+
- CREATE
123+
- UPDATE
124+
resources:
125+
- openstackdataplaneservices
126+
sideEffects: None
67127
- admissionReviewVersions:
68128
- v1
69129
clientConfig:
@@ -130,6 +190,26 @@ kind: ValidatingWebhookConfiguration
130190
metadata:
131191
name: validating-webhook-configuration
132192
webhooks:
193+
- admissionReviewVersions:
194+
- v1
195+
clientConfig:
196+
service:
197+
name: webhook-service
198+
namespace: system
199+
path: /validate-client-openstack-org-v1beta1-openstackclient
200+
failurePolicy: Fail
201+
name: vopenstackclient-v1beta1.kb.io
202+
rules:
203+
- apiGroups:
204+
- client.openstack.org
205+
apiVersions:
206+
- v1beta1
207+
operations:
208+
- CREATE
209+
- UPDATE
210+
resources:
211+
- openstackclients
212+
sideEffects: None
133213
- admissionReviewVersions:
134214
- v1
135215
clientConfig:
@@ -170,6 +250,26 @@ webhooks:
170250
resources:
171251
- openstackversions
172252
sideEffects: None
253+
- admissionReviewVersions:
254+
- v1
255+
clientConfig:
256+
service:
257+
name: webhook-service
258+
namespace: system
259+
path: /validate-dataplane-openstack-org-v1beta1-openstackdataplanedeployment
260+
failurePolicy: Fail
261+
name: vopenstackdataplanedeployment-v1beta1.kb.io
262+
rules:
263+
- apiGroups:
264+
- dataplane.openstack.org
265+
apiVersions:
266+
- v1beta1
267+
operations:
268+
- CREATE
269+
- UPDATE
270+
resources:
271+
- openstackdataplanedeployments
272+
sideEffects: None
173273
- admissionReviewVersions:
174274
- v1
175275
clientConfig:
@@ -190,6 +290,26 @@ webhooks:
190290
resources:
191291
- openstackdataplanenodesets
192292
sideEffects: None
293+
- admissionReviewVersions:
294+
- v1
295+
clientConfig:
296+
service:
297+
name: webhook-service
298+
namespace: system
299+
path: /validate-dataplane-openstack-org-v1beta1-openstackdataplaneservice
300+
failurePolicy: Fail
301+
name: vopenstackdataplaneservice-v1beta1.kb.io
302+
rules:
303+
- apiGroups:
304+
- dataplane.openstack.org
305+
apiVersions:
306+
- v1beta1
307+
operations:
308+
- CREATE
309+
- UPDATE
310+
resources:
311+
- openstackdataplaneservices
312+
sideEffects: None
193313
- admissionReviewVersions:
194314
- v1
195315
clientConfig:

internal/webhook/client/v1beta1/openstackclient_webhook.go

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ func (d *OpenStackClientCustomDefaulter) Default(_ context.Context, obj runtime.
6565
}
6666
openstackclientlog.Info("Defaulting for OpenStackClient", "name", openstackclient.GetName())
6767

68-
// TODO(user): fill in your defaulting logic.
68+
// Call the Default method on the OpenStackClient type
69+
openstackclient.Default()
6970

7071
return nil
7172
}
@@ -94,9 +95,8 @@ func (v *OpenStackClientCustomValidator) ValidateCreate(_ context.Context, obj r
9495
}
9596
openstackclientlog.Info("Validation for OpenStackClient upon creation", "name", openstackclient.GetName())
9697

97-
// TODO(user): fill in your validation logic upon object creation.
98-
99-
return nil, nil
98+
// Call the ValidateCreate method on the OpenStackClient type
99+
return openstackclient.ValidateCreate()
100100
}
101101

102102
// ValidateUpdate implements webhook.CustomValidator so a webhook will be registered for the type OpenStackClient.
@@ -107,9 +107,8 @@ func (v *OpenStackClientCustomValidator) ValidateUpdate(_ context.Context, oldOb
107107
}
108108
openstackclientlog.Info("Validation for OpenStackClient upon update", "name", openstackclient.GetName())
109109

110-
// TODO(user): fill in your validation logic upon object update.
111-
112-
return nil, nil
110+
// Call the ValidateUpdate method on the OpenStackClient type
111+
return openstackclient.ValidateUpdate(oldObj)
113112
}
114113

115114
// ValidateDelete implements webhook.CustomValidator so a webhook will be registered for the type OpenStackClient.
@@ -120,7 +119,6 @@ func (v *OpenStackClientCustomValidator) ValidateDelete(ctx context.Context, obj
120119
}
121120
openstackclientlog.Info("Validation for OpenStackClient upon deletion", "name", openstackclient.GetName())
122121

123-
// TODO(user): fill in your validation logic upon object deletion.
124-
125-
return nil, nil
122+
// Call the ValidateDelete method on the OpenStackClient type
123+
return openstackclient.ValidateDelete()
126124
}

internal/webhook/dataplane/v1beta1/openstackdataplanedeployment_webhook.go

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ func (d *OpenStackDataPlaneDeploymentCustomDefaulter) Default(_ context.Context,
6565
}
6666
openstackdataplanedeploymentlog.Info("Defaulting for OpenStackDataPlaneDeployment", "name", openstackdataplanedeployment.GetName())
6767

68-
// TODO(user): fill in your defaulting logic.
68+
// Call the Default method on the OpenStackDataPlaneDeployment type
69+
openstackdataplanedeployment.Default()
6970

7071
return nil
7172
}
@@ -94,9 +95,8 @@ func (v *OpenStackDataPlaneDeploymentCustomValidator) ValidateCreate(_ context.C
9495
}
9596
openstackdataplanedeploymentlog.Info("Validation for OpenStackDataPlaneDeployment upon creation", "name", openstackdataplanedeployment.GetName())
9697

97-
// TODO(user): fill in your validation logic upon object creation.
98-
99-
return nil, nil
98+
// Call the ValidateCreate method on the OpenStackDataPlaneDeployment type
99+
return openstackdataplanedeployment.ValidateCreate()
100100
}
101101

102102
// ValidateUpdate implements webhook.CustomValidator so a webhook will be registered for the type OpenStackDataPlaneDeployment.
@@ -107,9 +107,8 @@ func (v *OpenStackDataPlaneDeploymentCustomValidator) ValidateUpdate(_ context.C
107107
}
108108
openstackdataplanedeploymentlog.Info("Validation for OpenStackDataPlaneDeployment upon update", "name", openstackdataplanedeployment.GetName())
109109

110-
// TODO(user): fill in your validation logic upon object update.
111-
112-
return nil, nil
110+
// Call the ValidateUpdate method on the OpenStackDataPlaneDeployment type
111+
return openstackdataplanedeployment.ValidateUpdate(oldObj)
113112
}
114113

115114
// ValidateDelete implements webhook.CustomValidator so a webhook will be registered for the type OpenStackDataPlaneDeployment.
@@ -120,7 +119,6 @@ func (v *OpenStackDataPlaneDeploymentCustomValidator) ValidateDelete(ctx context
120119
}
121120
openstackdataplanedeploymentlog.Info("Validation for OpenStackDataPlaneDeployment upon deletion", "name", openstackdataplanedeployment.GetName())
122121

123-
// TODO(user): fill in your validation logic upon object deletion.
124-
125-
return nil, nil
122+
// Call the ValidateDelete method on the OpenStackDataPlaneDeployment type
123+
return openstackdataplanedeployment.ValidateDelete()
126124
}

internal/webhook/dataplane/v1beta1/openstackdataplaneservice_webhook.go

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ func (d *OpenStackDataPlaneServiceCustomDefaulter) Default(_ context.Context, ob
6565
}
6666
openstackdataplaneservicelog.Info("Defaulting for OpenStackDataPlaneService", "name", openstackdataplaneservice.GetName())
6767

68-
// TODO(user): fill in your defaulting logic.
68+
// Call the Default method on the OpenStackDataPlaneService type
69+
openstackdataplaneservice.Default()
6970

7071
return nil
7172
}
@@ -94,9 +95,8 @@ func (v *OpenStackDataPlaneServiceCustomValidator) ValidateCreate(_ context.Cont
9495
}
9596
openstackdataplaneservicelog.Info("Validation for OpenStackDataPlaneService upon creation", "name", openstackdataplaneservice.GetName())
9697

97-
// TODO(user): fill in your validation logic upon object creation.
98-
99-
return nil, nil
98+
// Call the ValidateCreate method on the OpenStackDataPlaneService type
99+
return openstackdataplaneservice.ValidateCreate()
100100
}
101101

102102
// ValidateUpdate implements webhook.CustomValidator so a webhook will be registered for the type OpenStackDataPlaneService.
@@ -107,9 +107,8 @@ func (v *OpenStackDataPlaneServiceCustomValidator) ValidateUpdate(_ context.Cont
107107
}
108108
openstackdataplaneservicelog.Info("Validation for OpenStackDataPlaneService upon update", "name", openstackdataplaneservice.GetName())
109109

110-
// TODO(user): fill in your validation logic upon object update.
111-
112-
return nil, nil
110+
// Call the ValidateUpdate method on the OpenStackDataPlaneService type
111+
return openstackdataplaneservice.ValidateUpdate(oldObj)
113112
}
114113

115114
// ValidateDelete implements webhook.CustomValidator so a webhook will be registered for the type OpenStackDataPlaneService.
@@ -120,7 +119,6 @@ func (v *OpenStackDataPlaneServiceCustomValidator) ValidateDelete(ctx context.Co
120119
}
121120
openstackdataplaneservicelog.Info("Validation for OpenStackDataPlaneService upon deletion", "name", openstackdataplaneservice.GetName())
122121

123-
// TODO(user): fill in your validation logic upon object deletion.
124-
125-
return nil, nil
122+
// Call the ValidateDelete method on the OpenStackDataPlaneService type
123+
return openstackdataplaneservice.ValidateDelete()
126124
}

0 commit comments

Comments
 (0)