github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #76361 from SataQiu/cleanup-e2e-20190410 

Small cleanup of e2e/framework/ingress
k3s-v1.15.3
Kubernetes Prow Robot 2019-04-11 13:10:43 -07:00 committed by GitHub
parent ca55432599 05612d76b6
commit 305f718716
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/framework/ingress/ingress_utils.go
View File

@ -38,7 +38,7 @@ import (
"k8s.io/klog"
apps "k8s.io/api/apps/v1"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
apierrs "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -301,7 +301,7 @@ func GenerateRSACerts(host string, isCA bool) ([]byte, []byte, error) {
return nil, nil, fmt.Errorf("Failed creating cert: %v", err)
}
if err := pem.Encode(&keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)}); err != nil {
return nil, nil, fmt.Errorf("Failed creating keay: %v", err)
return nil, nil, fmt.Errorf("Failed creating key: %v", err)
}
return certOut.Bytes(), keyOut.Bytes(), nil
}
@ -871,7 +871,7 @@ func generateBacksideHTTPSIngressSpec(ns string) *extensions.Ingress {
Namespace: ns,
},
Spec: extensions.IngressSpec{
// Note kubemci requres a default backend.
// Note kubemci requires a default backend.
Backend: &extensions.IngressBackend{
ServiceName: "echoheaders-https",
ServicePort: intstr.IntOrString{