Skip to content

Commit

Permalink
Fix typos (#2046)
Browse files Browse the repository at this point in the history
  • Loading branch information
Lihua Tang authored and aledbf committed Feb 8, 2018
1 parent d76ea2c commit 1947f35
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion deploy/default-backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deploy/provider/aws/service-l7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion internal/file/filesystem.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
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 @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/ingress/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion internal/net/ssl/ssl.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 1947f35

Please sign in to comment.