Add --haproxy-image-tag flag to installer

voyagermesh · May 22, 2018 · 8aa8c83 · 8aa8c83
1 parent 193fba6
commit 8aa8c83
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/docs/setup/install.md b/docs/setup/install.md
@@ -59,6 +59,7 @@ options:
 -p, --provider=PROVIDER            specify a cloud provider
     --rbac                         create RBAC roles and bindings (default: true)
     --docker-registry              docker registry used to pull voyager images (default: appscode)
+    --haproxy-image-tag            tag of Docker image containing HAProxy binary (default: 1.8.8-7.0.0-rc.2-alpine)
     --image-pull-secret            name of secret used to pull voyager operator images
     --restrict-to-namespace        restrict voyager to its own namespace
     --run-on-master                run voyager operator on master
@@ -105,6 +106,8 @@ $ curl -fsSL https://raw.githubusercontent.com/appscode/voyager/7.0.0-rc.2/hack/
     | bash -s -- --provider=$provider --docker-registry=MY_REGISTRY [--image-pull-secret=SECRET_NAME] [--rbac]
 ```
 
+By default, Voyager uses Alpine based HAProxy image (1.8.8-7.0.0-rc.2-alpine). But you can also Debian based image for HAProxy by setting --haproxy-image-tag=1.8.8-7.0.0-rc.2 flag.
+
 Voyager implements a [validating admission webhook](https://kubernetes.io/docs/admin/admission-controllers/#validatingadmissionwebhook-alpha-in-18-beta-in-19) to validate Voyager CRDs. This is enabled by default for Kubernetes 1.9.0 or later releases. To disable this feature, pass the `--enable-validating-webhook=false` flag.
 
 ```console

diff --git a/hack/deploy/operator.yaml b/hack/deploy/operator.yaml
@@ -32,6 +32,7 @@ spec:
         - --ingress-class=${VOYAGER_INGRESS_CLASS}
         - --restrict-to-operator-namespace=${VOYAGER_RESTRICT_TO_NAMESPACE}
         - --docker-registry=${VOYAGER_DOCKER_REGISTRY}
+        - --haproxy-image-tag=${VOYAGER_HAPROXY_IMAGE_TAG}
         - --secure-port=8443
         - --audit-log-path=-
         - --tls-cert-file=/var/serving-cert/tls.crt

diff --git a/hack/deploy/use-custom-tpl.yaml b/hack/deploy/use-custom-tpl.yaml
@@ -8,15 +8,17 @@ spec:
         - --v=3
         - --rbac=${VOYAGER_ENABLE_RBAC}
         - --cloud-provider=${VOYAGER_CLOUD_PROVIDER}
-        - --cloud-config=${VOYAGER_CLOUD_CONFIG}
+        - --cloud-config=${VOYAGER_CLOUD_CONFIG} # ie. /etc/kubernetes/azure.json for azure
         - --ingress-class=${VOYAGER_INGRESS_CLASS}
         - --restrict-to-operator-namespace=${VOYAGER_RESTRICT_TO_NAMESPACE}
         - --docker-registry=${VOYAGER_DOCKER_REGISTRY}
-        - --custom-templates=/srv/voyager/custom/*.cfg
+        - --haproxy-image-tag=${VOYAGER_HAPROXY_IMAGE_TAG}
         - --secure-port=8443
         - --audit-log-path=-
         - --tls-cert-file=/var/serving-cert/tls.crt
         - --tls-private-key-file=/var/serving-cert/tls.key
+        - --enable-analytics=${VOYAGER_ENABLE_ANALYTICS}
+        - --custom-templates=/srv/voyager/custom/*.cfg
         name: voyager
         volumeMounts:
         - mountPath: /srv/voyager/custom

diff --git a/hack/deploy/voyager.sh b/hack/deploy/voyager.sh
@@ -95,6 +95,7 @@ export VOYAGER_RESTRICT_TO_NAMESPACE=false
 export VOYAGER_ROLE_TYPE=ClusterRole
 export VOYAGER_DOCKER_REGISTRY=appscode
 export VOYAGER_IMAGE_TAG=7.0.0-rc.2
+export VOYAGER_HAPROXY_IMAGE_TAG=1.8.8-7.0.0-rc.2-alpine
 export VOYAGER_IMAGE_PULL_SECRET=
 export VOYAGER_IMAGE_PULL_POLICY=IfNotPresent
 export VOYAGER_ENABLE_ANALYTICS=true
@@ -125,6 +126,7 @@ show_help() {
     echo "-p, --provider=PROVIDER            specify a cloud provider"
     echo "    --rbac                         create RBAC roles and bindings (default: true)"
     echo "    --docker-registry              docker registry used to pull voyager images (default: appscode)"
+    echo "    --haproxy-image-tag            tag of Docker image containing HAProxy binary (default: 1.8.8-7.0.0-rc.2-alpine)"
     echo "    --image-pull-secret            name of secret used to pull voyager operator images"
     echo "    --restrict-to-namespace        restrict voyager to its own namespace"
     echo "    --run-on-master                run voyager operator on master"
@@ -173,6 +175,10 @@ while test $# -gt 0; do
             export VOYAGER_DOCKER_REGISTRY=`echo $1 | sed -e 's/^[^=]*=//g'`
             shift
             ;;
+        --haproxy-image-tag*)
+            export VOYAGER_HAPROXY_IMAGE_TAG=`echo $1 | sed -e 's/^[^=]*=//g'`
+            shift
+            ;;
         --image-pull-secret*)
             secret=`echo $1 | sed -e 's/^[^=]*=//g'`
             export VOYAGER_IMAGE_PULL_SECRET="name: '$secret'"