Fix misspell errors
This commit is contained in:
parent
5e05acd924
commit
639863a622
4 changed files with 8 additions and 3 deletions
|
@ -49,7 +49,7 @@ func NewParser() parser.IngressAnnotation {
|
||||||
|
|
||||||
// Parse parses the annotations contained in the ingress
|
// Parse parses the annotations contained in the ingress
|
||||||
// rule used to create a redirect in the paths defined in the rule.
|
// rule used to create a redirect in the paths defined in the rule.
|
||||||
// If the Ingress containes both annotations the execution order is
|
// If the Ingress contains both annotations the execution order is
|
||||||
// temporal and then permanent
|
// temporal and then permanent
|
||||||
func (a redirect) Parse(ing *extensions.Ingress) (interface{}, error) {
|
func (a redirect) Parse(ing *extensions.Ingress) (interface{}, error) {
|
||||||
r3w, _ := parser.GetBoolAnnotation(www, ing)
|
r3w, _ := parser.GetBoolAnnotation(www, ing)
|
||||||
|
|
|
@ -643,7 +643,7 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
|
||||||
// Do not use defer to remove the temporal file.
|
// Do not use defer to remove the temporal file.
|
||||||
// This is helpful when there is an error in the
|
// This is helpful when there is an error in the
|
||||||
// temporal configuration (we can manually inspect the file).
|
// temporal configuration (we can manually inspect the file).
|
||||||
// Only remove the file when no error occured.
|
// Only remove the file when no error occurred.
|
||||||
os.Remove(tmpfile.Name())
|
os.Remove(tmpfile.Name())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -54,6 +54,11 @@ func WaitUntilPortIsAvailable(port int) {
|
||||||
conn.Close()
|
conn.Close()
|
||||||
// kill nginx worker processes
|
// kill nginx worker processes
|
||||||
fs, err := proc.NewFS("/proc")
|
fs, err := proc.NewFS("/proc")
|
||||||
|
if err != nil {
|
||||||
|
glog.Errorf("unexpected error reading /proc information: %v", err)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
procs, _ := fs.FS.AllProcs()
|
procs, _ := fs.FS.AllProcs()
|
||||||
for _, p := range procs {
|
for _, p := range procs {
|
||||||
pn, err := p.Comm()
|
pn, err := p.Comm()
|
||||||
|
|
|
@ -44,7 +44,7 @@ func TestIsIPV6(t *testing.T) {
|
||||||
|
|
||||||
func TestIsPortAvailable(t *testing.T) {
|
func TestIsPortAvailable(t *testing.T) {
|
||||||
if !IsPortAvailable(0) {
|
if !IsPortAvailable(0) {
|
||||||
t.Fatal("expected port 0 to be avilable (random port) but returned false")
|
t.Fatal("expected port 0 to be available (random port) but returned false")
|
||||||
}
|
}
|
||||||
|
|
||||||
ln, err := net.Listen("tcp", ":0")
|
ln, err := net.Listen("tcp", ":0")
|
||||||
|
|
Loading…
Reference in a new issue