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

Cleanup main

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-11-18 07:18:17 -03:00
parent de37e8ea89
commit 3a7203c13a
1 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
cmd/nginx/main.go
View file

@ -65,7 +65,7 @@ func main() {
ns, name, err := k8s.ParseNameNS(conf.DefaultService) ns, name, err := k8s.ParseNameNS(conf.DefaultService)
if err != nil { if err != nil {
glog.Fatalf("invalid format for service %v: %v", conf.DefaultService, err) glog.Fatal(err)
} }
_, err = kubeClient.CoreV1().Services(ns).Get(name, metav1.GetOptions{}) _, err = kubeClient.CoreV1().Services(ns).Get(name, metav1.GetOptions{})
@ -80,7 +80,7 @@ func main() {
if conf.PublishService != "" { if conf.PublishService != "" {
ns, name, err := k8s.ParseNameNS(conf.PublishService) ns, name, err := k8s.ParseNameNS(conf.PublishService)
if err != nil { if err != nil {
glog.Fatalf("invalid service format: %v", err) glog.Fatal(err)
} }
svc, err := kubeClient.CoreV1().Services(ns).Get(name, metav1.GetOptions{}) svc, err := kubeClient.CoreV1().Services(ns).Get(name, metav1.GetOptions{})
@ -103,7 +103,7 @@ func main() {
if conf.Namespace != "" { if conf.Namespace != "" {
_, err = kubeClient.CoreV1().Namespaces().Get(conf.Namespace, metav1.GetOptions{}) _, err = kubeClient.CoreV1().Namespaces().Get(conf.Namespace, metav1.GetOptions{})
if err != nil { if err != nil {
glog.Fatalf("no watchNamespace with name %v found: %v", conf.Namespace, err) glog.Fatalf("no namespace with name %v found: %v", conf.Namespace, err)
} }
} }
@ -116,10 +116,16 @@ func main() {
if err != nil { if err != nil {
glog.Errorf("Failed to mkdir SSL directory: %v", err) glog.Errorf("Failed to mkdir SSL directory: %v", err)
} }
// create the default SSL certificate (dummy) // create the default SSL certificate (dummy)
sha, pem := createDefaultSSLCertificate() defCert, defKey := ssl.GetFakeSSLCert()
conf.FakeCertificatePath = pem c, err := ssl.AddOrUpdateCertAndKey(fakeCertificate, defCert, defKey, []byte{})
conf.FakeCertificateSHA = sha if err != nil {
glog.Fatalf("Error generating self signed certificate: %v", err)
}
conf.FakeCertificatePath = c.PemFileName
conf.FakeCertificateSHA = c.PemSHA
conf.Client = kubeClient conf.Client = kubeClient
conf.DefaultIngressClass = defIngressClass conf.DefaultIngressClass = defIngressClass
@ -313,13 +319,3 @@ func registerHandlers(enableProfiling bool, port int, ic *controller.NGINXContro
} }
glog.Fatal(server.ListenAndServe()) glog.Fatal(server.ListenAndServe())
} }
func createDefaultSSLCertificate() (string, string) {
defCert, defKey := ssl.GetFakeSSLCert()
c, err := ssl.AddOrUpdateCertAndKey(fakeCertificate, defCert, defKey, []byte{})
if err != nil {
glog.Fatalf("Error generating self signed certificate: %v", err)
}
return c.PemSHA, c.PemFileName
}