fix makefile for pipeline

Peng Zhou · Peng Zhou · commit 521229c4631e · 2025-07-10T08:16:47.000-07:00
diff --git a/Makefile b/Makefile
@@ -163,6 +163,7 @@ e2e-setup-minikube: kustomize controller-gen build docker-build
 	minikube start --driver=docker --kubernetes-version=$(E2E_KUBERNETES_VERSION) --memory=8192 --cpus=2
 	minikube addons enable ingress
 	minikube image load $(IMG)
+	minikube image load $(E2E_MARKLOGIC_IMAGE_VERSION)
 
 .PHONY: e2e-cleanup-minikube
 e2e-cleanup-minikube:
diff --git a/api/v1/common_types.go b/api/v1/common_types.go
@@ -82,7 +82,7 @@ type NetworkPolicy struct {
 }
 type HAProxy struct {
 	Enabled bool `json:"enabled,omitempty"`
-	// +kubebuilder:default:="haproxytech/haproxy-alpine:3.2.1"
+	// +kubebuilder:default:="haproxytech/haproxy-alpine:3.2"
 	Image            string                        `json:"image,omitempty"`
 	ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
 	// +kubebuilder:default:=1

Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ type NetworkPolicy struct {`
`82`	`82`	`}`
`83`	`83`	`type HAProxy struct {`
`84`	`84`	Enabled bool `json:"enabled,omitempty"`
`85`		`- // +kubebuilder:default:="haproxytech/haproxy-alpine:3.2.1"`
	`85`	`+ // +kubebuilder:default:="haproxytech/haproxy-alpine:3.2"`
`86`	`86`	Image string `json:"image,omitempty"`
`87`	`87`	ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
`88`	`88`	`// +kubebuilder:default:=1`