Skip to content

HAProxy Router: Invert health-check idled check #10596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-bot merged 1 commit into from
Aug 24, 2016
Merged

HAProxy Router: Invert health-check idled check #10596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions images/router/haproxy/conf/haproxy-config.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ backend be_edge_http_{{$cfgIdx}}
{{ if ne $weight 0 }}
{{ with $serviceUnit := index $.ServiceUnits $serviceUnitName }}
{{ range $idx, $endpoint := endpointsForAlias $cfg $serviceUnit }}
{{ if not $endpoint.NoHealthCheck }}
{{ if $endpoint.NoHealthCheck }}
server {{$endpoint.IdHash}} {{$endpoint.IP}}:{{$endpoint.Port}} cookie {{$endpoint.IdHash}} weight {{$weight}}
{{ else }}
{{ with $healthIntv := index $cfg.Annotations "router.openshift.io/haproxy.health.check.interval" }}
Expand Down Expand Up @@ -362,7 +362,7 @@ backend be_tcp_{{$cfgIdx}}
{{ if ne $weight 0 }}
{{ with $serviceUnit := index $.ServiceUnits $serviceUnitName }}
{{ range $idx, $endpoint := endpointsForAlias $cfg $serviceUnit }}
{{ if not $endpoint.NoHealthCheck }}
{{ if $endpoint.NoHealthCheck }}
server {{$endpoint.IdHash}} {{$endpoint.IP}}:{{$endpoint.Port}} weight {{$weight}}
{{ else }}
{{ with $healthIntv := index $cfg.Annotations "router.openshift.io/haproxy.health.check.interval" }}
Expand Down Expand Up @@ -436,7 +436,7 @@ backend be_secure_{{$cfgIdx}}
{{ if ne $weight 0 }}
{{ with $serviceUnit := index $.ServiceUnits $serviceUnitName }}
{{ range $idx, $endpoint := endpointsForAlias $cfg $serviceUnit }}
{{ if not $endpoint.NoHealthCheck }}
{{ if $endpoint.NoHealthCheck }}
server {{$endpoint.IdHash}} {{$endpoint.IP}}:{{$endpoint.Port}} ssl verify required ca-file {{ $workingDir }}/cacerts/{{$cfgIdx}}.pem cookie {{$endpoint.IdHash}} weight {{$weight}}
{{ else }}
{{ with $healthIntv := index $cfg.Annotations "router.openshift.io/haproxy.health.check.interval" }}
Expand Down
6 changes: 3 additions & 3 deletions test/extended/idling/idling.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ func checkSingleIdle(oc *exutil.CLI, idlingFile string, resources map[string][]s
// make sure we don't get woken up by an incorrect router health check or anything like that
o.Consistently(func() (string, error) {
return oc.Run("get").Args(resourceName+"/"+objName, "--output=jsonpath=\"{.spec.replicas}\"").Output()
}, 5*time.Second, 500*time.Millisecond).Should(o.ContainSubstring("0"))
}, 20*time.Second, 500*time.Millisecond).Should(o.ContainSubstring("0"))

g.By("Fetching the service and checking the annotations are present")
serviceName := resources["service"][0]
Expand Down Expand Up @@ -250,7 +250,7 @@ var _ = g.Describe("idling and unidling", func() {
})

g.Describe("idling", func() {
g.Context("with a single service and DeploymentConfig", func() {
g.Context("with a single service and DeploymentConfig [Conformance]", func() {
g.BeforeEach(func() {
framework.BeforeEach()
fixture = echoServerFixture
Expand Down Expand Up @@ -279,7 +279,7 @@ var _ = g.Describe("idling and unidling", func() {
fixture = echoServerFixture
})

g.It("should work with TCP (when fully idled)", func() {
g.It("should work with TCP (when fully idled) [Conformance]", func() {
g.By("Idling the service")
_, err := oc.Run("idle").Args("--resource-names-file", idlingFile).Output()
o.Expect(err).ToNot(o.HaveOccurred())
Expand Down