Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #378 from gcs278/release-4.12-protocolStrategy
[release-4.12] OCPBUGS-15251: Add support for protocolStrategy API field to enable force_tcp configuration
- Loading branch information
Showing
99 changed files
with
9,191 additions
and
10,996 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
Large diffs are not rendered by default.
Oops, something went wrong.
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
41 changes: 41 additions & 0 deletions
41
pkg/operator/controller/testdata/forwardplugin_protocolstrategy_none
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,41 @@ | ||
| # foo | ||
| foo.com:5353 { | ||
| prometheus 127.0.0.1:9153 | ||
| forward . 1.1.1.1 2.2.2.2:5353 { | ||
| policy round_robin | ||
| } | ||
| errors | ||
| log . { | ||
| class error | ||
| } | ||
| bufsize 512 | ||
| cache 900 { | ||
| denial 9984 30 | ||
| } | ||
| } | ||
| .:5353 { | ||
| bufsize 512 | ||
| errors | ||
| log . { | ||
| class error | ||
| } | ||
| health { | ||
| lameduck 20s | ||
| } | ||
| ready | ||
| kubernetes cluster.local in-addr.arpa ip6.arpa { | ||
| pods insecure | ||
| fallthrough in-addr.arpa ip6.arpa | ||
| } | ||
| prometheus 127.0.0.1:9153 | ||
| forward . /etc/resolv.conf { | ||
| policy sequential | ||
| } | ||
| cache 900 { | ||
| denial 9984 30 | ||
| } | ||
| reload | ||
| } | ||
| hostname.bind:5353 { | ||
| chaos | ||
| } |
42 changes: 42 additions & 0 deletions
42
pkg/operator/controller/testdata/forwardplugin_protocolstrategy_tcp
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,42 @@ | ||
| # foo | ||
| foo.com:5353 { | ||
| prometheus 127.0.0.1:9153 | ||
| forward . 1.1.1.1 2.2.2.2:5353 { | ||
| policy round_robin | ||
| force_tcp | ||
| } | ||
| errors | ||
| log . { | ||
| class error | ||
| } | ||
| bufsize 512 | ||
| cache 900 { | ||
| denial 9984 30 | ||
| } | ||
| } | ||
| .:5353 { | ||
| bufsize 512 | ||
| errors | ||
| log . { | ||
| class error | ||
| } | ||
| health { | ||
| lameduck 20s | ||
| } | ||
| ready | ||
| kubernetes cluster.local in-addr.arpa ip6.arpa { | ||
| pods insecure | ||
| fallthrough in-addr.arpa ip6.arpa | ||
| } | ||
| prometheus 127.0.0.1:9153 | ||
| forward . /etc/resolv.conf { | ||
| policy sequential | ||
| } | ||
| cache 900 { | ||
| denial 9984 30 | ||
| } | ||
| reload | ||
| } | ||
| hostname.bind:5353 { | ||
| chaos | ||
| } |
26 changes: 26 additions & 0 deletions
26
pkg/operator/controller/testdata/upstreamresolver_protocolstrategy_none
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,26 @@ | ||
| .:5353 { | ||
| bufsize 512 | ||
| errors | ||
| log . { | ||
| class error | ||
| } | ||
| health { | ||
| lameduck 20s | ||
| } | ||
| ready | ||
| kubernetes cluster.local in-addr.arpa ip6.arpa { | ||
| pods insecure | ||
| fallthrough in-addr.arpa ip6.arpa | ||
| } | ||
| prometheus 127.0.0.1:9153 | ||
| forward . /etc/resolv.conf { | ||
| policy sequential | ||
| } | ||
| cache 900 { | ||
| denial 9984 30 | ||
| } | ||
| reload | ||
| } | ||
| hostname.bind:5353 { | ||
| chaos | ||
| } |
27 changes: 27 additions & 0 deletions
27
pkg/operator/controller/testdata/upstreamresolver_protocolstrategy_tcp
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,27 @@ | ||
| .:5353 { | ||
| bufsize 512 | ||
| errors | ||
| log . { | ||
| class error | ||
| } | ||
| health { | ||
| lameduck 20s | ||
| } | ||
| ready | ||
| kubernetes cluster.local in-addr.arpa ip6.arpa { | ||
| pods insecure | ||
| fallthrough in-addr.arpa ip6.arpa | ||
| } | ||
| prometheus 127.0.0.1:9153 | ||
| forward . /etc/resolv.conf { | ||
| policy sequential | ||
| force_tcp | ||
| } | ||
| cache 900 { | ||
| denial 9984 30 | ||
| } | ||
| reload | ||
| } | ||
| hostname.bind:5353 { | ||
| chaos | ||
| } |
Oops, something went wrong.