Merge branch 'develop' into operator-upgrade-31

splunk · Oct 2, 2023 · 6563281 · 6563281
2 parents 9c9705f + d61f383
commit 6563281
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 5 deletions.
diff --git a/config/examples/advanced/hwf.yaml b/config/examples/advanced/hwf.yaml
@@ -9,7 +9,7 @@ spec:
     name: cm-example
   licenseManagerRef:
     name: lm-example
-    replicas: 1
+  replicas: 1
   appRepo:
     appsRepoPollIntervalSeconds: 600
     defaults:

diff --git a/config/examples/advanced/hwf_azure_blob.yaml b/config/examples/advanced/hwf_azure_blob.yaml
@@ -9,7 +9,7 @@ spec:
     name: cm-example
   licenseManagerRef:
     name: lm-example
-    replicas: 1
+  replicas: 1
   appRepo:
     appsRepoPollIntervalSeconds: 600
     defaults:

diff --git a/docs/Ingress.md b/docs/Ingress.md
@@ -322,7 +322,7 @@ spec:
   serviceTemplate:
     spec:
       ports:
-      - name: splunktest
+      - name: tls-splunktest
         port: 9998
         protocol: TCP
         targetPort: 9998

diff --git a/docs/MultisiteExamples.md b/docs/MultisiteExamples.md
@@ -45,7 +45,9 @@ Limitation: all the IndexerCluster resources must be located in the same namespa
 
 #### Deploy the cluster-manager
 
-Note: the image version is defined in these resources as this allows to control the upgrade cycle 
+Note: 
+* The image version is defined in these resources as this allows to control the upgrade cycle
+* For all available default parameters refer to [splunk-ansible default.yml.spec.md](https://github.com/splunk/splunk-ansible/blob/develop/docs/advanced/default.yml.spec.md)
 
 ```yaml
 cat <<EOF | kubectl apply -n splunk-operator -f -
@@ -133,6 +135,7 @@ Additional ansible default parameters must be set to activate multisite:
 * `multisite_master`: which should reference the cluster-manager service of the target indexer cluster
 * `site`: which should in general be set to `site: site0` to disable search affinity ([documentation for more details]
 (https://docs.splunk.com/Documentation/Splunk/latest/DistSearch/DeploymultisiteSHC#Integrate_a_search_head_cluster_with_a_multisite_indexer_cluster))
+* For all available default parameters refer to [splunk-ansible default.yml.spec.md](https://github.com/splunk/splunk-ansible/blob/develop/docs/advanced/default.yml.spec.md)
 
 ```yaml
 cat <<EOF | kubectl apply -n splunk-operator -f -

diff --git a/helm-chart/splunk-operator/templates/deployment.yaml b/helm-chart/splunk-operator/templates/deployment.yaml
@@ -27,6 +27,9 @@ spec:
 {{- end }}
       labels:
 {{- include "splunk-operator.selectorLabels" . | nindent 8 }}
+{{- if .Values.splunkOperator.podLabels }}
+{{ toYaml .Values.splunkOperator.podLabels | indent 8 }}
+{{- end }}
     spec:
 {{- with .Values.splunkOperator.imagePullSecrets }}
       imagePullSecrets:

diff --git a/helm-chart/splunk-operator/templates/rbac/auth_proxy_service.yaml b/helm-chart/splunk-operator/templates/rbac/auth_proxy_service.yaml
@@ -12,4 +12,4 @@ spec:
     protocol: TCP
     targetPort: https
   selector:
-{{- include "splunk-operator.labels" . | nindent 4 }}
+{{- include "splunk-operator.selectorLabels" . | nindent 4 }}
diff --git a/helm-chart/splunk-operator/values.yaml b/helm-chart/splunk-operator/values.yaml
@@ -51,6 +51,9 @@ splunkOperator:
   # Add pod annotations to Splunk Operator deployment pod
   podAnnotations: {}
 
+  # Add pod labels to Splunk Operator deployment pod
+  podLabels: {}
+
   # Set security context for manager container, default ensures that no child process of manager can gain more privileges than manager
   # reference: https://kubernetes.io/docs/concepts/security/pod-security-policy/#privilege-escalation
   containerSecurityContext: