diff --git a/deploy/default-backend.yaml b/deploy/default-backend.yaml index 7894d0f7b..19f7a1c08 100644 --- a/deploy/default-backend.yaml +++ b/deploy/default-backend.yaml @@ -18,7 +18,7 @@ spec: terminationGracePeriodSeconds: 60 containers: - name: default-http-backend - # Any image is permissable as long as: + # Any image is permissible as long as: # 1. It serves a 404 page at / # 2. It serves 200 on a /healthz endpoint image: gcr.io/google_containers/defaultbackend:1.4 diff --git a/deploy/provider/aws/service-l7.yaml b/deploy/provider/aws/service-l7.yaml index 404c2c4af..78783a255 100644 --- a/deploy/provider/aws/service-l7.yaml +++ b/deploy/provider/aws/service-l7.yaml @@ -6,7 +6,7 @@ metadata: labels: app: ingress-nginx annotations: - # replace with the correct value of the generated certifcate in the AWS console + # replace with the correct value of the generated certificate in the AWS console service.beta.kubernetes.io/aws-load-balancer-ssl-cert: "arn:aws:acm:us-west-2:XXXXXXXX:certificate/XXXXXX-XXXXXXX-XXXXXXX-XXXXXXXX" # the backend instances are HTTP service.beta.kubernetes.io/aws-load-balancer-backend-protocol: "http" diff --git a/internal/file/filesystem.go b/internal/file/filesystem.go index 1d03b4b14..4099b98b9 100644 --- a/internal/file/filesystem.go +++ b/internal/file/filesystem.go @@ -42,7 +42,7 @@ func NewLocalFS() (Filesystem, error) { return fs, nil } -// NewFakeFS creates an in-memory filesytem with all the required +// NewFakeFS creates an in-memory filesystem with all the required // paths used by the ingress controller. // This allows running test without polluting the local machine. func NewFakeFS() (Filesystem, error) { diff --git a/internal/ingress/controller/store/store.go b/internal/ingress/controller/store/store.go index 28029f75f..b6b26499d 100644 --- a/internal/ingress/controller/store/store.go +++ b/internal/ingress/controller/store/store.go @@ -128,7 +128,7 @@ type Lister struct { IngressAnnotation IngressAnnotationsLister } -// Controller defines the required controllers that interact agains the api server +// Controller defines the required controllers that interact against the api server type Controller struct { Ingress cache.Controller Endpoint cache.Controller diff --git a/internal/ingress/types.go b/internal/ingress/types.go index 67c2a6cdb..8a618b3ac 100644 --- a/internal/ingress/types.go +++ b/internal/ingress/types.go @@ -206,7 +206,7 @@ type Location struct { // Denied returns an error when this location cannot not be allowed // Requesting a denied location should return HTTP code 403. Denied error `json:"denied,omitempty"` - // CorsConfig returns the Cors Configration for the ingress rule + // CorsConfig returns the Cors Configuration for the ingress rule // +optional CorsConfig cors.Config `json:"corsConfig,omitempty"` // ExternalAuth indicates the access to this location requires diff --git a/internal/net/ssl/ssl.go b/internal/net/ssl/ssl.go index ca684b74f..e2eb6141b 100644 --- a/internal/net/ssl/ssl.go +++ b/internal/net/ssl/ssl.go @@ -262,7 +262,7 @@ func AddCertAuth(name string, ca []byte, fs file.Filesystem) (*ingress.SSLCert, } // If the first certificate does not start with 'BEGIN CERTIFICATE' it's invalid and must not be used. if pemCABlock.Type != "CERTIFICATE" { - return nil, fmt.Errorf("CA file %v contains invalid data, and must be created only with PEM formated certificates", name) + return nil, fmt.Errorf("CA file %v contains invalid data, and must be created only with PEM formatted certificates", name) } _, err := x509.ParseCertificate(pemCABlock.Bytes)