github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 04:52:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #128256 from lzhecheng/webhook-update-ValidatingWebhookConfigurations-retry

Browse Source 
[e2e][webhook] Retry update ValidatingWebhookConfigurations
This commit is contained in:
Kubernetes Prow Robot 2025-01-07 05:06:29 +01:00 committed by GitHub
commit 3a79d453fa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
test/e2e/apimachinery/webhook.go
View File

@ -437,13 +437,10 @@ var _ = SIGDescribe("AdmissionWebhook [Privileged:ClusterAdmin]", func() {
})
ginkgo.By("Updating a validating webhook configuration's rules to not include the create operation")
err = retry.RetryOnConflict(retry.DefaultRetry, func() error {
h, err := admissionClient.ValidatingWebhookConfigurations().Get(ctx, f.UniqueName, metav1.GetOptions{})
framework.ExpectNoError(err, "Getting validating webhook configuration")
h.Webhooks[0].Rules[0].Operations = []admissionregistrationv1.OperationType{admissionregistrationv1.Update}
_, err = admissionClient.ValidatingWebhookConfigurations().Update(ctx, h, metav1.UpdateOptions{})
return err
})
notIncludeCreateOperationFn := func(c *admissionregistrationv1.ValidatingWebhookConfiguration) {
c.Webhooks[0].Rules[0].Operations = []admissionregistrationv1.OperationType{admissionregistrationv1.Update}
}
_, err = updateValidatingWebhookConfigurations(ctx, client, f.UniqueName, notIncludeCreateOperationFn)
framework.ExpectNoError(err, "Updating validating webhook configuration")
ginkgo.By("Creating a configMap that does not comply to the validation webhook rules")
@ -743,9 +740,12 @@ var _ = SIGDescribe("AdmissionWebhook [Privileged:ClusterAdmin]", func() {
Expression: "object.metadata.namespace == 'staging'",
},
}
validatingWebhookConfiguration.Webhooks[0].MatchConditions = updatedMatchConditions
_, err = client.AdmissionregistrationV1().ValidatingWebhookConfigurations().Update(ctx, validatingWebhookConfiguration, metav1.UpdateOptions{})
framework.ExpectNoError(err)
updateMatchConditionsFn := func(c *admissionregistrationv1.ValidatingWebhookConfiguration) {
c.Webhooks[0].MatchConditions = updatedMatchConditions
}
_, err = updateValidatingWebhookConfigurations(ctx, client, f.UniqueName, updateMatchConditionsFn)
framework.ExpectNoError(err, "Updating validating webhook configuration")
ginkgo.By("verifying the validating webhook match conditions")
validatingWebhookConfiguration, err = client.AdmissionregistrationV1().ValidatingWebhookConfigurations().Get(ctx, f.UniqueName, metav1.GetOptions{})
@ -794,8 +794,11 @@ var _ = SIGDescribe("AdmissionWebhook [Privileged:ClusterAdmin]", func() {
Expression: "object.metadata.namespace == 'staging'",
},
}
mutatingWebhookConfiguration.Webhooks[0].MatchConditions = updatedMatchConditions
_, err = client.AdmissionregistrationV1().MutatingWebhookConfigurations().Update(ctx, mutatingWebhookConfiguration, metav1.UpdateOptions{})
updateMatchConditionsFn := func(c *admissionregistrationv1.MutatingWebhookConfiguration) {
c.Webhooks[0].MatchConditions = updatedMatchConditions
}
_, err = updateMutatingWebhookConfigurations(ctx, client, f.UniqueName, updateMatchConditionsFn)
framework.ExpectNoError(err)
ginkgo.By("verifying the mutating webhook match conditions")
@ -1914,6 +1917,38 @@ func updateConfigMap(ctx context.Context, c clientset.Interface, ns, name string
return cm, pollErr
}
type updateValidatingWebhookConfigurationsFn func(c *admissionregistrationv1.ValidatingWebhookConfiguration)
func updateValidatingWebhookConfigurations(ctx context.Context, client clientset.Interface, name string,
update updateValidatingWebhookConfigurationsFn) (*admissionregistrationv1.ValidatingWebhookConfiguration, error) {
var config *admissionregistrationv1.ValidatingWebhookConfiguration
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
var err error
config, err = client.AdmissionregistrationV1().ValidatingWebhookConfigurations().Get(ctx, name, metav1.GetOptions{})
framework.ExpectNoError(err, "Getting validating webhook configuration")
update(config)
config, err = client.AdmissionregistrationV1().ValidatingWebhookConfigurations().Update(ctx, config, metav1.UpdateOptions{})
return err
})
return config, err
}
type updateMutatingWebhookConfigurationsFn func(c *admissionregistrationv1.MutatingWebhookConfiguration)
func updateMutatingWebhookConfigurations(ctx context.Context, client clientset.Interface, name string,
update updateMutatingWebhookConfigurationsFn) (*admissionregistrationv1.MutatingWebhookConfiguration, error) {
var config *admissionregistrationv1.MutatingWebhookConfiguration
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
var err error
config, err = client.AdmissionregistrationV1().MutatingWebhookConfigurations().Get(ctx, name, metav1.GetOptions{})
framework.ExpectNoError(err, "Getting mutating webhook configuration")
update(config)
config, err = client.AdmissionregistrationV1().MutatingWebhookConfigurations().Update(ctx, config, metav1.UpdateOptions{})
return err
})
return config, err
}
type updateCustomResourceFn func(cm *unstructured.Unstructured)
func updateCustomResource(ctx context.Context, c dynamic.ResourceInterface, ns, name string, update updateCustomResourceFn) (*unstructured.Unstructured, error) {