-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Update nginx to 1.13.10 and enable gRPC * Add support for grpc
- Loading branch information
Showing
8 changed files
with
151 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
/* | ||
Copyright 2016 The Kubernetes Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package grpc | ||
|
||
import ( | ||
extensions "k8s.io/api/extensions/v1beta1" | ||
|
||
"k8s.io/ingress-nginx/internal/ingress/annotations/parser" | ||
ing_errors "k8s.io/ingress-nginx/internal/ingress/errors" | ||
"k8s.io/ingress-nginx/internal/ingress/resolver" | ||
) | ||
|
||
type grpc struct { | ||
r resolver.Resolver | ||
} | ||
|
||
// NewParser creates a new gRPC annotation parser | ||
func NewParser(r resolver.Resolver) parser.IngressAnnotation { | ||
return grpc{r} | ||
} | ||
|
||
// ParseAnnotations parses the annotations contained in the ingress | ||
// rule used to indicate if the Kubernetes service exposes gRPC | ||
func (a grpc) Parse(ing *extensions.Ingress) (interface{}, error) { | ||
if ing.GetAnnotations() == nil { | ||
return false, ing_errors.ErrMissingAnnotations | ||
} | ||
|
||
return parser.GetBoolAnnotation("grpc-backend", ing) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,80 @@ | ||
/* | ||
Copyright 2016 The Kubernetes Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package grpc | ||
|
||
import ( | ||
"testing" | ||
|
||
api "k8s.io/api/core/v1" | ||
extensions "k8s.io/api/extensions/v1beta1" | ||
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
"k8s.io/ingress-nginx/internal/ingress/annotations/parser" | ||
"k8s.io/ingress-nginx/internal/ingress/resolver" | ||
|
||
"k8s.io/apimachinery/pkg/util/intstr" | ||
) | ||
|
||
func buildIngress() *extensions.Ingress { | ||
return &extensions.Ingress{ | ||
ObjectMeta: meta_v1.ObjectMeta{ | ||
Name: "foo", | ||
Namespace: api.NamespaceDefault, | ||
}, | ||
Spec: extensions.IngressSpec{ | ||
Backend: &extensions.IngressBackend{ | ||
ServiceName: "default-backend", | ||
ServicePort: intstr.FromInt(80), | ||
}, | ||
}, | ||
} | ||
} | ||
|
||
func TestParseAnnotations(t *testing.T) { | ||
ing := buildIngress() | ||
|
||
_, err := NewParser(&resolver.Mock{}).Parse(ing) | ||
if err == nil { | ||
t.Errorf("unexpected error: %v", err) | ||
} | ||
|
||
data := map[string]string{} | ||
data[parser.GetAnnotationWithPrefix("grpc-backend")] = "true" | ||
ing.SetAnnotations(data) | ||
// test ingress using the annotation without a TLS section | ||
_, err = NewParser(&resolver.Mock{}).Parse(ing) | ||
if err != nil { | ||
t.Errorf("unexpected error parsing ingress with sslpassthrough") | ||
} | ||
|
||
// test with a valid host | ||
ing.Spec.TLS = []extensions.IngressTLS{ | ||
{ | ||
Hosts: []string{"foo.bar.com"}, | ||
}, | ||
} | ||
i, err := NewParser(&resolver.Mock{}).Parse(ing) | ||
if err != nil { | ||
t.Errorf("expected error parsing ingress with sslpassthrough") | ||
} | ||
val, ok := i.(bool) | ||
if !ok { | ||
t.Errorf("expected a bool type") | ||
} | ||
if !val { | ||
t.Errorf("expected true but false returned") | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters