Skip to content

MLE-11585 Version Check of Pathbased Routing #35

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
merged 3 commits into from
Oct 10, 2024
Merged

MLE-11585 Version Check of Pathbased Routing #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64e600e
fix CRD Validation
Oct 2, 2024
2971fab
MLE-11585: Implement CRD Validation for ML version Check
Oct 2, 2024
f9cb1b0
MLE-11585 Implement path based routing ML version check
Oct 2, 2024
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
2 changes: 1 addition & 1 deletion api/v1alpha1/common_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ type NetworkPolicy struct {
type HAProxy struct {
Enabled bool `json:"enabled,omitempty"`
// +kubebuilder:default:="haproxytech/haproxy-alpine:3.1"
Image string `json:"image"`
Image string `json:"image,omitempty"`
// +kubebuilder:default:=1
ReplicaCount int32 `json:"replicas,omitempty"`
// +kubebuilder:default:=80
Expand Down
2 changes: 2 additions & 0 deletions api/v1alpha1/marklogiccluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import (
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.

// MarklogicClusterSpec defines the desired state of MarklogicCluster

// +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"
type MarklogicClusterSpec struct {
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
// Important: Run "make" to regenerate code after modifying this file
Expand Down
11 changes: 6 additions & 5 deletions config/crd/bases/database.marklogic.com_marklogicclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ spec:
metadata:
type: object
spec:
description: MarklogicClusterSpec defines the desired state of MarklogicCluster
properties:
affinity:
description: Affinity is a group of affinity scheduling rules.
Expand Down Expand Up @@ -2048,8 +2047,6 @@ spec:
secretName:
type: string
type: object
required:
- image
type: object
hugePages:
default:
Expand Down Expand Up @@ -4200,8 +4197,6 @@ spec:
secretName:
type: string
type: object
required:
- image
type: object
hugePages:
properties:
Expand Down Expand Up @@ -9391,6 +9386,12 @@ spec:
required:
- image
type: object
x-kubernetes-validations:
- message: HAProxy and Pathbased Routing is enabled. PathBasedRouting
is only supported for MarkLogic 11.1 and above
rule: '!(self.haproxy.enabled == true && self.haproxy.pathBasedRouting
== true) || int(self.image.split('':'')[1].split(''.'')[0] + self.image.split('':'')[1].split(''.'')[1])
>= 111'
status:
description: MarklogicClusterStatus defines the observed state of MarklogicCluster
properties:
Expand Down