This repository has been archived by the owner on Jul 18, 2022. It is now read-only.
forked from kubernetes/ingress-nginx
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add a flag to make per-host metrics optional
When serving many hosts from one nginx, the metrics may become too numerous for Prometheus. Add a flag to disable the host label, so that metrics are totalled across all hosts. Adds support for HTTP2 Push Preload annotation update test for backendprotocols Adds support for HTTP2 Push Preload annotation Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@serpro.gov.br> Adds support for HTTP2 Push Preload annotation Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@serpro.gov.br> Adds support for HTTP2 Push Preload annotation Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@serpro.gov.br> Adds support for HTTP2 Push Preload annotation Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@serpro.gov.br> Adds support for HTTP2 Push Preload annotation Adds support for HTTP2 Push Preload annotation Update nginx to 1.15.8 (kubernetes#3601) Fix CLA URLs
- Loading branch information
Showing
17 changed files
with
204 additions
and
16 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
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
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,39 @@ | ||
/* | ||
Copyright 2017 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 http2pushpreload | ||
|
||
import ( | ||
extensions "k8s.io/api/extensions/v1beta1" | ||
|
||
"k8s.io/ingress-nginx/internal/ingress/annotations/parser" | ||
"k8s.io/ingress-nginx/internal/ingress/resolver" | ||
) | ||
|
||
type http2PushPreload struct { | ||
r resolver.Resolver | ||
} | ||
|
||
// NewParser creates a new http2PushPreload annotation parser | ||
func NewParser(r resolver.Resolver) parser.IngressAnnotation { | ||
return http2PushPreload{r} | ||
} | ||
|
||
// Parse parses the annotations contained in the ingress rule | ||
// used to add http2 push preload to the server | ||
func (h2pp http2PushPreload) Parse(ing *extensions.Ingress) (interface{}, error) { | ||
return parser.GetBoolAnnotation("http2-push-preload", ing) | ||
} |
62 changes: 62 additions & 0 deletions
62
internal/ingress/annotations/http2pushpreload/main_test.go
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,62 @@ | ||
/* | ||
Copyright 2017 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 http2pushpreload | ||
|
||
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" | ||
) | ||
|
||
func TestParse(t *testing.T) { | ||
annotation := parser.GetAnnotationWithPrefix("http2-push-preload") | ||
ap := NewParser(&resolver.Mock{}) | ||
if ap == nil { | ||
t.Fatalf("expected a parser.IngressAnnotation but returned nil") | ||
} | ||
|
||
testCases := []struct { | ||
annotations map[string]string | ||
expected bool | ||
}{ | ||
{map[string]string{annotation: "true"}, true}, | ||
{map[string]string{annotation: "1"}, true}, | ||
{map[string]string{annotation: ""}, false}, | ||
{map[string]string{}, false}, | ||
{nil, false}, | ||
} | ||
|
||
ing := &extensions.Ingress{ | ||
ObjectMeta: meta_v1.ObjectMeta{ | ||
Name: "foo", | ||
Namespace: api.NamespaceDefault, | ||
}, | ||
Spec: extensions.IngressSpec{}, | ||
} | ||
|
||
for _, testCase := range testCases { | ||
ing.SetAnnotations(testCase.annotations) | ||
result, _ := ap.Parse(ing) | ||
if result != testCase.expected { | ||
t.Errorf("expected %v but returned %v, annotations: %s", testCase.expected, result, testCase.annotations) | ||
} | ||
} | ||
} |
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
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
Oops, something went wrong.