Applied haproxy 1.8.4

voyagermesh · Mar 19, 2018 · a9643a3 · a9643a3
1 parent 2bbbad0
commit a9643a3
Show file tree

Hide file tree

Showing 16 changed files with 13 additions and 13 deletions.
diff --git a/chart/stable/voyager/README.md b/chart/stable/voyager/README.md
@@ -44,7 +44,7 @@ The following tables lists the configurable parameters of the Voyager chart and
 | -----------------------------------| ------------------------------------------------------------- | ----------------------|
 | `dockerRegistry`                   | Docker registry used to pull Voyager related images           | `appscode`            |
 | `imageTags.voyager`                | Tag of Voyager operator image                                 | `6.0.0`       |
-| `imageTags.haproxy`                | Tag of HAProxy container image                                | `1.7.10-6.0.0` |
+| `imageTags.haproxy`                | Tag of HAProxy container image                                | `1.8.4-6.0.0` |
 | `imagePullSecrets`                 | Specify image pull secrets                                    | `nil` (does not add image pull secrets to deployed pods) |
 | `imagePullPolicy`                  | Image pull policy                                             | `IfNotPresent`        |
 | `cloudProvider`                    | Name of cloud provider                                        | `nil`                 |

diff --git a/chart/stable/voyager/values.yaml b/chart/stable/voyager/values.yaml
@@ -8,7 +8,7 @@ imageTags:
   ## Docker image tag containing Voyager
   voyager: 6.0.0
   ## Docker image tag containing HAProxy binary
