MLE-17039 Refactor MarkLogic Cluster (#29)

* Init Fix

* basic backend frontend and static page

* update for sample

* Fix Group Name bug

* support pathBased Routing

* fix tcp port for HAProxy

* update pathBased Routing

* updated network policy

* update for pathBased Routing

* update marklogic group sample

* update haproxy based on review comments

* add ssl support for HAProxy

* fix based on comments

* fix unit test

* update helm for ea2 release

---------

Co-authored-by: Peng Zhou <[email protected]>

Author: pengzhouml

Makefile

@@ -51,7 +51,7 @@ endif
 OPERATOR_SDK_VERSION ?= v1.34.2
 
 # Image URL to use all building/pushing image targets
-IMG ?= ml-marklogic-operator-dev.bed-artifactory.bedford.progress.com/marklogic-kubernetes-operator:0.0.1
+IMG ?= ml-marklogic-operator-dev.bed-artifactory.bedford.progress.com/marklogic-kubernetes-operator:0.0.2
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.28.3
 
@@ -192,7 +192,7 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 .PHONY: deploy
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
 	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
-	$(KUSTOMIZE) build config/default | $(KUBECTL) apply -f -
+	$(KUSTOMIZE) build config/default | $(KUBECTL) apply --server-side -f -
 
 .PHONY: undeploy
 undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.

api/v1alpha1/common_types.go

@@ -74,15 +74,16 @@ type NetworkPolicy struct {
 	Ingress     []networkingv1.NetworkPolicyIngressRule `json:"ingress,omitempty"`
 	Egress      []networkingv1.NetworkPolicyEgressRule  `json:"egress,omitempty"`
 }
-type HAProxyConfig struct {
+type HAProxy struct {
 	Enabled bool `json:"enabled,omitempty"`
+	// +kubebuilder:default:="haproxytech/haproxy-alpine:3.1"
+	Image string `json:"image"`
 	// +kubebuilder:default:=1
 	ReplicaCount int32 `json:"replicas,omitempty"`
 	// +kubebuilder:default:=80
 	FrontendPort int32 `json:"frontendPort,omitempty"`
 	// +kubebuilder:default:={{name: "AppServices", type: "http", port: 8000, targetPort: 8000, path: "/console"}, {name: "Admin", type: "http", port: 8001, targetPort: 8001, path: "/adminUI"}, {name: "Manage", type: "http", port: 8002, targetPort: 8002, path: "/manage"}}
-	DefaultAppServers    []AppServers `json:"defaultAppServers,omitempty"`
-	AdditionalAppServers []AppServers `json:"additionalAppServers,omitempty"`
+	AppServers []AppServers `json:"appServers,omitempty"`
 	// +kubebuilder:default:=true
 	PathBasedRouting   bool `json:"pathBasedRouting,omitempty"`
 	RestartWhenUpgrade bool `json:"restartWhenUpgrade,omitempty"`
@@ -93,10 +94,12 @@ type HAProxyConfig struct {
 	// +kubebuilder:default:={client: 600, connect: 600, server: 600}
 	Timeout Timeout `json:"timeout,omitempty"`
 	// +kubebuilder:default:={enabled: false, secretName: "", certFileName: ""}
-	Tls TlsForHAProxy `json:"tls,omitempty"`
+	Tls *TlsForHAProxy `json:"tls,omitempty"`
 	// +kubebuilder:default:={enabled: false, port: 1024, auth: {enabled: false, username: "", password: ""}}
-	Stats     Stats               `json:"stats,omitempty"`
-	Resources corev1.ResourceList `json:"resources,omitempty"`
+	Stats        Stats               `json:"stats,omitempty"`
+	Resources    corev1.ResourceList `json:"resources,omitempty"`
+	Affinity     *corev1.Affinity    `json:"affinity,omitempty"`
+	NodeSelector map[string]string   `json:"nodeSelector,omitempty"`
 }
 
 type AppServers struct {

api/v1alpha1/marklogiccluster_types.go

@@ -19,7 +19,6 @@ package v1alpha1
 import (
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
-	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -47,7 +46,7 @@ type MarklogicClusterSpec struct {
 	// +kubebuilder:validation:Enum=OnDelete;RollingUpdate
 	// +kubebuilder:default:="OnDelete"
 	UpdateStrategy           appsv1.StatefulSetUpdateStrategyType `json:"updateStrategy,omitempty"`
-	NetworkPolicy            *networkingv1.NetworkPolicy          `json:"networkPolicy,omitempty"`
+	NetworkPolicy            NetworkPolicy                        `json:"networkPolicy,omitempty"`
 	PodSecurityContext       *corev1.PodSecurityContext           `json:"podSecurityContext,omitempty"`
 	ContainerSecurityContext *corev1.SecurityContext              `json:"securityContext,omitempty"`
 
@@ -62,7 +61,7 @@ type MarklogicClusterSpec struct {
 	// +kubebuilder:default:={enabled: false, image: "fluent/fluent-bit:3.1.1", resources: {requests: {cpu: "100m", memory: "200Mi"}, limits: {cpu: "200m", memory: "500Mi"}}, files: {errorLogs: true, accessLogs: true, requestLogs: true}, outputs: "stdout"}
 	LogCollection *LogCollection `json:"logCollection,omitempty"`
 
-	HAProxy HAProxyConfig `json:"haproxy,omitempty"`
+	HAProxy HAProxy `json:"haproxy,omitempty"`
 
 	MarkLogicGroups []*MarklogicGroups `json:"markLogicGroups,omitempty"`
 }
@@ -81,6 +80,7 @@ type MarklogicGroups struct {
 	PriorityClassName         string                            `json:"priorityClassName,omitempty"`
 	HugePages                 *HugePages                        `json:"hugePages,omitempty"`
 	LogCollection             *LogCollection                    `json:"logCollection,omitempty"`
+	HAProxy                   *HAProxy                          `json:"haproxy,omitempty"`
 	IsBootstrap               bool                              `json:"isBootstrap,omitempty"`
 }
 

api/v1alpha1/marklogicgroup_types.go

@@ -70,17 +70,16 @@ type MarklogicGroupSpec struct {
 	LogCollection *LogCollection `json:"logCollection,omitempty"`
 
 	// +kubebuilder:default:={name: "Default", enableXdqpSsl: true}
-	GroupConfig      GroupConfig `json:"groupConfig,omitempty"`
-	License          *License    `json:"license,omitempty"`
-	EnableConverters bool        `json:"enableConverters,omitempty"`
+	GroupConfig      *GroupConfig `json:"groupConfig,omitempty"`
+	License          *License     `json:"license,omitempty"`
+	EnableConverters bool         `json:"enableConverters,omitempty"`
 
 	BootstrapHost string `json:"bootstrapHost,omitempty"`
 
 	DoNotDelete *bool `json:"doNotDelete,omitempty"`
 
-	Service Service `json:"service,omitempty"`
-
-	HAProxyConfig HAProxyConfig `json:"haProxyConfig,omitempty"`
+	Service          Service `json:"service,omitempty"`
+	PathBasedRouting bool    `json:"pathBasedRouting,omitempty"`
 }
 
 // InternalState defines the observed state of MarklogicGroup

api/v1alpha1/zz_generated.deepcopy.go

@@ -13,9 +13,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.0-ea1
+version: 1.0.0-ea2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: 1.0.0-ea1
+appVersion: 1.0.0-ea2