This is an automated email from the ASF dual-hosted git repository.
HoustonPutman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-operator.git
The following commit(s) were added to refs/heads/main by this push:
new 32bb798 Add SessionAffinity and SessionAffinityConfig fields to
ServiceOptions (#571)
32bb798 is described below
commit 32bb7987a02a3491483563564b99a03ebb4bda77
Author: Trevor Burke <[email protected]>
AuthorDate: Wed Jul 1 10:33:08 2026 -0700
Add SessionAffinity and SessionAffinityConfig fields to ServiceOptions
(#571)
Co-authored-by: Trevor Burke <[email protected]>
Co-authored-by: Houston Putman <[email protected]>
Co-authored-by: Claude Opus 4.8 (1M context) <[email protected]>
---
api/v1beta1/common_types.go | 12 +++
api/v1beta1/zz_generated.deepcopy.go | 5 +
config/crd/bases/solr.apache.org_solrclouds.yaml | 81 ++++++++++++++++
.../solr.apache.org_solrprometheusexporters.yaml | 27 ++++++
controllers/solrcloud_controller_test.go | 19 +++-
.../solrprometheusexporter_controller_test.go | 15 ++-
controllers/util/common.go | 15 +++
controllers/util/prometheus_exporter_util.go | 1 +
controllers/util/solr_util.go | 15 +++
.../solr-cloud/pages/custom-kube-options.adoc | 26 +++++
helm/solr-operator/Chart.yaml | 7 ++
helm/solr-operator/crds/crds.yaml | 108 +++++++++++++++++++++
helm/solr/README.md | 6 ++
helm/solr/templates/_custom_option_helpers.tpl | 21 ++++
helm/solr/values.yaml | 6 ++
15 files changed, 358 insertions(+), 6 deletions(-)
diff --git a/api/v1beta1/common_types.go b/api/v1beta1/common_types.go
index e228e2c..c125b75 100644
--- a/api/v1beta1/common_types.go
+++ b/api/v1beta1/common_types.go
@@ -180,6 +180,18 @@ type ServiceOptions struct {
// Labels to be added for the Service.
// +optional
Labels map[string]string `json:"labels,omitempty"`
+
+ // SessionAffinity is used to maintain session affinity for the Service.
+ // Enables client IP based session affinity when set to "ClientIP".
Must be "ClientIP" or "None". Defaults to "None".
+ // +optional
+ // +kubebuilder:validation:Enum=None;ClientIP
+ // +kubebuilder:default=None
+ SessionAffinity corev1.ServiceAffinity
`json:"sessionAffinity,omitempty"`
+
+ // SessionAffinityConfig contains the configuration of the Service's
session affinity.
+ // Only used when SessionAffinity is set to "ClientIP".
+ // +optional
+ SessionAffinityConfig *corev1.SessionAffinityConfig
`json:"sessionAffinityConfig,omitempty"`
}
// IngressOptions defines custom options for ingresses
diff --git a/api/v1beta1/zz_generated.deepcopy.go
b/api/v1beta1/zz_generated.deepcopy.go
index 5b0a424..b3e4dc6 100644
--- a/api/v1beta1/zz_generated.deepcopy.go
+++ b/api/v1beta1/zz_generated.deepcopy.go
@@ -625,6 +625,11 @@ func (in *ServiceOptions) DeepCopyInto(out
*ServiceOptions) {
(*out)[key] = val
}
}
+ if in.SessionAffinityConfig != nil {
+ in, out := &in.SessionAffinityConfig, &out.SessionAffinityConfig
+ *out = new(v1.SessionAffinityConfig)
+ (*in).DeepCopyInto(*out)
+ }
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver,
creating a new ServiceOptions.
diff --git a/config/crd/bases/solr.apache.org_solrclouds.yaml
b/config/crd/bases/solr.apache.org_solrclouds.yaml
index a4a6936..7aab16f 100644
--- a/config/crd/bases/solr.apache.org_solrclouds.yaml
+++ b/config/crd/bases/solr.apache.org_solrclouds.yaml
@@ -2273,6 +2273,33 @@ spec:
type: string
description: Labels to be added for the Service.
type: object
+ sessionAffinity:
+ default: None
+ description: |-
+ SessionAffinity is used to maintain session affinity
for the Service.
+ Enables client IP based session affinity when set to
"ClientIP". Must be "ClientIP" or "None". Defaults to "None".
+ enum:
+ - None
+ - ClientIP
+ type: string
+ sessionAffinityConfig:
+ description: |-
+ SessionAffinityConfig contains the configuration of
the Service's session affinity.
+ Only used when SessionAffinity is set to "ClientIP".
+ properties:
+ clientIP:
+ description: clientIP contains the configurations
of Client
+ IP based session affinity.
+ properties:
+ timeoutSeconds:
+ description: |-
+ timeoutSeconds specifies the seconds of
ClientIP type session sticky time.
+ The value must be >0 && <=86400(for 1 day)
if ServiceAffinity == "ClientIP".
+ Default value is 10800(for 3 hours).
+ format: int32
+ type: integer
+ type: object
+ type: object
type: object
configMapOptions:
description: ServiceOptions defines the custom options for
the
@@ -2307,6 +2334,33 @@ spec:
type: string
description: Labels to be added for the Service.
type: object
+ sessionAffinity:
+ default: None
+ description: |-
+ SessionAffinity is used to maintain session affinity
for the Service.
+ Enables client IP based session affinity when set to
"ClientIP". Must be "ClientIP" or "None". Defaults to "None".
+ enum:
+ - None
+ - ClientIP
+ type: string
+ sessionAffinityConfig:
+ description: |-
+ SessionAffinityConfig contains the configuration of
the Service's session affinity.
+ Only used when SessionAffinity is set to "ClientIP".
+ properties:
+ clientIP:
+ description: clientIP contains the configurations
of Client
+ IP based session affinity.
+ properties:
+ timeoutSeconds:
+ description: |-
+ timeoutSeconds specifies the seconds of
ClientIP type session sticky time.
+ The value must be >0 && <=86400(for 1 day)
if ServiceAffinity == "ClientIP".
+ Default value is 10800(for 3 hours).
+ format: int32
+ type: integer
+ type: object
+ type: object
type: object
ingressOptions:
description: IngressOptions defines the custom options for
the
@@ -2346,6 +2400,33 @@ spec:
type: string
description: Labels to be added for the Service.
type: object
+ sessionAffinity:
+ default: None
+ description: |-
+ SessionAffinity is used to maintain session affinity
for the Service.
+ Enables client IP based session affinity when set to
"ClientIP". Must be "ClientIP" or "None". Defaults to "None".
+ enum:
+ - None
+ - ClientIP
+ type: string
+ sessionAffinityConfig:
+ description: |-
+ SessionAffinityConfig contains the configuration of
the Service's session affinity.
+ Only used when SessionAffinity is set to "ClientIP".
+ properties:
+ clientIP:
+ description: clientIP contains the configurations
of Client
+ IP based session affinity.
+ properties:
+ timeoutSeconds:
+ description: |-
+ timeoutSeconds specifies the seconds of
ClientIP type session sticky time.
+ The value must be >0 && <=86400(for 1 day)
if ServiceAffinity == "ClientIP".
+ Default value is 10800(for 3 hours).
+ format: int32
+ type: integer
+ type: object
+ type: object
type: object
podOptions:
description: SolrPodOptions defines the custom options for
solrCloud
diff --git a/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml
b/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml
index 002e612..da5237a 100644
--- a/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml
+++ b/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml
@@ -8018,6 +8018,33 @@ spec:
type: string
description: Labels to be added for the Service.
type: object
+ sessionAffinity:
+ default: None
+ description: |-
+ SessionAffinity is used to maintain session affinity
for the Service.
+ Enables client IP based session affinity when set to
"ClientIP". Must be "ClientIP" or "None". Defaults to "None".
+ enum:
+ - None
+ - ClientIP
+ type: string
+ sessionAffinityConfig:
+ description: |-
+ SessionAffinityConfig contains the configuration of
the Service's session affinity.
+ Only used when SessionAffinity is set to "ClientIP".
+ properties:
+ clientIP:
+ description: clientIP contains the configurations
of Client
+ IP based session affinity.
+ properties:
+ timeoutSeconds:
+ description: |-
+ timeoutSeconds specifies the seconds of
ClientIP type session sticky time.
+ The value must be >0 && <=86400(for 1 day)
if ServiceAffinity == "ClientIP".
+ Default value is 10800(for 3 hours).
+ format: int32
+ type: integer
+ type: object
+ type: object
type: object
type: object
exporterEntrypoint:
diff --git a/controllers/solrcloud_controller_test.go
b/controllers/solrcloud_controller_test.go
index 090fe92..42a7d64 100644
--- a/controllers/solrcloud_controller_test.go
+++ b/controllers/solrcloud_controller_test.go
@@ -244,12 +244,19 @@ var _ = FDescribe("SolrCloud controller - General",
func() {
PodManagementPolicy:
appsv1.OrderedReadyPodManagement,
},
CommonServiceOptions:
&solrv1beta1.ServiceOptions{
- Annotations:
testCommonServiceAnnotations,
- Labels:
testCommonServiceLabels,
+ Annotations:
testCommonServiceAnnotations,
+ Labels:
testCommonServiceLabels,
+ SessionAffinity:
corev1.ServiceAffinityClientIP,
+ SessionAffinityConfig:
&corev1.SessionAffinityConfig{
+ ClientIP:
&corev1.ClientIPConfig{
+ TimeoutSeconds:
pointer.Int32(3600),
+ },
+ },
},
HeadlessServiceOptions:
&solrv1beta1.ServiceOptions{
- Annotations:
testHeadlessServiceAnnotations,
- Labels:
testHeadlessServiceLabels,
+ Annotations:
testHeadlessServiceAnnotations,
+ Labels:
testHeadlessServiceLabels,
+ SessionAffinity:
corev1.ServiceAffinityClientIP,
},
ConfigMapOptions:
&solrv1beta1.ConfigMapOptions{
Annotations:
testConfigMapAnnotations,
@@ -340,6 +347,9 @@ var _ = FDescribe("SolrCloud controller - General", func() {
Expect(commonService.Annotations).To(Equal(testCommonServiceAnnotations),
"Incorrect common service annotations")
Expect(commonService.Spec.Ports[0].Protocol).To(Equal(corev1.ProtocolTCP),
"Wrong protocol on common Service")
Expect(commonService.Spec.Ports[0].AppProtocol).To(BeNil(), "AppProtocol on
common Service should be nil when not running with TLS")
+
Expect(commonService.Spec.SessionAffinity).To(Equal(corev1.ServiceAffinityClientIP),
"Incorrect sessionAffinity on common Service")
+
Expect(commonService.Spec.SessionAffinityConfig).To(Not(BeNil()), "Common
Service should have a sessionAffinityConfig")
+
Expect(commonService.Spec.SessionAffinityConfig.ClientIP.TimeoutSeconds).To(PointTo(Equal(int32(3600))),
"Incorrect sessionAffinityConfig timeout on common Service")
By("testing the Solr Headless Service")
headlessService := expectService(ctx, solrCloud,
solrCloud.HeadlessServiceName(), statefulSet.Spec.Selector.MatchLabels, true)
@@ -348,6 +358,7 @@ var _ = FDescribe("SolrCloud controller - General", func() {
Expect(headlessService.Annotations).To(Equal(testHeadlessServiceAnnotations),
"Incorrect headless service annotations")
Expect(headlessService.Spec.Ports[0].Protocol).To(Equal(corev1.ProtocolTCP),
"Wrong protocol on headless Service")
Expect(headlessService.Spec.Ports[0].AppProtocol).To(BeNil(), "AppProtocol on
headless Service should be nil when not running with TLS")
+
Expect(headlessService.Spec.SessionAffinity).To(Equal(corev1.ServiceAffinityClientIP),
"Incorrect sessionAffinity on headless Service")
By("testing the PodDisruptionBudget")
expectNoPodDisruptionBudget(ctx, solrCloud,
solrCloud.StatefulSetName())
diff --git a/controllers/solrprometheusexporter_controller_test.go
b/controllers/solrprometheusexporter_controller_test.go
index 712a535..25d4f00 100644
--- a/controllers/solrprometheusexporter_controller_test.go
+++ b/controllers/solrprometheusexporter_controller_test.go
@@ -32,7 +32,9 @@ import (
solrv1beta1 "github.com/apache/solr-operator/api/v1beta1"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
+ . "github.com/onsi/gomega/gstruct"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/utils/pointer"
)
var _ = FDescribe("SolrPrometheusExporter controller - General", func() {
@@ -180,8 +182,14 @@ var _ = FDescribe("SolrPrometheusExporter controller -
General", func() {
Labels:
testDeploymentLabels,
},
ServiceOptions:
&solrv1beta1.ServiceOptions{
- Annotations:
testMetricsServiceAnnotations,
- Labels:
testMetricsServiceLabels,
+ Annotations:
testMetricsServiceAnnotations,
+ Labels:
testMetricsServiceLabels,
+ SessionAffinity:
corev1.ServiceAffinityClientIP,
+ SessionAffinityConfig:
&corev1.SessionAffinityConfig{
+ ClientIP:
&corev1.ClientIPConfig{
+ TimeoutSeconds:
pointer.Int32(3600),
+ },
+ },
},
ConfigMapOptions:
&solrv1beta1.ConfigMapOptions{
Annotations:
testConfigMapAnnotations,
@@ -303,6 +311,9 @@ var _ = FDescribe("SolrPrometheusExporter controller -
General", func() {
Expect(service.Spec.Ports[0].Protocol).To(Equal(corev1.ProtocolTCP), "Wrong
protocol on metrics Service")
Expect(service.Spec.Ports[0].AppProtocol).ToNot(BeNil(), "AppProtocol on
metrics Service should not be nil")
Expect(*service.Spec.Ports[0].AppProtocol).To(Equal("http"), "Wrong appProtocol
on metrics Service")
+
Expect(service.Spec.SessionAffinity).To(Equal(corev1.ServiceAffinityClientIP),
"Incorrect sessionAffinity on metrics Service")
+
Expect(service.Spec.SessionAffinityConfig).To(Not(BeNil()), "Metrics Service
should have a sessionAffinityConfig")
+
Expect(service.Spec.SessionAffinityConfig.ClientIP.TimeoutSeconds).To(PointTo(Equal(int32(3600))),
"Incorrect sessionAffinityConfig timeout on metrics Service")
})
})
diff --git a/controllers/util/common.go b/controllers/util/common.go
index f857adf..600abb6 100644
--- a/controllers/util/common.go
+++ b/controllers/util/common.go
@@ -230,6 +230,21 @@ func CopyServiceFields(from, to *corev1.Service, logger
logr.Logger) bool {
}
to.Spec.PublishNotReadyAddresses = from.Spec.PublishNotReadyAddresses
+ // Only reconcile SessionAffinity when a value is explicitly desired.
Kubernetes defaults the live
+ // Service's SessionAffinity to "None" (and populates
SessionAffinityConfig when "ClientIP" is used),
+ // so copying an unset value would fight the API server's defaulting
and cause perpetual updates.
+ if from.Spec.SessionAffinity != "" &&
!DeepEqualWithNils(to.Spec.SessionAffinity, from.Spec.SessionAffinity) {
+ requireUpdate = true
+ logger.Info("Update required because field changed", "field",
"Spec.SessionAffinity", "from", to.Spec.SessionAffinity, "to",
from.Spec.SessionAffinity)
+ to.Spec.SessionAffinity = from.Spec.SessionAffinity
+ }
+
+ if !DeepEqualWithNils(to.Spec.SessionAffinityConfig,
from.Spec.SessionAffinityConfig) {
+ requireUpdate = true
+ logger.Info("Update required because field changed", "field",
"Spec.SessionAffinityConfig", "from", to.Spec.SessionAffinityConfig, "to",
from.Spec.SessionAffinityConfig)
+ to.Spec.SessionAffinityConfig = from.Spec.SessionAffinityConfig
+ }
+
return requireUpdate
}
diff --git a/controllers/util/prometheus_exporter_util.go
b/controllers/util/prometheus_exporter_util.go
index f8ef4a7..3094a76 100644
--- a/controllers/util/prometheus_exporter_util.go
+++ b/controllers/util/prometheus_exporter_util.go
@@ -468,6 +468,7 @@ func GenerateSolrMetricsService(solrPrometheusExporter
*solr.SolrPrometheusExpor
Selector: selectorLabels,
},
}
+ applyCustomServiceOptions(&service.Spec, customOptions)
return service
}
diff --git a/controllers/util/solr_util.go b/controllers/util/solr_util.go
index f4a7747..33def13 100644
--- a/controllers/util/solr_util.go
+++ b/controllers/util/solr_util.go
@@ -939,6 +939,18 @@ func getAppProtocol(solrCloud *solr.SolrCloud) *string {
}
}
+// applyCustomServiceOptions applies the ServiceOptions fields that map
directly onto the ServiceSpec.
+// Labels and annotations are handled separately on the ObjectMeta.
+func applyCustomServiceOptions(spec *corev1.ServiceSpec, customOptions
*solr.ServiceOptions) {
+ if customOptions == nil {
+ return
+ }
+ if customOptions.SessionAffinity != "" {
+ spec.SessionAffinity = customOptions.SessionAffinity
+ }
+ spec.SessionAffinityConfig = customOptions.SessionAffinityConfig
+}
+
// GenerateCommonService returns a new corev1.Service pointer generated for
the entire SolrCloud instance
// solrCloud: SolrCloud instance
func GenerateCommonService(solrCloud *solr.SolrCloud) *corev1.Service {
@@ -987,6 +999,7 @@ func GenerateCommonService(solrCloud *solr.SolrCloud)
*corev1.Service {
Selector: selectorLabels,
},
}
+ applyCustomServiceOptions(&service.Spec, customOptions)
return service
}
@@ -1041,6 +1054,7 @@ func GenerateHeadlessService(solrCloud *solr.SolrCloud)
*corev1.Service {
PublishNotReadyAddresses: true,
},
}
+ applyCustomServiceOptions(&service.Spec, customOptions)
return service
}
@@ -1085,6 +1099,7 @@ func GenerateNodeService(solrCloud *solr.SolrCloud,
nodeName string) *corev1.Ser
PublishNotReadyAddresses: true,
},
}
+ applyCustomServiceOptions(&service.Spec, customOptions)
return service
}
diff --git a/docs/modules/solr-cloud/pages/custom-kube-options.adoc
b/docs/modules/solr-cloud/pages/custom-kube-options.adoc
index 97dc6d9..02be794 100644
--- a/docs/modules/solr-cloud/pages/custom-kube-options.adoc
+++ b/docs/modules/solr-cloud/pages/custom-kube-options.adoc
@@ -67,3 +67,29 @@ spec:
----
A complete, runnable example (including the backing `ConfigMap`) is available
in
https://github.com/apache/solr-operator/blob/main/example/test_solrcloud_additional_volume.yaml[`example/test_solrcloud_additional_volume.yaml`].
+
+== Service Session Affinity
+
+The Services that the operator creates for a SolrCloud
(`commonServiceOptions`, `headlessServiceOptions`, and `nodeServiceOptions`)
can be configured with
https://kubernetes.io/docs/reference/networking/virtual-ips/#session-affinity[session
affinity].
+This is useful when clients connect to Solr through the common Service and you
want requests from a given client IP to be routed to the same Solr pod.
+For `headlessServiceOptions` and `nodeServiceOptions`, this option provides no
value because each service endpoint maps to a single pod.
+
+Each service option object exposes two fields:
+
+* **`sessionAffinity`** - Either `None` (the default) or `ClientIP`.
+When set to `ClientIP`, connections from the same client IP are directed to
the same backing pod.
+* **`sessionAffinityConfig`** - Optional
https://kubernetes.io/docs/reference/kubernetes-api/service-resources/service-v1/#ServiceSpec[session
affinity configuration], only used when `sessionAffinity` is `ClientIP`.
+Most commonly this sets the `clientIP.timeoutSeconds` sticky-session timeout
(defaults to `10800`, i.e. 3 hours).
+
+The following example enables client-IP session affinity on the common Service
with a one hour timeout:
+
+[source,yaml]
+----
+spec:
+ customSolrKubeOptions:
+ commonServiceOptions:
+ sessionAffinity: ClientIP
+ sessionAffinityConfig:
+ clientIP:
+ timeoutSeconds: 3600
+----
diff --git a/helm/solr-operator/Chart.yaml b/helm/solr-operator/Chart.yaml
index 81ba86c..1088131 100644
--- a/helm/solr-operator/Chart.yaml
+++ b/helm/solr-operator/Chart.yaml
@@ -131,6 +131,13 @@ annotations:
url: https://github.com/apache/solr-operator/issues/338
- name: Github PR
url: https://github.com/apache/solr-operator/pull/832
+ - kind: added
+ description: Ability to set SessionAffinity and SessionAffinityConfig
for Services
+ links:
+ - name: GitHub Issue
+ url: https://github.com/apache/solr-operator/issues/535
+ - name: GitHub PR
+ url: https://github.com/apache/solr-operator/pull/571
artifacthub.io/images: |
- name: solr-operator
image: apache/solr-operator:v0.10.0-prerelease
diff --git a/helm/solr-operator/crds/crds.yaml
b/helm/solr-operator/crds/crds.yaml
index 3ee596a..45a5b4f 100644
--- a/helm/solr-operator/crds/crds.yaml
+++ b/helm/solr-operator/crds/crds.yaml
@@ -2531,6 +2531,33 @@ spec:
type: string
description: Labels to be added for the Service.
type: object
+ sessionAffinity:
+ default: None
+ description: |-
+ SessionAffinity is used to maintain session affinity
for the Service.
+ Enables client IP based session affinity when set to
"ClientIP". Must be "ClientIP" or "None". Defaults to "None".
+ enum:
+ - None
+ - ClientIP
+ type: string
+ sessionAffinityConfig:
+ description: |-
+ SessionAffinityConfig contains the configuration of
the Service's session affinity.
+ Only used when SessionAffinity is set to "ClientIP".
+ properties:
+ clientIP:
+ description: clientIP contains the configurations
of Client
+ IP based session affinity.
+ properties:
+ timeoutSeconds:
+ description: |-
+ timeoutSeconds specifies the seconds of
ClientIP type session sticky time.
+ The value must be >0 && <=86400(for 1 day)
if ServiceAffinity == "ClientIP".
+ Default value is 10800(for 3 hours).
+ format: int32
+ type: integer
+ type: object
+ type: object
type: object
configMapOptions:
description: ServiceOptions defines the custom options for
the
@@ -2565,6 +2592,33 @@ spec:
type: string
description: Labels to be added for the Service.
type: object
+ sessionAffinity:
+ default: None
+ description: |-
+ SessionAffinity is used to maintain session affinity
for the Service.
+ Enables client IP based session affinity when set to
"ClientIP". Must be "ClientIP" or "None". Defaults to "None".
+ enum:
+ - None
+ - ClientIP
+ type: string
+ sessionAffinityConfig:
+ description: |-
+ SessionAffinityConfig contains the configuration of
the Service's session affinity.
+ Only used when SessionAffinity is set to "ClientIP".
+ properties:
+ clientIP:
+ description: clientIP contains the configurations
of Client
+ IP based session affinity.
+ properties:
+ timeoutSeconds:
+ description: |-
+ timeoutSeconds specifies the seconds of
ClientIP type session sticky time.
+ The value must be >0 && <=86400(for 1 day)
if ServiceAffinity == "ClientIP".
+ Default value is 10800(for 3 hours).
+ format: int32
+ type: integer
+ type: object
+ type: object
type: object
ingressOptions:
description: IngressOptions defines the custom options for
the
@@ -2604,6 +2658,33 @@ spec:
type: string
description: Labels to be added for the Service.
type: object
+ sessionAffinity:
+ default: None
+ description: |-
+ SessionAffinity is used to maintain session affinity
for the Service.
+ Enables client IP based session affinity when set to
"ClientIP". Must be "ClientIP" or "None". Defaults to "None".
+ enum:
+ - None
+ - ClientIP
+ type: string
+ sessionAffinityConfig:
+ description: |-
+ SessionAffinityConfig contains the configuration of
the Service's session affinity.
+ Only used when SessionAffinity is set to "ClientIP".
+ properties:
+ clientIP:
+ description: clientIP contains the configurations
of Client
+ IP based session affinity.
+ properties:
+ timeoutSeconds:
+ description: |-
+ timeoutSeconds specifies the seconds of
ClientIP type session sticky time.
+ The value must be >0 && <=86400(for 1 day)
if ServiceAffinity == "ClientIP".
+ Default value is 10800(for 3 hours).
+ format: int32
+ type: integer
+ type: object
+ type: object
type: object
podOptions:
description: SolrPodOptions defines the custom options for
solrCloud
@@ -27005,6 +27086,33 @@ spec:
type: string
description: Labels to be added for the Service.
type: object
+ sessionAffinity:
+ default: None
+ description: |-
+ SessionAffinity is used to maintain session affinity
for the Service.
+ Enables client IP based session affinity when set to
"ClientIP". Must be "ClientIP" or "None". Defaults to "None".
+ enum:
+ - None
+ - ClientIP
+ type: string
+ sessionAffinityConfig:
+ description: |-
+ SessionAffinityConfig contains the configuration of
the Service's session affinity.
+ Only used when SessionAffinity is set to "ClientIP".
+ properties:
+ clientIP:
+ description: clientIP contains the configurations
of Client
+ IP based session affinity.
+ properties:
+ timeoutSeconds:
+ description: |-
+ timeoutSeconds specifies the seconds of
ClientIP type session sticky time.
+ The value must be >0 && <=86400(for 1 day)
if ServiceAffinity == "ClientIP".
+ Default value is 10800(for 3 hours).
+ format: int32
+ type: integer
+ type: object
+ type: object
type: object
type: object
exporterEntrypoint:
diff --git a/helm/solr/README.md b/helm/solr/README.md
index a7a1078..52eaa4c 100644
--- a/helm/solr/README.md
+++ b/helm/solr/README.md
@@ -307,10 +307,16 @@ When using the helm chart, omit `customSolrKubeOptions.`
| statefulSetOptions.podManagementPolicy | string | `"Parallel"` | Policy for
how Solr pods should be managed in the statefulSet, ["OrderedReady" or
"Parallel"](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#pod-management-policies)
|
| commonServiceOptions.annotations | map[string]string | | Custom annotations
to add to the Solr common service |
| commonServiceOptions.labels | map[string]string | | Custom labels to add to
the Solr common service |
+| commonServiceOptions.sessionAffinity | string | `"None"` | Choose session
affinity to setup for the common service. Available options are "None" and
"ClientIP". |
+| commonServiceOptions.sessionAffinityConfig | object | | Sets configuration
of session affinity |
| headlessServiceOptions.annotations | map[string]string | | Custom
annotations to add to the Solr headless service |
| headlessServiceOptions.labels | map[string]string | | Custom labels to add
to the Solr headless service |
+| headlessServiceOptions.sessionAffinity | string | `"None"` | Choose session
affinity to setup for the headless service. Available options are "None" and
"ClientIP". |
+| headlessServiceOptions.sessionAffinityConfig | object | | Sets
configuration of session affinity |
| nodeServiceOptions.annotations | map[string]string | | Custom annotations
to add to the Solr node service(s) |
| nodeServiceOptions.labels | map[string]string | | Custom labels to add to
the Solr node service(s) |
+| nodeServiceOptions.sessionAffinity | string | `"None"` | Choose session
affinity to setup for the node service(s). Available options are "None" and
"ClientIP". |
+| nodeServiceOptions.sessionAffinityConfig | object | | Sets configuration of
session affinity |
| ingressOptions.annotations | map[string]string | | Custom annotations to
add to the Solr ingress, if an Ingress is created/used |
| ingressOptions.labels | map[string]string | | Custom labels to add to the
Solr ingress, if an Ingress is created/used |
| ingressOptions.ingressClassName | string | | Set the name of the
IngressClass to use, if an Ingress is created/used |
diff --git a/helm/solr/templates/_custom_option_helpers.tpl
b/helm/solr/templates/_custom_option_helpers.tpl
index b74c52d..cfe1dc9 100644
--- a/helm/solr/templates/_custom_option_helpers.tpl
+++ b/helm/solr/templates/_custom_option_helpers.tpl
@@ -187,6 +187,13 @@ labels:
annotations:
{{- toYaml .Values.commonServiceOptions.annotations | nindent 2 }}
{{ end }}
+{{- if .Values.commonServiceOptions.sessionAffinity -}}
+sessionAffinity: {{ .Values.commonServiceOptions.sessionAffinity }}
+{{ end }}
+{{- if .Values.commonServiceOptions.sessionAffinityConfig -}}
+sessionAffinityConfig:
+ {{- toYaml .Values.commonServiceOptions.sessionAffinityConfig | nindent 2 }}
+{{ end }}
{{- end -}}
{{/*
@@ -201,6 +208,13 @@ labels:
annotations:
{{- toYaml .Values.headlessServiceOptions.annotations | nindent 2 }}
{{ end }}
+{{- if .Values.headlessServiceOptions.sessionAffinity -}}
+sessionAffinity: {{ .Values.headlessServiceOptions.sessionAffinity }}
+{{ end }}
+{{- if .Values.headlessServiceOptions.sessionAffinityConfig -}}
+sessionAffinityConfig:
+ {{- toYaml .Values.headlessServiceOptions.sessionAffinityConfig | nindent 2
}}
+{{ end }}
{{- end -}}
{{/*
@@ -215,6 +229,13 @@ labels:
annotations:
{{- toYaml .Values.nodeServiceOptions.annotations | nindent 2 }}
{{ end }}
+{{- if .Values.nodeServiceOptions.sessionAffinity -}}
+sessionAffinity: {{ .Values.nodeServiceOptions.sessionAffinity }}
+{{ end }}
+{{- if .Values.nodeServiceOptions.sessionAffinityConfig -}}
+sessionAffinityConfig:
+ {{- toYaml .Values.nodeServiceOptions.sessionAffinityConfig | nindent 2 }}
+{{ end }}
{{- end -}}
{{/*
diff --git a/helm/solr/values.yaml b/helm/solr/values.yaml
index 281a757..07599d9 100644
--- a/helm/solr/values.yaml
+++ b/helm/solr/values.yaml
@@ -363,14 +363,20 @@ statefulSetOptions:
commonServiceOptions:
annotations: {}
labels: {}
+ sessionAffinity: ""
+ sessionAffinityConfig: {}
headlessServiceOptions:
annotations: {}
labels: {}
+ sessionAffinity: ""
+ sessionAffinityConfig: {}
nodeServiceOptions:
annotations: {}
labels: {}
+ sessionAffinity: ""
+ sessionAffinityConfig: {}
ingressOptions:
annotations: {}