-  haproxy: 1.7.10-6.0.0
+  haproxy: 1.8.4-6.0.0
 ## Optionally specify an array of imagePullSecrets.
 ## Secrets must be manually created in the namespace.
 ## ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -92,7 +92,7 @@
 - Skip generating UpdateStatus method [\#887](https://github.com/appscode/voyager/pull/887) ([tamalsaha](https://github.com/tamalsaha))
 - Delete internal types [\#886](https://github.com/appscode/voyager/pull/886) ([tamalsaha](https://github.com/tamalsaha))
 - Use official code generator scripts [\#885](https://github.com/appscode/voyager/pull/885) ([tamalsaha](https://github.com/tamalsaha))
-- Use HAProxy 1.7.10 [\#884](https://github.com/appscode/voyager/pull/884) ([tamalsaha](https://github.com/tamalsaha))
+- Use HAProxy 1.8.4 [\#884](https://github.com/appscode/voyager/pull/884) ([tamalsaha](https://github.com/tamalsaha))
 - Move node selector to Ingress spec [\#883](https://github.com/appscode/voyager/pull/883) ([tamalsaha](https://github.com/tamalsaha))
 - Only check NodePort if provided [\#880](https://github.com/appscode/voyager/pull/880) ([tamalsaha](https://github.com/tamalsaha))
 - Create user facing aggregate roles [\#879](https://github.com/appscode/voyager/pull/879) ([tamalsaha](https://github.com/tamalsaha))

diff --git a/docs/guides/certificate/dns/google-cloud.md b/docs/guides/certificate/dns/google-cloud.md
@@ -21,7 +21,7 @@ This article has been tested with a GKE cluster.
 
 ```console
 $ kubectl version --short
-Client Version: v1.8.3
+Client Version: v1.8.4
 Server Version: v1.8.4-gke.0
 ```
 

diff --git a/docs/guides/certificate/dns/route53.md b/docs/guides/certificate/dns/route53.md
@@ -24,8 +24,8 @@ $ kops version
 Version 1.7.1 (git-c69b811)
 
 $ kubectl version --short
-Client Version: v1.8.3
-Server Version: v1.7.10
+Client Version: v1.8.4
+Server Version: v1.8.4
 ```
 
 ## Deploy Voyager operator

diff --git a/docs/reference/voyager_run.md b/docs/reference/voyager_run.md
@@ -49,7 +49,7 @@ voyager run [flags]
       --docker-registry string                                  Docker image registry for HAProxy and Prometheus exporter (default "appscode")
       --enable-swagger-ui                                       Enables swagger ui on the apiserver at /swagger-ui
       --exporter-image-tag string                               Tag of Docker image containing Prometheus exporter (default "6.0.0")
-      --haproxy-image-tag string                                Tag of Docker image containing HAProxy binary (default "1.7.10-6.0.0")
+      --haproxy-image-tag string                                Tag of Docker image containing HAProxy binary (default "1.8.4-6.0.0")
       --haproxy.server-metric-fields string                     Comma-separated list of exported server metrics. See http://cbonte.github.io/haproxy-dconv/configuration-1.5.html#9.1 (default "2,3,4,5,6,7,8,9,13,14,15,16,17,18,21,24,33,35,38,39,40,41,42,43,44")
       --haproxy.timeout duration                                Timeout for trying to get stats from HAProxy. (default 5s)
   -h, --help                                                    help for run

diff --git a/docs/setup/developer-guide/overview.md b/docs/setup/developer-guide/overview.md
@@ -162,7 +162,7 @@ Following configurations can be enabled for test via flags in `./hack/make.py te
 | cloud-provider | | Name of cloud Provider |
 | ingress-class | | | Ingress class handled by voyager. Unset by default. Set to voyager to only handle ingress with annotation kubernetes.io/ingress.class=voyager. |
 | namespace | test- <random> | Run tests in this namespaces |
-| haproxy-image| appscode/haproxy:1.7.10-6.0.0 | HAProxy image name to run |
+| haproxy-image| appscode/haproxy:1.8.4-6.0.0 | HAProxy image name to run |
 | cleanup | true | Turn off cleanup for dynamically generated pods and configmaps. Helps with manual testing |
 | in-cluster | false | Operator is running inside cluster. Helps with running operator testing. |
 | daemon-host-name | master | Daemon host name to run daemon hosts |

diff --git a/hack/docker/haproxy/1.8.3/Dockerfile → hack/docker/haproxy/1.8.4/Dockerfile b/hack/docker/haproxy/1.8.3/Dockerfile → hack/docker/haproxy/1.8.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM haproxy:1.8.3-alpine
+FROM haproxy:1.8.4-alpine
 
 # Installs runit and socklog
 # make the "en_US.UTF-8" locale so postgres will be utf-8 enabled by default

diff --git a/hack/docker/haproxy/1.8.3/runit.sh → hack/docker/haproxy/1.8.4/runit.sh b/hack/docker/haproxy/1.8.3/runit.sh → hack/docker/haproxy/1.8.4/runit.sh
diff --git a/hack/docker/haproxy/1.8.3/setup.sh → hack/docker/haproxy/1.8.4/setup.sh b/hack/docker/haproxy/1.8.3/setup.sh → hack/docker/haproxy/1.8.4/setup.sh
@@ -10,7 +10,7 @@ source "$REPO_ROOT/hack/libbuild/common/public_image.sh"
 detect_tag $REPO_ROOT/dist/.tag
 
 IMG=haproxy
-TAG=1.8.3-$TAG
+TAG=1.8.4-$TAG
 
 build() {
 	pushd $(dirname "${BASH_SOURCE}")

diff --git a/...r/haproxy/1.8.3/sv/haproxy-controller/run → ...r/haproxy/1.8.4/sv/haproxy-controller/run b/...r/haproxy/1.8.3/sv/haproxy-controller/run → ...r/haproxy/1.8.4/sv/haproxy-controller/run
diff --git a/hack/docker/haproxy/1.8.3/sv/haproxy/reload → hack/docker/haproxy/1.8.4/sv/haproxy/reload b/hack/docker/haproxy/1.8.3/sv/haproxy/reload → hack/docker/haproxy/1.8.4/sv/haproxy/reload
diff --git a/hack/docker/haproxy/1.8.3/sv/haproxy/run → hack/docker/haproxy/1.8.4/sv/haproxy/run b/hack/docker/haproxy/1.8.3/sv/haproxy/run → hack/docker/haproxy/1.8.4/sv/haproxy/run
diff --git a/.../docker/haproxy/1.8.3/sv/socklog-unix/run → .../docker/haproxy/1.8.4/sv/socklog-unix/run b/.../docker/haproxy/1.8.3/sv/socklog-unix/run → .../docker/haproxy/1.8.4/sv/socklog-unix/run
diff --git a/hack/release.sh b/hack/release.sh
@@ -13,8 +13,8 @@ rm -rf dist
 ./hack/docker/voyager/setup.sh
 ./hack/docker/voyager/setup.sh release
 
-./hack/docker/haproxy/1.8.3/setup.sh
-./hack/docker/haproxy/1.8.3/setup.sh release
+./hack/docker/haproxy/1.8.4/setup.sh
+./hack/docker/haproxy/1.8.4/setup.sh release
 
 rm dist/.tag
 

diff --git a/pkg/cmds/server/options.go b/pkg/cmds/server/options.go
@@ -66,7 +66,7 @@ func (s OperatorOptions) WatchNamespace() string {
 func NewOperatorOptions() *OperatorOptions {
 	return &OperatorOptions{
 		DockerRegistry:    "appscode",
-		HAProxyImageTag:   "1.7.10-6.0.0",
+		HAProxyImageTag:   "1.8.4-6.0.0",
 		ExporterImageTag:  "6.0.0",
 		OperatorNamespace: meta.Namespace(),
 		OperatorService:   "voyager-operator",