Skip to content

Commit e53bd98

Browse files
author
Peng Zhou
committed
fix validate rule and image load
1 parent 521229c commit e53bd98

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,8 @@ e2e-setup-minikube: kustomize controller-gen build docker-build
164164
minikube addons enable ingress
165165
minikube image load $(IMG)
166166
minikube image load $(E2E_MARKLOGIC_IMAGE_VERSION)
167+
minikube image load "docker.io/haproxytech/haproxy-alpine:3.2"
168+
minikube image ls
167169

168170
.PHONY: e2e-cleanup-minikube
169171
e2e-cleanup-minikube:

api/v1/marklogiccluster_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
// MarklogicClusterSpec defines the desired state of MarklogicCluster
2929

30-
// +kubebuilder:validation:XValidation:rule="!(self.haproxy.enabled == true && self.haproxy.pathBasedRouting == true) || int(self.image.split(':')[1].split('.')[0] + self.image.split(':')[1].split('.')[1]) >= 111", message="HAProxy and Pathbased Routing is enabled. PathBasedRouting is only supported for MarkLogic 11.1 and above"
30+
// +kubebuilder:validation:XValidation:rule="!(self.haproxy.enabled == true && self.haproxy.pathBasedRouting == true) || self.image.split(':')[0].matches('.*latest.*') || int(self.image.split(':')[1].split('.')[0] + self.image.split(':')[1].split('.')[1]) >= 111", message="HAProxy and Pathbased Routing is enabled. PathBasedRouting is only supported for MarkLogic 11.1 and above"
3131
type MarklogicClusterSpec struct {
3232
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
3333
// Important: Run "make" to regenerate code after modifying this file

0 commit comments

Comments
 (0)