Skip to content

Commit 6816ff3

Browse files
metal3-io-botmetal3-io-bot
authored
Merge pull request #53 from Nordix/fix-api-leftover/furkat
🐛 Fix API version in IPAM webhooks
2 parents 07ad219 + b9968d1 commit 6816ff3

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

‎api/v1alpha1/ipaddress_webhook.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ func (c *IPAddress) SetupWebhookWithManager(mgr ctrl.Manager) error {
2828
Complete()
2929
}
3030

31-
// +kubebuilder:webhook:verbs=create;update,path=/validate-ipam-metal3-io-v1alpha4-ipaddress,mutating=false,failurePolicy=fail,groups=ipam.metal3.io,resources=ipaddresses,versions=v1alpha4,name=validation.ipaddress.ipam.metal3.io,matchPolicy=Equivalent,sideEffects=None,admissionReviewVersions=v1;v1beta1
32-
// +kubebuilder:webhook:verbs=create;update,path=/mutate-ipam-metal3-io-v1alpha4-ipaddress,mutating=true,failurePolicy=fail,groups=ipam.metal3.io,resources=ipaddresses,versions=v1alpha4,name=default.ipaddress.ipam.metal3.io,matchPolicy=Equivalent,sideEffects=None,admissionReviewVersions=v1;v1beta1
31+
// +kubebuilder:webhook:verbs=create;update,path=/validate-ipam-metal3-io-v1alpha1-ipaddress,mutating=false,failurePolicy=fail,groups=ipam.metal3.io,resources=ipaddresses,versions=v1alpha1,name=validation.ipaddress.ipam.metal3.io,matchPolicy=Equivalent,sideEffects=None,admissionReviewVersions=v1;v1beta1
32+
// +kubebuilder:webhook:verbs=create;update,path=/mutate-ipam-metal3-io-v1alpha1-ipaddress,mutating=true,failurePolicy=fail,groups=ipam.metal3.io,resources=ipaddresses,versions=v1alpha1,name=default.ipaddress.ipam.metal3.io,matchPolicy=Equivalent,sideEffects=None,admissionReviewVersions=v1;v1beta1
3333

3434
var _ webhook.Defaulter = &IPAddress{}
3535
var _ webhook.Validator = &IPAddress{}

‎api/v1alpha1/ipclaim_webhook.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ func (c *IPClaim) SetupWebhookWithManager(mgr ctrl.Manager) error {
2828
Complete()
2929
}
3030

31-
// +kubebuilder:webhook:verbs=create;update,path=/validate-ipam-metal3-io-v1alpha4-ipclaim,mutating=false,failurePolicy=fail,groups=ipam.metal3.io,resources=ipclaims,versions=v1alpha4,name=validation.ipclaim.ipam.metal3.io,matchPolicy=Equivalent,sideEffects=None,admissionReviewVersions=v1;v1beta1
32-
// +kubebuilder:webhook:verbs=create;update,path=/mutate-ipam-metal3-io-v1alpha4-ipclaim,mutating=true,failurePolicy=fail,groups=ipam.metal3.io,resources=ipclaims,versions=v1alpha4,name=default.ipclaim.ipam.metal3.io,matchPolicy=Equivalent,sideEffects=None,admissionReviewVersions=v1;v1beta1
31+
// +kubebuilder:webhook:verbs=create;update,path=/validate-ipam-metal3-io-v1alpha1-ipclaim,mutating=false,failurePolicy=fail,groups=ipam.metal3.io,resources=ipclaims,versions=v1alpha1,name=validation.ipclaim.ipam.metal3.io,matchPolicy=Equivalent,sideEffects=None,admissionReviewVersions=v1;v1beta1
32+
// +kubebuilder:webhook:verbs=create;update,path=/mutate-ipam-metal3-io-v1alpha1-ipclaim,mutating=true,failurePolicy=fail,groups=ipam.metal3.io,resources=ipclaims,versions=v1alpha1,name=default.ipclaim.ipam.metal3.io,matchPolicy=Equivalent,sideEffects=None,admissionReviewVersions=v1;v1beta1
3333

3434
var _ webhook.Defaulter = &IPClaim{}
3535
var _ webhook.Validator = &IPClaim{}

‎api/v1alpha1/ippool_webhook.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ func (c *IPPool) SetupWebhookWithManager(mgr ctrl.Manager) error {
3030
Complete()
3131
}
3232

