Revert "Merge pull request cert-manager#3946 from inteon/fix_kubectl_…

…apply" This reverts commit c7514d9, reversing changes made to 49cbedf. Signed-off-by: Jake Sanders <i@am.so-aweso.me>
Art4Tech · May 11, 2021 · 8ca19b2 · 8ca19b2
1 parent bd817cc
commit 8ca19b2
Show file tree

Hide file tree

Showing 18 changed files with 5,395 additions and 572 deletions.
diff --git a/deploy/crds/crd-challenges.yaml b/deploy/crds/crd-challenges.yaml
diff --git a/deploy/crds/crd-clusterissuers.yaml b/deploy/crds/crd-clusterissuers.yaml
diff --git a/deploy/crds/crd-issuers.yaml b/deploy/crds/crd-issuers.yaml
diff --git a/pkg/apis/acme/v1/types_issuer.go b/pkg/apis/acme/v1/types_issuer.go
@@ -324,8 +324,12 @@ type ACMEChallengeSolverHTTP01Istio struct {
 	// namespace qualifier is the same as specifying the VirtualService's
 	// namespace.
 	// ref: https://github.com/istio/api/blob/24c65c0415b63a6ebca18059c60fc8fccf041e9a/networking/v1beta1/virtual_service.pb.go#L233-L246
-	// +optional
 	Gateways []string `json:"gateways,omitempty"`
+
+	// Optional pod template used to configure the ACME challenge solver pods
+	// used for HTTP01 challenges
+	// +optional
+	PodTemplate *ACMEChallengeSolverHTTP01IngressPodTemplate `json:"podTemplate,omitempty"`
 }
 
 // Used to configure a DNS01 challenge provider to be used when solving DNS01

diff --git a/pkg/apis/acme/v1/zz_generated.deepcopy.go b/pkg/apis/acme/v1/zz_generated.deepcopy.go
diff --git a/pkg/apis/acme/v1alpha2/types_issuer.go b/pkg/apis/acme/v1alpha2/types_issuer.go
@@ -326,6 +326,11 @@ type ACMEChallengeSolverHTTP01Istio struct {
 	// ref: https://github.com/istio/api/blob/24c65c0415b63a6ebca18059c60fc8fccf041e9a/networking/v1beta1/virtual_service.pb.go#L233-L246
 	// +optional
 	Gateways []string `json:"gateways,omitempty"`
+
+	// Optional pod template used to configure the ACME challenge solver pods
+	// used for HTTP01 challenges
+	// +optional
+	PodTemplate *ACMEChallengeSolverHTTP01IngressPodTemplate `json:"podTemplate,omitempty"`
 }
 
 // Used to configure a DNS01 challenge provider to be used when solving DNS01

diff --git a/pkg/apis/acme/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/acme/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/acme/v1alpha3/types_issuer.go b/pkg/apis/acme/v1alpha3/types_issuer.go
@@ -324,8 +324,12 @@ type ACMEChallengeSolverHTTP01Istio struct {
 	// namespace qualifier is the same as specifying the VirtualService's
 	// namespace.
 	// ref: https://github.com/istio/api/blob/24c65c0415b63a6ebca18059c60fc8fccf041e9a/networking/v1beta1/virtual_service.pb.go#L233-L246
-	// +optional
 	Gateways []string `json:"gateways,omitempty"`
+
+	// Optional pod template used to configure the ACME challenge solver pods
+	// used for HTTP01 challenges
+	// +optional
+	PodTemplate *ACMEChallengeSolverHTTP01IngressPodTemplate `json:"podTemplate,omitempty"`
 }
 
 // Used to configure a DNS01 challenge provider to be used when solving DNS01

