From aa3e2fa4aa416eb92ac080f27691c2714d37c1bc Mon Sep 17 00:00:00 2001
From: James Munnelly <james@munnelly.eu>
Date: Fri, 5 Jul 2019 15:30:32 +0100
Subject: [PATCH] Fix typos and tidy up imports

Signed-off-by: James Munnelly <james@munnelly.eu>
---
 .../reference/output/reference/api-docs/index.html       | 2 +-
 pkg/apis/certmanager/v1alpha1/types_issuer.go            | 2 +-
 pkg/issuer/acme/http/pod_test.go                         | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/generated/reference/output/reference/api-docs/index.html b/docs/generated/reference/output/reference/api-docs/index.html
index 90d34a427..b31c4282b 100755
--- a/docs/generated/reference/output/reference/api-docs/index.html
+++ b/docs/generated/reference/output/reference/api-docs/index.html
@@ -875,7 +875,7 @@ Appears In:
 </thead>
 <tbody><tr>
 <td><code>metadata</code><br /> *<a href="#objectmeta-v1">ObjectMeta</a>*</td>
-<td>ObjectMeta overrides for the pod used to solve HTTP01 challenges. Only the &#39;labels&#39; and &#39;annotations&#39; fields may be set. If labels or annotations overlap with in-built value, the values here will override the in-built values.</td>
+<td>ObjectMeta overrides for the pod used to solve HTTP01 challenges. Only the &#39;labels&#39; and &#39;annotations&#39; fields may be set. If labels or annotations overlap with in-built values, the values here will override the in-built values.</td>
 </tr>
 <tr>
 <td><code>spec</code><br /> *<a href="#acmechallengesolverhttp01ingresspodspec-v1alpha1">ACMEChallengeSolverHTTP01IngressPodSpec</a>*</td>
diff --git a/pkg/apis/certmanager/v1alpha1/types_issuer.go b/pkg/apis/certmanager/v1alpha1/types_issuer.go
index 8b36b4a5e..5a19bb958 100644
--- a/pkg/apis/certmanager/v1alpha1/types_issuer.go
+++ b/pkg/apis/certmanager/v1alpha1/types_issuer.go
@@ -306,7 +306,7 @@ type ACMEChallengeSolverHTTP01Ingress struct {
 type ACMEChallengeSolverHTTP01IngressPodTemplate struct {
 	// ObjectMeta overrides for the pod used to solve HTTP01 challenges.
 	// Only the 'labels' and 'annotations' fields may be set.
-	// If labels or annotations overlap with in-built value, the values here
+	// If labels or annotations overlap with in-built values, the values here
 	// will override the in-built values.
 	// +optional
 	metav1.ObjectMeta `json:"metadata,omitempty"`
diff --git a/pkg/issuer/acme/http/pod_test.go b/pkg/issuer/acme/http/pod_test.go
index 01d04f9e6..ac98d87a1 100644
--- a/pkg/issuer/acme/http/pod_test.go
+++ b/pkg/issuer/acme/http/pod_test.go
@@ -21,8 +21,7 @@ import (
 	"reflect"
 	"testing"
 
-	corev1 "k8s.io/api/core/v1"
-	v1 "k8s.io/api/core/v1"
+	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -279,11 +278,11 @@ func TestMergePodObjectMetaWithPodTemplate(t *testing.T) {
 											"foo":                     "bar",
 										},
 									},
-									PodSpec: corev1.PodSpec{
+									Spec: v1alpha1.ACMEChallengeSolverHTTP01IngressPodSpec{
 										NodeSelector: map[string]string{
 											"node": "selector",
 										},
-										Tolerations: []corev1.Toleration{
+										Tolerations: []v1.Toleration{
 											{
 												Key:      "key",
 												Operator: "Exists",
@@ -312,7 +311,7 @@ func TestMergePodObjectMetaWithPodTemplate(t *testing.T) {
 				resultingPod.Spec.NodeSelector = map[string]string{
 					"node": "selector",
 				}
-				resultingPod.Spec.Tolerations = []corev1.Toleration{
+				resultingPod.Spec.Tolerations = []v1.Toleration{
 					{
 						Key:      "key",
 						Operator: "Exists",