33-
// +kubebuilder:webhook:verbs=create;update,path=/validate-ipam-metal3-io-v1alpha4-ippool,mutating=false,failurePolicy=fail,groups=ipam.metal3.io,resources=ippools,versions=v1alpha4,name=validation.ippool.ipam.metal3.io,matchPolicy=Equivalent,sideEffects=None,admissionReviewVersions=v1;v1beta1
34-
// +kubebuilder:webhook:verbs=create;update,path=/mutate-ipam-metal3-io-v1alpha4-ippool,mutating=true,failurePolicy=fail,groups=ipam.metal3.io,resources=ippools,versions=v1alpha4,name=default.ippool.ipam.metal3.io,matchPolicy=Equivalent,sideEffects=None,admissionReviewVersions=v1;v1beta1
33+
// +kubebuilder:webhook:verbs=create;update,path=/validate-ipam-metal3-io-v1alpha1-ippool,mutating=false,failurePolicy=fail,groups=ipam.metal3.io,resources=ippools,versions=v1alpha1,name=validation.ippool.ipam.metal3.io,matchPolicy=Equivalent,sideEffects=None,admissionReviewVersions=v1;v1beta1
34+
// +kubebuilder:webhook:verbs=create;update,path=/mutate-ipam-metal3-io-v1alpha1-ippool,mutating=true,failurePolicy=fail,groups=ipam.metal3.io,resources=ippools,versions=v1alpha1,name=default.ippool.ipam.metal3.io,matchPolicy=Equivalent,sideEffects=None,admissionReviewVersions=v1;v1beta1
3535

3636
var _ webhook.Defaulter = &IPPool{}
3737
var _ webhook.Validator = &IPPool{}

‎config/webhook/manifests.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ webhooks:
1313
service:
1414
name: webhook-service
1515
namespace: system
16-
path: /mutate-ipam-metal3-io-v1alpha4-ipaddress
16+
path: /mutate-ipam-metal3-io-v1alpha1-ipaddress
1717
failurePolicy: Fail
1818
matchPolicy: Equivalent
1919
name: default.ipaddress.ipam.metal3.io
2020
rules:
2121
- apiGroups:
2222
- ipam.metal3.io
2323
apiVersions:
24-
- v1alpha4
24+
- v1alpha1
2525
operations:
2626
- CREATE
2727
- UPDATE
@@ -35,15 +35,15 @@ webhooks:
3535
service:
3636
name: webhook-service
3737
namespace: system
38-
path: /mutate-ipam-metal3-io-v1alpha4-ipclaim
38+
path: /mutate-ipam-metal3-io-v1alpha1-ipclaim
3939
failurePolicy: Fail
4040
matchPolicy: Equivalent
4141
name: default.ipclaim.ipam.metal3.io
4242
rules:
4343
- apiGroups:
4444
- ipam.metal3.io
4545
apiVersions:
46-
- v1alpha4
46+
- v1alpha1
4747
operations:
4848
- CREATE
4949
- UPDATE
@@ -57,15 +57,15 @@ webhooks:
5757
service:
5858
name: webhook-service
5959
namespace: system
60-
path: /mutate-ipam-metal3-io-v1alpha4-ippool
60+
path: /mutate-ipam-metal3-io-v1alpha1-ippool
6161
failurePolicy: Fail
6262
matchPolicy: Equivalent
6363
name: default.ippool.ipam.metal3.io
6464
rules:
6565
- apiGroups:
6666
- ipam.metal3.io
6767
apiVersions:
68-
- v1alpha4
68+
- v1alpha1
6969
operations:
7070
- CREATE
7171
- UPDATE
@@ -87,15 +87,15 @@ webhooks:
8787
service:
8888
name: webhook-service
8989
namespace: system
90-
path: /validate-ipam-metal3-io-v1alpha4-ipaddress
90+
path: /validate-ipam-metal3-io-v1alpha1-ipaddress
9191
failurePolicy: Fail
9292
matchPolicy: Equivalent
9393
name: validation.ipaddress.ipam.metal3.io
9494
rules:
9595
- apiGroups:
9696
- ipam.metal3.io
9797
apiVersions:
98-
- v1alpha4
98+
- v1alpha1
9999
operations:
100100
- CREATE
101101
- UPDATE
@@ -109,15 +109,15 @@ webhooks:
109109
service:
110110
name: webhook-service
111111
namespace: system
112-
path: /validate-ipam-metal3-io-v1alpha4-ipclaim
112+
path: /validate-ipam-metal3-io-v1alpha1-ipclaim
113113
failurePolicy: Fail
114114
matchPolicy: Equivalent
115115
name: validation.ipclaim.ipam.metal3.io
116116
rules:
117117
- apiGroups:
118118
- ipam.metal3.io
119119
apiVersions:
120-
- v1alpha4
120+
- v1alpha1
121121
operations:
122122
- CREATE
123123
- UPDATE
@@ -131,15 +131,15 @@ webhooks:
131131
service:
132132
name: webhook-service
133133
namespace: system
134-
path: /validate-ipam-metal3-io-v1alpha4-ippool
134+
path: /validate-ipam-metal3-io-v1alpha1-ippool
135135
failurePolicy: Fail
136136
matchPolicy: Equivalent
137137
name: validation.ippool.ipam.metal3.io
138138
rules:
139139
- apiGroups:
140140
- ipam.metal3.io
141141
apiVersions:
142-
- v1alpha4
142+
- v1alpha1
143143
operations:
144144
- CREATE
145145
- UPDATE

0 commit comments

Comments
 (0)