Merge pull request #288 from swghosh/use-http01-solver-pod-limits

CM-588: Adapt e2e with acme-http01-solver controller args

Author: openshift-merge-bot[bot]

test/e2e/certificates_test.go

@@ -48,13 +48,18 @@ var _ = Describe("ACME Certificate", Ordered, func() {
 		Expect(baseDomain).NotTo(BeEmpty())
 		appsDomain = "apps." + baseDomain
 
-		By("adding override args to cert-manager controller")
+		By("adding required args to cert-manager controller")
 		err = addOverrideArgs(certmanageroperatorclient, certmanagerControllerDeployment, []string{
 			// for dns-01 private zone passthrough
 			"--dns01-recursive-nameservers-only",
 			"--dns01-recursive-nameservers=8.8.8.8:53,1.1.1.1:53",
 			// for Issuer to use ambient credentials
 			"--issuer-ambient-credentials",
+			// for http-01 solver ingress
+			"--acme-http01-solver-resource-limits-cpu=150m",
+			"--acme-http01-solver-resource-limits-memory=200Mi",
+			"--acme-http01-solver-resource-request-cpu=100m",
+			"--acme-http01-solver-resource-request-memory=100Mi",
 		})
 		Expect(err).NotTo(HaveOccurred())
 

test/e2e/overrides_test.go

@@ -41,7 +41,27 @@ var _ = Describe("Overrides test", Ordered, func() {
 		It("should add the args to the cert-manager controller deployment", func() {
 
 			By("Adding cert-manager controller override args to the cert-managaer operator object")
-			args := []string{"--dns01-recursive-nameservers=10.10.10.10:53", "--dns01-recursive-nameservers-only", "--enable-certificate-owner-ref", "--v=3"}
+			args := []string{
+				// good-have to sync these args updated with the args present in
+				// pkg/controller/deployment/deployment_overrides_validation.go,
+				// so the e2e is self-aware of overrideArgs.
+
+				"--acme-http01-solver-resource-limits-cpu=150m",
+				"--acme-http01-solver-resource-limits-memory=100Mi",
+				"--acme-http01-solver-resource-request-cpu=50m",
+				"--acme-http01-solver-resource-request-memory=100Mi",
+
+				"--dns01-recursive-nameservers=10.10.10.10:53",
+				"--dns01-recursive-nameservers-only",
+
+				"--enable-certificate-owner-ref",
+
+				"--issuer-ambient-credentials",
+
+				"--v=5",
+
+				"--metrics-listen-address=0.0.0.0:9401",
+			}
 			err := addOverrideArgs(certmanageroperatorclient, certmanagerControllerDeployment, args)
 			Expect(err).NotTo(HaveOccurred())