Skip to content

Commit

Permalink
Merge pull request #4227 from aledbf/lint
Browse files Browse the repository at this point in the history
Fix misspelled and e2e check
  • Loading branch information
k8s-ci-robot authored Jun 25, 2019
2 parents b40fca5 + 85a848f commit c8cbf0d
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cmd/plugin/lints/deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func (lint DeploymentLint) Link() string {
return ""
}

// GetDeploymentLints retuns all of the lints for ingresses
// GetDeploymentLints returns all of the lints for ingresses
func GetDeploymentLints() []DeploymentLint {
return []DeploymentLint{
removedFlag("sort-backends", 3655, "0.22.0"),
Expand Down
2 changes: 1 addition & 1 deletion cmd/plugin/lints/ingress.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ func (lint IngressLint) Version() string {
return lint.version
}

// GetIngressLints retuns all of the lints for ingresses
// GetIngressLints returns all of the lints for ingresses
func GetIngressLints() []IngressLint {
return []IngressLint{
removedAnnotation("add-base-url", 3174, "0.22.0"),
Expand Down
2 changes: 1 addition & 1 deletion cmd/plugin/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func printOrError(s string, e error) error {
return nil
}

// ParseVersionString returns the major, minor, and patch numbers of a verison string
// ParseVersionString returns the major, minor, and patch numbers of a version string
func ParseVersionString(v string) (int, int, int, error) {
parts := versionRegex.FindStringSubmatch(v)

Expand Down
2 changes: 1 addition & 1 deletion internal/ingress/controller/store/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import (
"k8s.io/ingress-nginx/internal/k8s"
)

// IngressFilterFunc decides if an Ingress should be ommited or not
// IngressFilterFunc decides if an Ingress should be omitted or not
type IngressFilterFunc func(*ingress.Ingress) bool

// Storer is the interface that wraps the required methods to gather information
Expand Down
1 change: 1 addition & 0 deletions test/e2e/dbg/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ var _ = framework.IngressNginxDescribe("Debug Tool", func() {

getCmd := "/dbg backends get " + backends[0]
output, err = f.ExecIngressPod(getCmd)
Expect(err).Should(BeNil())

var f map[string]interface{}
unmarshalErr := json.Unmarshal([]byte(output), &f)
Expand Down

0 comments on commit c8cbf0d

Please sign in to comment.