DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: some typo.

Browse source
This commit is contained in:
Mengxin Liu 2017-12-02 13:45:56 +08:00 committed by oilbeater
parent 99d3e9e9fc
commit 9cf0b11fc7
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/e2e/framework/ssl.go
View file

@ -27,7 +27,7 @@ const (
// CreateIngressTLSSecret creates a secret containing TLS certificates for the given Ingress. // CreateIngressTLSSecret creates a secret containing TLS certificates for the given Ingress.
// If a secret with the same name already pathExists in the namespace of the // If a secret with the same name already pathExists in the namespace of the
// Ingress, it's updated. // Ingress, it's updated.
func CreateIngressTLSSecret(client kubernetes.Interface, hosts []string, secreName, namespace string) (host string, rootCA, privKey []byte, err error) { func CreateIngressTLSSecret(client kubernetes.Interface, hosts []string, secretName, namespace string) (host string, rootCA, privKey []byte, err error) {
var k, c bytes.Buffer var k, c bytes.Buffer
host = strings.Join(hosts, ",") host = strings.Join(hosts, ",")
if err = generateRSACerts(host, true, &k, &c); err != nil { if err = generateRSACerts(host, true, &k, &c); err != nil {
@ -37,7 +37,7 @@ func CreateIngressTLSSecret(client kubernetes.Interface, hosts []string, secreNa
key := k.Bytes() key := k.Bytes()
secret := &v1.Secret{ secret := &v1.Secret{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: secreName, Name: secretName,
}, },
Data: map[string][]byte{ Data: map[string][]byte{
v1.TLSCertKey: cert, v1.TLSCertKey: cert,
@ -45,7 +45,7 @@ func CreateIngressTLSSecret(client kubernetes.Interface, hosts []string, secreNa
}, },
} }
var s *v1.Secret var s *v1.Secret
if s, err = client.CoreV1().Secrets(namespace).Get(secreName, metav1.GetOptions{}); err == nil { if s, err = client.CoreV1().Secrets(namespace).Get(secretName, metav1.GetOptions{}); err == nil {
s.Data = secret.Data s.Data = secret.Data
_, err = client.CoreV1().Secrets(namespace).Update(s) _, err = client.CoreV1().Secrets(namespace).Update(s)
} else { } else {

2
test/e2e/framework/test_context.go
View file

@ -50,7 +50,7 @@ func RegisterCommonFlags() {
flag.StringVar(&TestContext.KubeHost, "kubernetes-host", "http://127.0.0.1:8080", "The kubernetes host, or apiserver, to connect to") flag.StringVar(&TestContext.KubeHost, "kubernetes-host", "http://127.0.0.1:8080", "The kubernetes host, or apiserver, to connect to")
flag.StringVar(&TestContext.KubeConfig, "kubernetes-config", os.Getenv(clientcmd.RecommendedConfigPathEnvVar), "Path to config containing embedded authinfo for kubernetes. Default value is from environment variable "+clientcmd.RecommendedConfigPathEnvVar) flag.StringVar(&TestContext.KubeConfig, "kubernetes-config", os.Getenv(clientcmd.RecommendedConfigPathEnvVar), "Path to config containing embedded authinfo for kubernetes. Default value is from environment variable "+clientcmd.RecommendedConfigPathEnvVar)
flag.StringVar(&TestContext.KubeContext, "kubernetes-context", "", "config context to use for kuberentes. If unset, will use value from 'current-context'") flag.StringVar(&TestContext.KubeContext, "kubernetes-context", "", "config context to use for kubernetes. If unset, will use value from 'current-context'")
} }
func RegisterParseFlags() { func RegisterParseFlags() {