diff --git a/pkg/apis/acme/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/acme/v1alpha3/zz_generated.deepcopy.go
diff --git a/pkg/apis/acme/v1beta1/types_issuer.go b/pkg/apis/acme/v1beta1/types_issuer.go
@@ -324,8 +324,12 @@ type ACMEChallengeSolverHTTP01Istio struct {
 	// namespace qualifier is the same as specifying the VirtualService's
 	// namespace.
 	// ref: https://github.com/istio/api/blob/24c65c0415b63a6ebca18059c60fc8fccf041e9a/networking/v1beta1/virtual_service.pb.go#L233-L246
-	// +optional
 	Gateways []string `json:"gateways,omitempty"`
+
+	// Optional pod template used to configure the ACME challenge solver pods
+	// used for HTTP01 challenges
+	// +optional
+	PodTemplate *ACMEChallengeSolverHTTP01IngressPodTemplate `json:"podTemplate,omitempty"`
 }
 
 // Used to configure a DNS01 challenge provider to be used when solving DNS01

diff --git a/pkg/apis/acme/v1beta1/zz_generated.deepcopy.go b/pkg/apis/acme/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/internal/apis/acme/types_issuer.go b/pkg/internal/apis/acme/types_issuer.go
@@ -192,7 +192,8 @@ type ACMEChallengeSolverHTTP01 struct {
 	// to the specified Istio gateway in order to route requests for
 	// '/.well-known/acme-challenge/XYZ' to 'challenge solver' pods that are
 	// provisioned by cert-manager for each Challenge to be completed.
-	Istio *ACMEChallengeSolverHTTP01Istio
+	// +optional
+	Istio *ACMEChallengeSolverHTTP01Istio `json:"istio,omitempty"`
 }
 
 type ACMEChallengeSolverHTTP01Ingress struct {
@@ -281,15 +282,21 @@ type ACMEChallengeSolverHTTP01IngressObjectMeta struct {
 
 type ACMEChallengeSolverHTTP01Istio struct {
 	// Optional service type for Kubernetes solver service
-	ServiceType corev1.ServiceType
+	// +optional
+	ServiceType corev1.ServiceType `json:"serviceType,omitempty"`
 
 	// The names of the gateways that are used to generate the virtualservice
 	// that configures the HTTP01 challenge routes.
 	// `<gateway namespace>/<gateway name>`; specifying a gateway with no
 	// namespace qualifier is the same as specifying the VirtualService's
 	// namespace.
 	// ref: https://github.com/istio/api/blob/24c65c0415b63a6ebca18059c60fc8fccf041e9a/networking/v1beta1/virtual_service.pb.go#L233-L246
-	Gateways []string
+	Gateways []string `json:"gateways,omitempty"`
+
+	// Optional pod template used to configure the ACME challenge solver pods
+	// used for HTTP01 challenges
+	// +optional
+	PodTemplate *ACMEChallengeSolverHTTP01IngressPodTemplate `json:"podTemplate,omitempty"`
 }
 
 // Used to configure a DNS01 challenge provider to be used when solving DNS01

diff --git a/pkg/internal/apis/acme/v1/zz_generated.conversion.go b/pkg/internal/apis/acme/v1/zz_generated.conversion.go
diff --git a/pkg/internal/apis/acme/v1alpha2/zz_generated.conversion.go b/pkg/internal/apis/acme/v1alpha2/zz_generated.conversion.go
diff --git a/pkg/internal/apis/acme/v1alpha3/zz_generated.conversion.go b/pkg/internal/apis/acme/v1alpha3/zz_generated.conversion.go
diff --git a/pkg/internal/apis/acme/v1beta1/zz_generated.conversion.go b/pkg/internal/apis/acme/v1beta1/zz_generated.conversion.go
diff --git a/pkg/internal/apis/acme/zz_generated.deepcopy.go b/pkg/internal/apis/acme/zz_generated.deepcopy.go
diff --git a/pkg/issuer/acme/http/pod.go b/pkg/issuer/acme/http/pod.go
@@ -147,6 +147,8 @@ func (s *Solver) buildPod(ch *cmacme.Challenge) *corev1.Pod {
 	if ch.Spec.Solver.HTTP01 != nil {
 		if ch.Spec.Solver.HTTP01.Ingress != nil {
 			pod = s.mergePodObjectMetaWithPodTemplate(pod, ch.Spec.Solver.HTTP01.Ingress.PodTemplate)
+		} else if ch.Spec.Solver.HTTP01.Istio != nil {
+			pod = s.mergePodObjectMetaWithPodTemplate(pod, ch.Spec.Solver.HTTP01.Istio.PodTemplate)
 		}
 	}