Address review comments, rd 1

apache · Jan 7, 2025 · b5d1743 · b5d1743
1 parent e80fd78
commit b5d1743
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/api/v1beta1/common_types.go b/api/v1beta1/common_types.go
@@ -139,7 +139,7 @@ type PodOptions struct {
 
 	// Should process namespace sharing be enabled on created pods
 	// +optional
-	ShareProcessNamespace *bool `json:"shareProcessNamespace,omitempty"`
+	ShareProcessNamespace bool `json:"shareProcessNamespace,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
diff --git a/controllers/solrcloud_controller_test.go b/controllers/solrcloud_controller_test.go
@@ -216,7 +216,7 @@ var _ = FDescribe("SolrCloud controller - General", func() {
 						TopologySpreadConstraints:     testTopologySpreadConstraints,
 						DefaultInitContainerResources: testResources2,
 						InitContainers:                extraContainers1,
-						ShareProcessNamespace:         &testShareProcessNamespace,
+						ShareProcessNamespace:         testShareProcessNamespace,
 					},
 					StatefulSetOptions: &solrv1beta1.StatefulSetOptions{
 						Annotations:         testSSAnnotations,

diff --git a/controllers/util/solr_util.go b/controllers/util/solr_util.go
@@ -123,9 +123,7 @@ func GenerateStatefulSet(solrCloud *solr.SolrCloud, solrCloudStatus *solr.SolrCl
 		if customPodOptions.TerminationGracePeriodSeconds != nil {
 			terminationGracePeriod = *customPodOptions.TerminationGracePeriodSeconds
 		}
-		if customPodOptions.ShareProcessNamespace != nil {
-			shareProcessNamespace = *customPodOptions.ShareProcessNamespace
-		}
+		shareProcessNamespace = customPodOptions.ShareProcessNamespace
 	}
 
 	// The isNotStopped readiness gate will always be used for managedUpdates

diff --git a/helm/solr/README.md b/helm/solr/README.md
@@ -285,6 +285,7 @@ When using the helm chart, omit `customSolrKubeOptions.`
 | podOptions.tolerations | []object |  | Specify a list of Kubernetes tolerations for the Solr pod |
 | 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.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
@@ -36,6 +36,9 @@ resources:
 {{- if (include "solr.serviceAccountName.solr" .) -}}
 serviceAccountName: {{ include "solr.serviceAccountName.solr" . }}
 {{ end }}
+{{- if .Values.podOptions.shareProcessNamespace -}}
+shareProcessNamespace: {{ .Values.podOptions.shareProcessNamespace}}
+{{ end }}
 {{- if .Values.podOptions.priorityClassName -}}
 priorityClassName: {{ .Values.podOptions.priorityClassName }}
 {{ end }}

diff --git a/helm/solr/values.yaml b/helm/solr/values.yaml
@@ -300,6 +300,8 @@ podOptions:
   # Set Solr service account individually instead of the global "serviceAccount.name"
   serviceAccountName: ""
 
+  shareProcessNamespace: false
+
   # Manage where the Solr pods are scheduled
   affinity: {}
   tolerations: []