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

Fix runningAddresses typo

Browse source
This commit is contained in:
Clayton O'Neill 2017-07-14 09:30:58 -04:00
parent d416d029ec
commit fb42b9979d
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/pkg/ingress/status/status.go
View file

@ -108,7 +108,7 @@ func (s statusSync) Shutdown() {
glog.Infof("updating status of Ingress rules (remove)") glog.Infof("updating status of Ingress rules (remove)")
addrs, err := s.runningAddresess() addrs, err := s.runningAddresses()
if err != nil { if err != nil {
glog.Errorf("error obtaining running IPs: %v", addrs) glog.Errorf("error obtaining running IPs: %v", addrs)
return return
@ -157,7 +157,7 @@ func (s *statusSync) sync(key interface{}) error {
return nil return nil
} }
addrs, err := s.runningAddresess() addrs, err := s.runningAddresses()
if err != nil { if err != nil {
return err return err
} }
@ -213,9 +213,9 @@ func NewStatusSyncer(config Config) Sync {
return st return st
} }
// runningAddresess returns a list of IP addresses and/or FQDN where the // runningAddresses returns a list of IP addresses and/or FQDN where the
// ingress controller is currently running // ingress controller is currently running
func (s *statusSync) runningAddresess() ([]string, error) { func (s *statusSync) runningAddresses() ([]string, error) {
if s.PublishService != "" { if s.PublishService != "" {
ns, name, _ := k8s.ParseNameNS(s.PublishService) ns, name, _ := k8s.ParseNameNS(s.PublishService)
svc, err := s.Client.Core().Services(ns).Get(name, meta_v1.GetOptions{}) svc, err := s.Client.Core().Services(ns).Get(name, meta_v1.GetOptions{})

4
core/pkg/ingress/status/status_test.go
View file

@ -343,7 +343,7 @@ func TestKeyfunc(t *testing.T) {
func TestRunningAddresessWithPublishService(t *testing.T) { func TestRunningAddresessWithPublishService(t *testing.T) {
fk := buildStatusSync() fk := buildStatusSync()
r, _ := fk.runningAddresess() r, _ := fk.runningAddresses()
if r == nil { if r == nil {
t.Fatalf("returned nil but expected valid []string") t.Fatalf("returned nil but expected valid []string")
} }
@ -357,7 +357,7 @@ func TestRunningAddresessWithPods(t *testing.T) {
fk := buildStatusSync() fk := buildStatusSync()
fk.PublishService = "" fk.PublishService = ""
r, _ := fk.runningAddresess() r, _ := fk.runningAddresses()
if r == nil { if r == nil {
t.Fatalf("returned nil but expected valid []string") t.Fatalf("returned nil but expected valid []string")
} }