diff --git a/Makefile b/Makefile index b3f1dc9..487ed25 100755 --- a/Makefile +++ b/Makefile @@ -324,7 +324,7 @@ e2e-setup-minikube: kustomize controller-gen build docker-build kubectl get storageclass minikube image load $(IMG) minikube image load $(E2E_MARKLOGIC_IMAGE_VERSION) - minikube image load "docker.io/haproxytech/haproxy-alpine:3.2" + minikube image load "docker.io/haproxytech/haproxy-alpine:3.4.0" minikube image load $(FLUENT_BIT_IMAGE) minikube image ls @@ -344,7 +344,7 @@ e2e-setup-minikube-istio: kustomize controller-gen build docker-build istioctl # kubectl get pods -n istio-system minikube image load $(IMG) minikube image load $(E2E_MARKLOGIC_IMAGE_VERSION) - minikube image load "docker.io/haproxytech/haproxy-alpine:3.2" + minikube image load "docker.io/haproxytech/haproxy-alpine:3.4.0" minikube image load $(FLUENT_BIT_IMAGE) minikube image ls diff --git a/api/v1/common_types.go b/api/v1/common_types.go index 1253693..2539af8 100644 --- a/api/v1/common_types.go +++ b/api/v1/common_types.go @@ -109,7 +109,7 @@ type NetworkPolicy struct { } type HAProxy struct { Enabled bool `json:"enabled,omitempty"` - // +kubebuilder:default:="haproxytech/haproxy-alpine:3.2" + // +kubebuilder:default:="haproxytech/haproxy-alpine:3.4.0" Image string `json:"image,omitempty"` ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"` // +kubebuilder:default:=1 diff --git a/charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml b/charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml index cfc84ef..6c73436 100644 --- a/charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml +++ b/charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml @@ -4294,7 +4294,7 @@ spec: format: int32 type: integer image: - default: haproxytech/haproxy-alpine:3.2 + default: haproxytech/haproxy-alpine:3.4.0 type: string imagePullSecrets: items: diff --git a/config/crd/bases/marklogic.progress.com_marklogicclusters.yaml b/config/crd/bases/marklogic.progress.com_marklogicclusters.yaml index efa0fd4..b45e5cf 100644 --- a/config/crd/bases/marklogic.progress.com_marklogicclusters.yaml +++ b/config/crd/bases/marklogic.progress.com_marklogicclusters.yaml @@ -4302,7 +4302,7 @@ spec: format: int32 type: integer image: - default: haproxytech/haproxy-alpine:3.2 + default: haproxytech/haproxy-alpine:3.4.0 type: string imagePullSecrets: items: