From 53edbd7da3e4a01f02cc8c05322c912c9eeea748 Mon Sep 17 00:00:00 2001 From: Fabrizio Sestito Date: Tue, 9 Apr 2024 17:24:01 +0200 Subject: [PATCH 1/3] fix: linter errors Signed-off-by: Fabrizio Sestito --- controllers/policyserver_controller_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/policyserver_controller_test.go b/controllers/policyserver_controller_test.go index 3580e9f0..0f786ef5 100644 --- a/controllers/policyserver_controller_test.go +++ b/controllers/policyserver_controller_test.go @@ -308,7 +308,7 @@ var _ = Describe("PolicyServer controller", func() { Expect(deployment.Spec.Template.Spec.Containers[0].Resources.Requests).To(Equal(policyServer.Spec.Limits)) return nil - }) + }).Should(Succeed()) By("creating a pod with limit and request set") Eventually(func(g Gomega) error { From f0dbeaa3a4e0bf28c44a1885a1cf57b66011498e Mon Sep 17 00:00:00 2001 From: Fabrizio Sestito Date: Wed, 10 Apr 2024 08:03:39 +0200 Subject: [PATCH 2/3] fix: deployment limits/requests expectation Signed-off-by: Fabrizio Sestito --- controllers/policyserver_controller_test.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/controllers/policyserver_controller_test.go b/controllers/policyserver_controller_test.go index 0f786ef5..10eb12d0 100644 --- a/controllers/policyserver_controller_test.go +++ b/controllers/policyserver_controller_test.go @@ -304,11 +304,9 @@ var _ = Describe("PolicyServer controller", func() { } Expect(deployment.Spec.Template.Spec.Containers[0].Resources.Limits).To(Equal(policyServer.Spec.Limits)) - By("setting the requests to the same value as the limits") - Expect(deployment.Spec.Template.Spec.Containers[0].Resources.Requests).To(Equal(policyServer.Spec.Limits)) return nil - }).Should(Succeed()) + }, timeout, pollInterval).Should(Succeed()) By("creating a pod with limit and request set") Eventually(func(g Gomega) error { @@ -318,6 +316,7 @@ var _ = Describe("PolicyServer controller", func() { } Expect(pod.Spec.Containers[0].Resources.Limits).To(Equal(policyServer.Spec.Limits)) + By("setting the requests to the same value as the limits") Expect(pod.Spec.Containers[0].Resources.Requests).To(Equal(policyServer.Spec.Limits)) return nil From 53a129bcebc10749787ad1df2a88b6c0a12ca25b Mon Sep 17 00:00:00 2001 From: Fabrizio Sestito Date: Wed, 10 Apr 2024 08:03:58 +0200 Subject: [PATCH 3/3] fix: remove setting requests default Signed-off-by: Fabrizio Sestito --- pkg/apis/policies/v1/policyserver_webhook.go | 10 ---------- pkg/apis/policies/v1/policyserver_webhook_test.go | 4 ---- 2 files changed, 14 deletions(-) diff --git a/pkg/apis/policies/v1/policyserver_webhook.go b/pkg/apis/policies/v1/policyserver_webhook.go index 013c83e8..a8046cb0 100644 --- a/pkg/apis/policies/v1/policyserver_webhook.go +++ b/pkg/apis/policies/v1/policyserver_webhook.go @@ -59,16 +59,6 @@ func (ps *PolicyServer) Default() { if ps.ObjectMeta.DeletionTimestamp == nil { controllerutil.AddFinalizer(ps, constants.KubewardenFinalizer) } - - // Default the requests to the limits if not set - for limitName, limitQuantity := range ps.Spec.Limits { - if _, found := ps.Spec.Requests[limitName]; !found { - if ps.Spec.Requests == nil { - ps.Spec.Requests = make(corev1.ResourceList) - } - ps.Spec.Requests[limitName] = limitQuantity - } - } } // +kubebuilder:webhook:path=/validate-policies-kubewarden-io-v1-policyserver,mutating=false,failurePolicy=fail,sideEffects=None,groups=policies.kubewarden.io,resources=policyservers,verbs=create;update,versions=v1,name=vpolicyserver.kb.io,admissionReviewVersions=v1 diff --git a/pkg/apis/policies/v1/policyserver_webhook_test.go b/pkg/apis/policies/v1/policyserver_webhook_test.go index 8c48e2c3..dbd5ef25 100644 --- a/pkg/apis/policies/v1/policyserver_webhook_test.go +++ b/pkg/apis/policies/v1/policyserver_webhook_test.go @@ -45,10 +45,6 @@ func TestDefault(t *testing.T) { policyServer.Default() assert.Contains(t, policyServer.Finalizers, constants.KubewardenFinalizer) - assert.Equal(t, corev1.ResourceList{ - "cpu": resource.MustParse("100m"), - "memory": resource.MustParse("1Gi"), - }, policyServer.Spec.Requests) } func TestValidatePolicyServerName(t *testing.T) {