Merge branch 'main' into promote-develop-to-main-2.5.2

splunk · Mar 4, 2024 · 5596b75 · 5596b75
2 parents 2e623e6 + 751148c
commit 5596b75
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -18,3 +18,4 @@ images:
 - name: controller
   newName: docker.io/splunk/splunk-operator
   newTag: 2.5.2
+
diff --git a/config/manifests/bases/splunk-operator.clusterserviceversion.yaml b/config/manifests/bases/splunk-operator.clusterserviceversion.yaml
@@ -276,3 +276,4 @@ spec:
     url: www.splunk.com
   replaces: splunk-operator.v2.5.1
   version: 2.5.2
+
diff --git a/docs/SplunkOperatorUpgrade.md b/docs/SplunkOperatorUpgrade.md
@@ -26,6 +26,7 @@ A Splunk Operator for Kubernetes upgrade might include support for a later versi
 
 ```
 wget -O splunk-operator-namespace.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.2/splunk-operator-namespace.yaml
+
 ```
 
 2. (Optional) Review the file and update it with your specific customizations used during your install.

diff --git a/docs/index.yaml b/docs/index.yaml
@@ -261,3 +261,4 @@ entries:
     - https://splunk.github.io/splunk-operator/splunk-operator-1.0.0.tgz
     version: 1.0.0
 generated: "2024-02-29T11:04:35.08619-08:00"
+
diff --git a/helm-chart/splunk-operator/Chart.yaml b/helm-chart/splunk-operator/Chart.yaml
@@ -25,4 +25,4 @@ version: "2.5.2"
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "2.5.2"
+appVersion: "2.5.2"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@ images:
		- name: controller
		newName: docker.io/splunk/splunk-operator
		newTag: 2.5.2
Original file line number	Diff line number	Diff line change
Expand Up		@@ -276,3 +276,4 @@ spec:
		url: www.splunk.com
		replaces: splunk-operator.v2.5.1
		version: 2.5.2
-Original file line number
+Diff line change
@@ Expand Up @@
     ```
     wget -O splunk-operator-namespace.yaml https://github.com/splunk/splunk-operator/releases/download/2.5.2/splunk-operator-namespace.yaml
     ```
 . (Optional) Review the file and update it with your specific customizations used during your install.
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -261,3 +261,4 @@ entries:
		- https://splunk.github.io/splunk-operator/splunk-operator-1.0.0.tgz
		version: 1.0.0
		generated: "2024-02-29T11:04:35.08619-08:00"