From c8220e96d237315d6ddc75849f1d5ff93329910c Mon Sep 17 00:00:00 2001 From: jd252387 Date: Fri, 20 Jun 2025 16:52:40 +0000 Subject: [PATCH 1/6] fix: Add abillity to set enableServiceLinks --- api/v1beta1/common_types.go | 4 ++++ config/crd/bases/solr.apache.org_solrclouds.yaml | 5 +++++ .../bases/solr.apache.org_solrprometheusexporters.yaml | 5 +++++ controllers/solrcloud_controller_test.go | 4 ++++ controllers/util/solr_util.go | 3 +++ helm/solr-operator/Chart.yaml | 2 ++ helm/solr-operator/crds/crds.yaml | 10 ++++++++++ helm/solr/README.md | 1 + helm/solr/templates/_custom_option_helpers.tpl | 3 +++ helm/solr/values.yaml | 2 ++ 10 files changed, 39 insertions(+) diff --git a/api/v1beta1/common_types.go b/api/v1beta1/common_types.go index 22002243..d62e7dd6 100644 --- a/api/v1beta1/common_types.go +++ b/api/v1beta1/common_types.go @@ -145,6 +145,10 @@ type PodOptions struct { // +optional ShareProcessNamespace bool `json:"shareProcessNamespace,omitempty"` + // Should process namespace sharing be enabled on created pods + // +optional + EnableServiceLinks bool `json:"enableServiceLinks,omitempty"` + // Optional PodSpreadTopologyConstraints to use when scheduling pods. // More information here: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ // diff --git a/config/crd/bases/solr.apache.org_solrclouds.yaml b/config/crd/bases/solr.apache.org_solrclouds.yaml index 76809b56..bb4e2b72 100644 --- a/config/crd/bases/solr.apache.org_solrclouds.yaml +++ b/config/crd/bases/solr.apache.org_solrclouds.yaml @@ -5800,6 +5800,11 @@ spec: description: Should process namespace sharing be enabled on created pods type: boolean + enableServiceLinks: + description: |- + Should service environment variables be created on containers. + More info: https://kubernetes.io/docs/tutorials/services/connect-applications-service/#accessing-the-service + type: boolean sidecarContainers: description: Sidecar containers to run in the pod. These are in addition to the Solr Container diff --git a/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml b/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml index 766b8884..ffe6e9c8 100644 --- a/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml +++ b/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml @@ -3717,6 +3717,11 @@ spec: description: Should process namespace sharing be enabled on created pods type: boolean + enableServiceLinks: + description: |- + Should service environment variables be created on containers. + More info: https://kubernetes.io/docs/tutorials/services/connect-applications-service/#accessing-the-service + type: boolean sidecarContainers: description: Sidecar containers to run in the pod. These are in addition to the Solr Container diff --git a/controllers/solrcloud_controller_test.go b/controllers/solrcloud_controller_test.go index b41f0527..5e06f5f1 100644 --- a/controllers/solrcloud_controller_test.go +++ b/controllers/solrcloud_controller_test.go @@ -150,6 +150,7 @@ var _ = FDescribe("SolrCloud controller - General", func() { Expect(statefulSet.Spec.Template.Spec.Volumes[3].Name).To(Equal(extraVolumes[0].Name), "Additional Volume from podOptions not loaded into pod properly.") Expect(statefulSet.Spec.Template.Spec.Volumes[3].VolumeSource).To(Equal(extraVolumes[0].Source), "Additional Volume from podOptions not loaded into pod properly.") Expect(statefulSet.Spec.Template.Spec.ShareProcessNamespace).Should(PointTo(BeFalse())) + Expect(statefulSet.Spec.Template.Spec.EnableServiceLinks).Should(PointTo(BeTrue())) Expect(statefulSet.Spec.Template.Spec.ReadinessGates).To(ContainElement(corev1.PodReadinessGate{ConditionType: util.SolrIsNotStoppedReadinessCondition}), "All pods should contain the isNotStopped readinessGate.") By("testing the Solr Common Service") @@ -174,6 +175,7 @@ var _ = FDescribe("SolrCloud controller - General", func() { FContext("Solr Cloud with Custom Kube Options", func() { three := intstr.FromInt(3) testShareProcessNamespace := true + testEnableServiceLinks := false BeforeEach(func() { replicas := int32(4) solrCloud.Spec = solrv1beta1.SolrCloudSpec{ @@ -227,6 +229,7 @@ var _ = FDescribe("SolrCloud controller - General", func() { }, }, ShareProcessNamespace: testShareProcessNamespace, + EnableServiceLinks: testEnableServiceLinks, }, StatefulSetOptions: &solrv1beta1.StatefulSetOptions{ Annotations: testSSAnnotations, @@ -305,6 +308,7 @@ var _ = FDescribe("SolrCloud controller - General", func() { Expect(statefulSet.Spec.Template.Spec.TopologySpreadConstraints).To(HaveLen(len(testTopologySpreadConstraints)), "Wrong number of topologySpreadConstraints") Expect(statefulSet.Spec.Template.Spec.TopologySpreadConstraints[0]).To(Equal(testTopologySpreadConstraints[0]), "Wrong first topologySpreadConstraint") Expect(statefulSet.Spec.Template.Spec.ShareProcessNamespace).To(Equal(&testShareProcessNamespace), "Wrong shareProcessNamespace value") + Expect(statefulSet.Spec.Template.Spec.EnableServiceLinks).To(Equal(&testEnableServiceLinks), "Wrong enableServiceLinks value") expectedSecondTopologyConstraint := testTopologySpreadConstraints[1].DeepCopy() expectedSecondTopologyConstraint.LabelSelector = statefulSet.Spec.Selector Expect(statefulSet.Spec.Template.Spec.TopologySpreadConstraints[1]).To(Equal(*expectedSecondTopologyConstraint), "Wrong second topologySpreadConstraint") diff --git a/controllers/util/solr_util.go b/controllers/util/solr_util.go index 50fdbc48..7e67e651 100644 --- a/controllers/util/solr_util.go +++ b/controllers/util/solr_util.go @@ -87,6 +87,7 @@ var ( func GenerateStatefulSet(solrCloud *solr.SolrCloud, solrCloudStatus *solr.SolrCloudStatus, hostNameIPs map[string]string, reconcileConfigInfo map[string]string, tls *TLSCerts, security *SecurityConfig) *appsv1.StatefulSet { terminationGracePeriod := int64(60) shareProcessNamespace := false + enableServiceLinks := true solrPodPort := solrCloud.Spec.SolrAddressability.PodPort defaultFSGroup := int64(DefaultSolrGroup) @@ -128,6 +129,7 @@ func GenerateStatefulSet(solrCloud *solr.SolrCloud, solrCloudStatus *solr.SolrCl terminationGracePeriod = *customPodOptions.TerminationGracePeriodSeconds } shareProcessNamespace = customPodOptions.ShareProcessNamespace + enableServiceLinks = customPodOptions.EnableServiceLinks } if podAnnotations == nil { podAnnotations = make(map[string]string, 1) @@ -549,6 +551,7 @@ func GenerateStatefulSet(solrCloud *solr.SolrCloud, solrCloudStatus *solr.SolrCl Spec: corev1.PodSpec{ TerminationGracePeriodSeconds: &terminationGracePeriod, ShareProcessNamespace: &shareProcessNamespace, + EnableServiceLinks: &enableServiceLinks, SecurityContext: &corev1.PodSecurityContext{ FSGroup: &defaultFSGroup, }, diff --git a/helm/solr-operator/Chart.yaml b/helm/solr-operator/Chart.yaml index fb16b8e8..3416bf3c 100644 --- a/helm/solr-operator/Chart.yaml +++ b/helm/solr-operator/Chart.yaml @@ -72,6 +72,8 @@ annotations: url: https://github.com/apache/solr-operator/issues/778 - name: Github PR url: https://github.com/apache/solr-operator/pull/779 + - kind: added + description: Abillity to set the `enableServiceLinks` field on pods. 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 a1229dcf..cf3807a4 100644 --- a/helm/solr-operator/crds/crds.yaml +++ b/helm/solr-operator/crds/crds.yaml @@ -6058,6 +6058,11 @@ spec: description: Should process namespace sharing be enabled on created pods type: boolean + enableServiceLinks: + description: |- + Should service environment variables be created on containers. + More info: https://kubernetes.io/docs/tutorials/services/connect-applications-service/#accessing-the-service + type: boolean sidecarContainers: description: Sidecar containers to run in the pod. These are in addition to the Solr Container @@ -21570,6 +21575,11 @@ spec: description: Should process namespace sharing be enabled on created pods type: boolean + enableServiceLinks: + description: |- + Should service environment variables be created on containers. + More info: https://kubernetes.io/docs/tutorials/services/connect-applications-service/#accessing-the-service + type: boolean sidecarContainers: description: Sidecar containers to run in the pod. These are in addition to the Solr Container diff --git a/helm/solr/README.md b/helm/solr/README.md index a02cfa10..511b1d97 100644 --- a/helm/solr/README.md +++ b/helm/solr/README.md @@ -286,6 +286,7 @@ When using the helm chart, omit `customSolrKubeOptions.` | podOptions.topologySpreadConstraints | []object | | Specify a list of Kubernetes topologySpreadConstraints for the Solr pod. No need to provide a `labelSelector`, as the Solr Operator will default that for you. More information can be found in [the documentation](https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/). | | podOptions.serviceAccountName | string | | Optional serviceAccount to run the Solr pods under | | podOptions.shareProcessNamespace | boolean | false | Whether containers in a pod should share the same process namespace. | +| podOptions.enableServiceLinks | boolean | true | Whether service environment variables be created containers. | | podOptions.priorityClassName | string | | Optional priorityClassName for the Solr pod | | podOptions.sidecarContainers | []object | | An optional list of additional containers to run along side the Solr in its pod | | podOptions.initContainers | []object | | An optional list of additional initContainers to run before the Solr container starts | diff --git a/helm/solr/templates/_custom_option_helpers.tpl b/helm/solr/templates/_custom_option_helpers.tpl index 34f72981..679cc8dc 100644 --- a/helm/solr/templates/_custom_option_helpers.tpl +++ b/helm/solr/templates/_custom_option_helpers.tpl @@ -39,6 +39,9 @@ serviceAccountName: {{ include "solr.serviceAccountName.solr" . }} {{- if .Values.podOptions.shareProcessNamespace -}} shareProcessNamespace: {{ .Values.podOptions.shareProcessNamespace }} {{ end }} +{{- if .Values.podOptions.enableServiceLinks -}} +enableServiceLinks: {{ .Values.podOptions.enableServiceLinks }} +{{ end }} {{- if .Values.podOptions.priorityClassName -}} priorityClassName: {{ .Values.podOptions.priorityClassName }} {{ end }} diff --git a/helm/solr/values.yaml b/helm/solr/values.yaml index e6addba7..c4aeb2bd 100644 --- a/helm/solr/values.yaml +++ b/helm/solr/values.yaml @@ -303,6 +303,8 @@ podOptions: shareProcessNamespace: false + enableServiceLinks: true + # Manage where the Solr pods are scheduled affinity: {} tolerations: [] From 4167fec089fc4c212b5596fc5f96adc078dbd71a Mon Sep 17 00:00:00 2001 From: jd252387 Date: Fri, 20 Jun 2025 17:04:40 +0000 Subject: [PATCH 2/6] fix: Add links to changelog, correct comment --- api/v1beta1/common_types.go | 2 +- helm/solr-operator/Chart.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/api/v1beta1/common_types.go b/api/v1beta1/common_types.go index d62e7dd6..06d98499 100644 --- a/api/v1beta1/common_types.go +++ b/api/v1beta1/common_types.go @@ -145,7 +145,7 @@ type PodOptions struct { // +optional ShareProcessNamespace bool `json:"shareProcessNamespace,omitempty"` - // Should process namespace sharing be enabled on created pods + // Should service environment variables be created on containers // +optional EnableServiceLinks bool `json:"enableServiceLinks,omitempty"` diff --git a/helm/solr-operator/Chart.yaml b/helm/solr-operator/Chart.yaml index 3416bf3c..ee654c41 100644 --- a/helm/solr-operator/Chart.yaml +++ b/helm/solr-operator/Chart.yaml @@ -74,6 +74,9 @@ annotations: url: https://github.com/apache/solr-operator/pull/779 - kind: added description: Abillity to set the `enableServiceLinks` field on pods. + links: + - name: Github PR + url: https://github.com/apache/solr-operator/pull/790 artifacthub.io/images: | - name: solr-operator image: apache/solr-operator:v0.10.0-prerelease From 293d1d4862950653e298a59bf00a864cfff6d470 Mon Sep 17 00:00:00 2001 From: John Doe Date: Wed, 30 Jul 2025 14:23:40 +0300 Subject: [PATCH 3/6] fix: check enableServiceLinks value with hasKey --- helm/solr/templates/_custom_option_helpers.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/solr/templates/_custom_option_helpers.tpl b/helm/solr/templates/_custom_option_helpers.tpl index 679cc8dc..b7f3d1cc 100644 --- a/helm/solr/templates/_custom_option_helpers.tpl +++ b/helm/solr/templates/_custom_option_helpers.tpl @@ -39,7 +39,7 @@ serviceAccountName: {{ include "solr.serviceAccountName.solr" . }} {{- if .Values.podOptions.shareProcessNamespace -}} shareProcessNamespace: {{ .Values.podOptions.shareProcessNamespace }} {{ end }} -{{- if .Values.podOptions.enableServiceLinks -}} +{{- if hasKey .Values.podOptions "enableServiceLinks" -}} enableServiceLinks: {{ .Values.podOptions.enableServiceLinks }} {{ end }} {{- if .Values.podOptions.priorityClassName -}} From 63389826d69232340bee5ab9f6b0c5a4b0861556 Mon Sep 17 00:00:00 2001 From: Houston Putman Date: Tue, 16 Jun 2026 16:24:47 -0700 Subject: [PATCH 4/6] Re-generate and format. Make EnableServiceLinks a pointer. --- api/v1beta1/common_types.go | 2 +- api/v1beta1/zz_generated.deepcopy.go | 5 +++++ .../crd/bases/solr.apache.org_solrclouds.yaml | 9 ++++----- ...olr.apache.org_solrprometheusexporters.yaml | 9 ++++----- controllers/solrcloud_controller_test.go | 7 ++++--- controllers/util/solr_util.go | 4 ++-- helm/solr-operator/crds/crds.yaml | 18 ++++++++---------- 7 files changed, 28 insertions(+), 26 deletions(-) diff --git a/api/v1beta1/common_types.go b/api/v1beta1/common_types.go index 06d98499..d5c82a37 100644 --- a/api/v1beta1/common_types.go +++ b/api/v1beta1/common_types.go @@ -147,7 +147,7 @@ type PodOptions struct { // Should service environment variables be created on containers // +optional - EnableServiceLinks bool `json:"enableServiceLinks,omitempty"` + EnableServiceLinks *bool `json:"enableServiceLinks,omitempty"` // Optional PodSpreadTopologyConstraints to use when scheduling pods. // More information here: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go index d48f048e..a9edeac8 100644 --- a/api/v1beta1/zz_generated.deepcopy.go +++ b/api/v1beta1/zz_generated.deepcopy.go @@ -523,6 +523,11 @@ func (in *PodOptions) DeepCopyInto(out *PodOptions) { *out = new(int64) **out = **in } + if in.EnableServiceLinks != nil { + in, out := &in.EnableServiceLinks, &out.EnableServiceLinks + *out = new(bool) + **out = **in + } if in.TopologySpreadConstraints != nil { in, out := &in.TopologySpreadConstraints, &out.TopologySpreadConstraints *out = make([]v1.TopologySpreadConstraint, len(*in)) diff --git a/config/crd/bases/solr.apache.org_solrclouds.yaml b/config/crd/bases/solr.apache.org_solrclouds.yaml index 542acd1d..c5604105 100644 --- a/config/crd/bases/solr.apache.org_solrclouds.yaml +++ b/config/crd/bases/solr.apache.org_solrclouds.yaml @@ -3403,6 +3403,10 @@ spec: More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object + enableServiceLinks: + description: Should service environment variables be created + on containers + type: boolean envVars: description: Additional environment variables to pass to the default container. @@ -5801,11 +5805,6 @@ spec: description: Should process namespace sharing be enabled on created pods type: boolean - enableServiceLinks: - description: |- - Should service environment variables be created on containers. - More info: https://kubernetes.io/docs/tutorials/services/connect-applications-service/#accessing-the-service - type: boolean sidecarContainers: description: Sidecar containers to run in the pod. These are in addition to the Solr Container diff --git a/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml b/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml index ffe6e9c8..ad5d9b28 100644 --- a/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml +++ b/config/crd/bases/solr.apache.org_solrprometheusexporters.yaml @@ -1319,6 +1319,10 @@ spec: More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object + enableServiceLinks: + description: Should service environment variables be created + on containers + type: boolean envVars: description: Additional environment variables to pass to the default container. @@ -3717,11 +3721,6 @@ spec: description: Should process namespace sharing be enabled on created pods type: boolean - enableServiceLinks: - description: |- - Should service environment variables be created on containers. - More info: https://kubernetes.io/docs/tutorials/services/connect-applications-service/#accessing-the-service - type: boolean sidecarContainers: description: Sidecar containers to run in the pod. These are in addition to the Solr Container diff --git a/controllers/solrcloud_controller_test.go b/controllers/solrcloud_controller_test.go index 5e06f5f1..589fe68a 100644 --- a/controllers/solrcloud_controller_test.go +++ b/controllers/solrcloud_controller_test.go @@ -21,6 +21,9 @@ import ( "context" "crypto/md5" "fmt" + "strconv" + "strings" + solrv1beta1 "github.com/apache/solr-operator/api/v1beta1" "github.com/apache/solr-operator/controllers/util" . "github.com/onsi/ginkgo/v2" @@ -31,8 +34,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" pointer "k8s.io/utils/pointer" - "strconv" - "strings" ) func newBoolPtr(value bool) *bool { @@ -229,7 +230,7 @@ var _ = FDescribe("SolrCloud controller - General", func() { }, }, ShareProcessNamespace: testShareProcessNamespace, - EnableServiceLinks: testEnableServiceLinks, + EnableServiceLinks: &testEnableServiceLinks, }, StatefulSetOptions: &solrv1beta1.StatefulSetOptions{ Annotations: testSSAnnotations, diff --git a/controllers/util/solr_util.go b/controllers/util/solr_util.go index e6f10245..7f90b763 100644 --- a/controllers/util/solr_util.go +++ b/controllers/util/solr_util.go @@ -89,7 +89,7 @@ var ( func GenerateStatefulSet(solrCloud *solr.SolrCloud, solrCloudStatus *solr.SolrCloudStatus, hostNameIPs map[string]string, reconcileConfigInfo map[string]string, tls *TLSCerts, security *SecurityConfig) *appsv1.StatefulSet { terminationGracePeriod := int64(60) shareProcessNamespace := false - enableServiceLinks := true + var enableServiceLinks *bool solrPodPort := solrCloud.Spec.SolrAddressability.PodPort defaultFSGroup := int64(DefaultSolrGroup) @@ -560,7 +560,7 @@ func GenerateStatefulSet(solrCloud *solr.SolrCloud, solrCloudStatus *solr.SolrCl Spec: corev1.PodSpec{ TerminationGracePeriodSeconds: &terminationGracePeriod, ShareProcessNamespace: &shareProcessNamespace, - EnableServiceLinks: &enableServiceLinks, + EnableServiceLinks: enableServiceLinks, SecurityContext: &corev1.PodSecurityContext{ FSGroup: &defaultFSGroup, }, diff --git a/helm/solr-operator/crds/crds.yaml b/helm/solr-operator/crds/crds.yaml index 615e1326..674b257a 100644 --- a/helm/solr-operator/crds/crds.yaml +++ b/helm/solr-operator/crds/crds.yaml @@ -3661,6 +3661,10 @@ spec: More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object + enableServiceLinks: + description: Should service environment variables be created + on containers + type: boolean envVars: description: Additional environment variables to pass to the default container. @@ -6059,11 +6063,6 @@ spec: description: Should process namespace sharing be enabled on created pods type: boolean - enableServiceLinks: - description: |- - Should service environment variables be created on containers. - More info: https://kubernetes.io/docs/tutorials/services/connect-applications-service/#accessing-the-service - type: boolean sidecarContainers: description: Sidecar containers to run in the pod. These are in addition to the Solr Container @@ -19178,6 +19177,10 @@ spec: More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object + enableServiceLinks: + description: Should service environment variables be created + on containers + type: boolean envVars: description: Additional environment variables to pass to the default container. @@ -21576,11 +21579,6 @@ spec: description: Should process namespace sharing be enabled on created pods type: boolean - enableServiceLinks: - description: |- - Should service environment variables be created on containers. - More info: https://kubernetes.io/docs/tutorials/services/connect-applications-service/#accessing-the-service - type: boolean sidecarContainers: description: Sidecar containers to run in the pod. These are in addition to the Solr Container From af7e33529266e107c15ba15c67a48309ce7c7a10 Mon Sep 17 00:00:00 2001 From: Houston Putman Date: Tue, 16 Jun 2026 16:29:20 -0700 Subject: [PATCH 5/6] Fix changes in value, for shareProcessNamespace too --- controllers/util/common.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/controllers/util/common.go b/controllers/util/common.go index 0f7fdaa9..f857adf0 100644 --- a/controllers/util/common.go +++ b/controllers/util/common.go @@ -18,12 +18,13 @@ package util import ( - policyv1 "k8s.io/api/policy/v1" "reflect" "strconv" "strings" "time" + policyv1 "k8s.io/api/policy/v1" + "github.com/go-logr/logr" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -522,6 +523,18 @@ func CopyPodTemplates(from, to *corev1.PodTemplateSpec, basePath string, logger to.Spec.ReadinessGates = from.Spec.ReadinessGates } + if !DeepEqualWithNils(to.Spec.ShareProcessNamespace, from.Spec.ShareProcessNamespace) { + requireUpdate = true + logger.Info("Update required because field changed", "field", basePath+"Spec.ShareProcessNamespace", "from", to.Spec.ShareProcessNamespace, "to", from.Spec.ShareProcessNamespace) + to.Spec.ShareProcessNamespace = from.Spec.ShareProcessNamespace + } + + if !DeepEqualWithNils(to.Spec.EnableServiceLinks, from.Spec.EnableServiceLinks) { + requireUpdate = true + logger.Info("Update required because field changed", "field", basePath+"Spec.EnableServiceLinks", "from", to.Spec.EnableServiceLinks, "to", from.Spec.EnableServiceLinks) + to.Spec.EnableServiceLinks = from.Spec.EnableServiceLinks + } + return requireUpdate } From 702c4be363b67d5b8ad912d50389b61fb335cfd1 Mon Sep 17 00:00:00 2001 From: Houston Putman Date: Tue, 16 Jun 2026 16:38:28 -0700 Subject: [PATCH 6/6] Fix test --- controllers/solrcloud_controller_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/solrcloud_controller_test.go b/controllers/solrcloud_controller_test.go index 589fe68a..78a0725e 100644 --- a/controllers/solrcloud_controller_test.go +++ b/controllers/solrcloud_controller_test.go @@ -151,7 +151,7 @@ var _ = FDescribe("SolrCloud controller - General", func() { Expect(statefulSet.Spec.Template.Spec.Volumes[3].Name).To(Equal(extraVolumes[0].Name), "Additional Volume from podOptions not loaded into pod properly.") Expect(statefulSet.Spec.Template.Spec.Volumes[3].VolumeSource).To(Equal(extraVolumes[0].Source), "Additional Volume from podOptions not loaded into pod properly.") Expect(statefulSet.Spec.Template.Spec.ShareProcessNamespace).Should(PointTo(BeFalse())) - Expect(statefulSet.Spec.Template.Spec.EnableServiceLinks).Should(PointTo(BeTrue())) + Expect(statefulSet.Spec.Template.Spec.EnableServiceLinks).Should(BeNil()) Expect(statefulSet.Spec.Template.Spec.ReadinessGates).To(ContainElement(corev1.PodReadinessGate{ConditionType: util.SolrIsNotStoppedReadinessCondition}), "All pods should contain the isNotStopped readinessGate.") By("testing the Solr Common Service")