Fix typos (#2046)
This commit is contained in:
parent
d76ea2c6f4
commit
1947f35121
6 changed files with 6 additions and 6 deletions
|
@ -18,7 +18,7 @@ spec:
|
||||||
terminationGracePeriodSeconds: 60
|
terminationGracePeriodSeconds: 60
|
||||||
containers:
|
containers:
|
||||||
- name: default-http-backend
|
- 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 /
|
# 1. It serves a 404 page at /
|
||||||
# 2. It serves 200 on a /healthz endpoint
|
# 2. It serves 200 on a /healthz endpoint
|
||||||
image: gcr.io/google_containers/defaultbackend:1.4
|
image: gcr.io/google_containers/defaultbackend:1.4
|
||||||
|
|
|
@ -6,7 +6,7 @@ metadata:
|
||||||
labels:
|
labels:
|
||||||
app: ingress-nginx
|
app: ingress-nginx
|
||||||
annotations:
|
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"
|
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
|
# the backend instances are HTTP
|
||||||
service.beta.kubernetes.io/aws-load-balancer-backend-protocol: "http"
|
service.beta.kubernetes.io/aws-load-balancer-backend-protocol: "http"
|
||||||
|
|
|
@ -42,7 +42,7 @@ func NewLocalFS() (Filesystem, error) {
|
||||||
return fs, nil
|
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.
|
// paths used by the ingress controller.
|
||||||
// This allows running test without polluting the local machine.
|
// This allows running test without polluting the local machine.
|
||||||
func NewFakeFS() (Filesystem, error) {
|
func NewFakeFS() (Filesystem, error) {
|
||||||
|
|
|
@ -128,7 +128,7 @@ type Lister struct {
|
||||||
IngressAnnotation IngressAnnotationsLister
|
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 {
|
type Controller struct {
|
||||||
Ingress cache.Controller
|
Ingress cache.Controller
|
||||||
Endpoint cache.Controller
|
Endpoint cache.Controller
|
||||||
|
|
|
@ -206,7 +206,7 @@ type Location struct {
|
||||||
// Denied returns an error when this location cannot not be allowed
|
// Denied returns an error when this location cannot not be allowed
|
||||||
// Requesting a denied location should return HTTP code 403.
|
// Requesting a denied location should return HTTP code 403.
|
||||||
Denied error `json:"denied,omitempty"`
|
Denied error `json:"denied,omitempty"`
|
||||||
// CorsConfig returns the Cors Configration for the ingress rule
|
// CorsConfig returns the Cors Configuration for the ingress rule
|
||||||
// +optional
|
// +optional
|
||||||
CorsConfig cors.Config `json:"corsConfig,omitempty"`
|
CorsConfig cors.Config `json:"corsConfig,omitempty"`
|
||||||
// ExternalAuth indicates the access to this location requires
|
// ExternalAuth indicates the access to this location requires
|
||||||
|
|
|
@ -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 the first certificate does not start with 'BEGIN CERTIFICATE' it's invalid and must not be used.
|
||||||
if pemCABlock.Type != "CERTIFICATE" {
|
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)
|
_, err := x509.ParseCertificate(pemCABlock.Bytes)
|
||||||
|
|
Loading…
Reference in a new issue