Skip to content

MLE-30475/BUGFix-upgrade HAProxy docker image to 3.4.0 #170

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
rwinieski merged 1 commit into from
Jun 12, 2026
Merged

MLE-30475/BUGFix-upgrade HAProxy docker image to 3.4.0 #170

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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion api/v1/common_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/marklogic-operator-kubernetes/templates/marklogiccluster-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/marklogic.progress.com_marklogicclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading