From 421ea2c867c5cf119d7d23e816576f726f645991 Mon Sep 17 00:00:00 2001
From: Inteon <42113979+inteon@users.noreply.github.com>
Date: Fri, 30 Apr 2021 15:08:08 +0200
Subject: [PATCH] add/ remove '// +optional' tags & cleanup other annotations

Signed-off-by: Inteon <42113979+inteon@users.noreply.github.com>
---
 pkg/apis/acme/v1/types_issuer.go       | 1 +
 pkg/apis/acme/v1alpha2/types_issuer.go | 1 +
 pkg/apis/acme/v1alpha3/types_issuer.go | 1 +
 pkg/apis/acme/v1beta1/types_issuer.go  | 1 +
 pkg/internal/apis/acme/types_issuer.go | 8 +++-----
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkg/apis/acme/v1/types_issuer.go b/pkg/apis/acme/v1/types_issuer.go
index b2a858151..77bdeffc2 100644
--- a/pkg/apis/acme/v1/types_issuer.go
+++ b/pkg/apis/acme/v1/types_issuer.go
@@ -324,6 +324,7 @@ 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"`
 }
 
diff --git a/pkg/apis/acme/v1alpha2/types_issuer.go b/pkg/apis/acme/v1alpha2/types_issuer.go
index ef7767013..d5921c130 100644
--- a/pkg/apis/acme/v1alpha2/types_issuer.go
+++ b/pkg/apis/acme/v1alpha2/types_issuer.go
@@ -324,6 +324,7 @@ 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"`
 }
 
diff --git a/pkg/apis/acme/v1alpha3/types_issuer.go b/pkg/apis/acme/v1alpha3/types_issuer.go
index 9b064e3e0..3c29ee0df 100644
--- a/pkg/apis/acme/v1alpha3/types_issuer.go
+++ b/pkg/apis/acme/v1alpha3/types_issuer.go
@@ -324,6 +324,7 @@ 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"`
 }
 
diff --git a/pkg/apis/acme/v1beta1/types_issuer.go b/pkg/apis/acme/v1beta1/types_issuer.go
index e7d1023e4..80965e020 100644
--- a/pkg/apis/acme/v1beta1/types_issuer.go
+++ b/pkg/apis/acme/v1beta1/types_issuer.go
@@ -324,6 +324,7 @@ 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"`
 }
 
diff --git a/pkg/internal/apis/acme/types_issuer.go b/pkg/internal/apis/acme/types_issuer.go
index 3e64b73fb..bdd857097 100644
--- a/pkg/internal/apis/acme/types_issuer.go
+++ b/pkg/internal/apis/acme/types_issuer.go
@@ -192,8 +192,7 @@ 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.
-	// +optional
-	Istio *ACMEChallengeSolverHTTP01Istio `json:"istio,omitempty"`
+	Istio *ACMEChallengeSolverHTTP01Istio
 }
 
 type ACMEChallengeSolverHTTP01Ingress struct {
@@ -282,8 +281,7 @@ type ACMEChallengeSolverHTTP01IngressObjectMeta struct {
 
 type ACMEChallengeSolverHTTP01Istio struct {
 	// Optional service type for Kubernetes solver service
-	// +optional
-	ServiceType corev1.ServiceType `json:"serviceType,omitempty"`
+	ServiceType corev1.ServiceType
 
 	// The names of the gateways that are used to generate the virtualservice
 	// that configures the HTTP01 challenge routes.
@@ -291,7 +289,7 @@ 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
-	Gateways []string `json:"gateways,omitempty"`
+	Gateways []string
 }
 
 // Used to configure a DNS01 challenge provider to be used when solving DNS01