weiguoqiang/cert-manager
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix typos and tidy up imports

Browse Source 
Signed-off-by: James Munnelly <james@munnelly.eu>
This commit is contained in:
James Munnelly 2019-07-05 15:30:32 +01:00
parent 46a3144c33
commit aa3e2fa4aa
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/generated/reference/output/reference/api-docs/index.html
View File

@ -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>

2
pkg/apis/certmanager/v1alpha1/types_issuer.go
View File

@ -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"`

9
pkg/issuer/acme/http/pod_test.go
View File

@ -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",