Skip to content

MLE-11460 Single Group Creation #5

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 12 commits into from
Jun 6, 2024
Merged

MLE-11460 Single Group Creation #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
79f0bcf
MLE-11460 Single Group Creation
Jun 5, 2024
d28cda1
update configMap
Jun 5, 2024
54b338c
use secret to store user credentials
Jun 5, 2024
68d80b9
update default value
Jun 5, 2024
b3cfa5d
add default values
Jun 6, 2024
1bd0b17
remove podManagementPolicy
Jun 6, 2024
ed5c5df
refactor the way to load script to configMap
Jun 6, 2024
17d1c6a
reconcile probes
Jun 6, 2024
043ab7e
reconcile groups
Jun 6, 2024
81609f9
add Unit Tests
Jun 6, 2024
60ee3f9
remove licences
Jun 6, 2024
c78d9ae
change repo name
Jun 6, 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
24 changes: 13 additions & 11 deletions api/v1alpha1/common_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,17 @@ import (
corev1 "k8s.io/api/core/v1"
)

type Probe struct {
// +kubebuilder:validation:Minimum=1
// +kubebuilder:default=1
type ContainerProbe struct {
Enabled bool `json:"enabled,omitempty"`
// +kubebuilder:validation:Minimum=0
InitialDelaySeconds int32 `json:"initialDelaySeconds,omitempty"`
// +kubebuilder:validation:Minimum=1
// +kubebuilder:default=1
// +kubebuilder:validation:Minimum=0
TimeoutSeconds int32 `json:"timeoutSeconds,omitempty"`
// +kubebuilder:validation:Minimum=1
// +kubebuilder:default=10
// +kubebuilder:validation:Minimum=0
PeriodSeconds int32 `json:"periodSeconds,omitempty"`
// +kubebuilder:validation:Minimum=1
// +kubebuilder:default=1
// +kubebuilder:validation:Minimum=0
SuccessThreshold int32 `json:"successThreshold,omitempty"`
// +kubebuilder:validation:Minimum=1
// +kubebuilder:default=3
// +kubebuilder:validation:Minimum=0
FailureThreshold int32 `json:"failureThreshold,omitempty"`
}

Expand All @@ -33,3 +29,9 @@ type VolumeMountWrapper struct {
Volume []corev1.Volume `json:"volume,omitempty"`
MountPath []corev1.VolumeMount `json:"mountPath,omitempty"`
}

type AdminAuth struct {
AdminUsername *string `json:"adminUsername,omitempty"`
AdminPassword *string `json:"adminPassword,omitempty"`
WalletPassword *string `json:"walletPassword,omitempty"`
}
16 changes: 10 additions & 6 deletions api/v1alpha1/marklogicgroup_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,19 @@ type MarklogicGroupSpec struct {
// +kubebuilder:default:="cluster.local"
ClusterDomain string `json:"clusterDomain,omitempty"`

Image string `json:"image"`
// +kubebuilder:default:="marklogicdb/marklogic-db:11.2.0-ubi"
Image string `json:"image"`
// +kubebuilder:default:="IfNotPresent"
ImagePullPolicy string `json:"imagePullPolicy,omitempty"`
ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`

Auth *AdminAuth `json:"auth,omitempty"`
Storage *Storage `json:"storage,omitempty"`
Resources *corev1.ResourceRequirements `json:"resources,omitempty"`
TerminationGracePeriodSeconds *int64 `json:"terminationGracePeriodSeconds,omitempty"`
// +kubebuilder:validation:Enum=OnDelete;RollingUpdate
// +kubebuilder:default:="OnDelete"
UpdateStrategy string `json:"updateStrategy,omitempty"`
PodManagementPolicy *string `json:"podManagementPolicy,omitempty"`
NetworkPolicy *networkingv1.NetworkPolicy `json:"networkPolicy,omitempty"`
PodSecurityContext *corev1.PodSecurityContext `json:"securityContext,omitempty"`
ContainerSecurityContext *corev1.SecurityContext `json:"containerSecurityContext,omitempty"`
Expand All @@ -54,11 +56,13 @@ type MarklogicGroupSpec struct {
TopologySpreadConstraints []corev1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"`
PriorityClassName string `json:"priorityClassName,omitempty"`

LivenessProbe *corev1.Probe `json:"livenessProbe,omitempty"`
ReadinessProbe *corev1.Probe `json:"readinessProbe,omitempty"`
StartupProbe *corev1.Probe `json:"startupProbe,omitempty"`
// +kubebuilder:default:={enabled: true, initialDelaySeconds: 30, timeoutSeconds: 5, periodSeconds: 30, successThreshold: 1, failureThreshold: 3}
LivenessProbe ContainerProbe `json:"livenessProbe,omitempty"`
// +kubebuilder:default:={enabled: false, initialDelaySeconds: 10, timeoutSeconds: 5, periodSeconds: 30, successThreshold: 1, failureThreshold: 3}
ReadinessProbe ContainerProbe `json:"readinessProbe,omitempty"`

GroupConfig GroupConfig `json:"groupConfigs,omitempty"`
// +kubebuilder:default:={name: "Default", enableXdqpSsl: true}
GroupConfig GroupConfig `json:"groupConfig,omitempty"`
License *License `json:"license,omitempty"`
EnableConverters bool `json:"enableConverters,omitempty"`

Expand Down
87 changes: 52 additions & 35 deletions api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading