Skip to content

Commit 7958a08

Browse files
akondurakondur
authored
Merge pull request #1380 from splunk/promote-develop-to-main-2.6.1
Promote Develop to main for Splunk Operator Release 2.6.1
2 parents b93b674 + b41a338 commit 7958a08

File tree

68 files changed

+40945
-42226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+40945
-42226
lines changed

‎.env‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
OPERATOR_SDK_VERSION=v1.31.0
22
REVIEWERS=vivekr-splunk,akondur
3-
GO_VERSION=1.21.5
3+
GO_VERSION=1.23.0
44
AWSCLI_URL=https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.8.6.zip
55
KUBECTL_VERSION=v1.29.1
66
AZ_CLI_VERSION=2.30.0
77
EKSCTL_VERSION=v0.143.0
88
EKS_CLUSTER_K8_VERSION=1.27
9-
SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:9.2.2
9+
SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:9.3.0

‎.github/workflows/automated-release-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
make generate-artifacts IMG=splunk/splunk-operator:${{ github.event.inputs.release_version }} VERSION=${{ github.event.inputs.release_version }} SPLUNK_ENTERPRISE_IMAGE=splunk/splunk:${{ github.event.inputs.enterprise_version }}
6262
6363
- name: Upload Release Artifacts
64-
uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2
64+
uses: actions/upload-artifact@v4.4.0
6565
with:
6666
name: "release-artifacts-${{ github.event.inputs.release_version }}"
6767
path: "release-**"

‎.github/workflows/build-test-push-workflow.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Run Code Coverage
4242
run: goveralls -coverprofile=coverage.out -service=circle-ci -repotoken ${{ secrets.COVERALLS_TOKEN }}
4343
- name: Upload Coverage artifacts
44-
uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2
44+
uses: actions/upload-artifact@v4.4.0
4545
with:
4646
name: coverage.out
4747
path: coverage.out
@@ -87,12 +87,12 @@ jobs:
8787
- name: Login to Amazon ECR
8888
id: login-ecr
8989
uses: aws-actions/amazon-ecr-login@v1
90-
- name: Login to Redhat registry
91-
uses: docker/login-action@v3
92-
with:
93-
registry: registry.redhat.io
94-
username: ${{ secrets.REDHAT_REGISTRY_ID }}
95-
password: ${{ secrets.REDHAT_REGISTRY_PASSWORD }}
90+
#- name: Login to Redhat registry
91+
# uses: docker/login-action@v3
92+
# with:
93+
# registry: registry.redhat.io
94+
# username: ${{ secrets.REDHAT_REGISTRY_ID }}
95+
# password: ${{ secrets.REDHAT_REGISTRY_PASSWORD }}
9696
- name: Make Splunk Operator Image
9797
run: |
9898
make docker-build IMG=${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_OPERATOR_IMAGE_NAME }}:$GITHUB_SHA
@@ -295,7 +295,7 @@ jobs:
295295
find ./test -name "*.log" -exec cp {} /tmp/pod_logs \;
296296
- name: Archive Pod Logs
297297
if: ${{ always() }}
298-
uses: actions/upload-artifact@v2
298+
uses: actions/upload-artifact@v4.4.0
299299
with:
300300
name: "splunk-pods-logs--artifacts-${{ matrix.test }}"
301301
path: "/tmp/pod_logs/**"

‎.github/workflows/int-test-azure-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ jobs:
219219
find ./test -name "*.log" -exec cp {} /tmp/pod_logs \;
220220
- name: Archive Pod Logs
221221
if: ${{ always() }}
222-
uses: actions/upload-artifact@v2
222+
uses: actions/upload-artifact@v4.4.0
223223
with:
224224
name: "splunk-pods-logs--artifacts-appframeworkazure"
225225
path: "/tmp/pod_logs/**"

‎.github/workflows/int-test-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ jobs:
193193
find ./test -name "*.log" -exec cp {} /tmp/pod_logs \;
194194
- name: Archive Pod Logs
195195
if: ${{ always() }}
196-
uses: actions/upload-artifact@v2
196+
uses: actions/upload-artifact@v4.4.0
197197
with:
198198
name: "splunk-pods-logs--artifacts-${{ matrix.test }}"
199199
path: "/tmp/pod_logs/**"

‎.github/workflows/manual-int-test-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ jobs:
151151
find ./test -name "*.log" -exec cp {} /tmp/pod_logs \;
152152
- name: Archive Pod Logs
153153
if: ${{ always() }}
154-
uses: actions/upload-artifact@v2
154+
uses: actions/upload-artifact@v4.4.0
155155
with:
156156
name: "splunk-pods-logs--artifacts-${{ matrix.test }}"
157157
path: "/tmp/pod_logs/**"

‎.github/workflows/merge-develop-to-main-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
docker push splunk/splunk-operator-rc:${{ github.event.inputs.release_version }}-RC
102102
103103
- name: Upload Release Artifacts
104-
uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2
104+
uses: actions/upload-artifact@v4.4.0
105105
with:
106106
name: "release-artifacts-${{ github.event.inputs.release_version }}-RC"
107107
path: "release-**"

‎.github/workflows/namespace-scope-int-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
find ./test -name "*.log" -exec cp {} /tmp/pod_logs \;
149149
- name: Archive Pod Logs
150150
if: ${{ always() }}
151-
uses: actions/upload-artifact@v2
151+
uses: actions/upload-artifact@v4.4.0
152152
with:
153153
name: "splunk-pods-logs--artifacts-${{ matrix.test }}"
154154
path: "/tmp/pod_logs/**"

‎.github/workflows/nightly-int-test-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ jobs:
187187
find ./test -name "*.log" -exec cp {} /tmp/pod_logs \;
188188
- name: Archive Pod Logs if Failure in Smoke Test
189189
if: ${{ always() }}
190-
uses: actions/upload-artifact@82c141cc518b40d92cc801eee768e7aafc9c2fa2
190+
uses: actions/upload-artifact@v4.4.0
191191
with:
192192
name: "splunk-pods-logs--artifacts-${{ matrix.test }}"
193193
path: "/tmp/pod_logs/**"

‎.github/workflows/pre-release-workflow.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
7272
- name: Update Operator Image name in Helm
7373
if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
74-
uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
74+
uses: jacobtomlinson/gha-find-replace@v3
7575
with:
7676
find: "splunk-operator:${{ github.event.inputs.old_operator_version }}"
7777
replace: "splunk-operator:${{ github.event.inputs.new_operator_version }}"
@@ -80,25 +80,25 @@ jobs:
8080
8181
- name: Update Helm Version
8282
if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
83-
uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
83+
uses: jacobtomlinson/gha-find-replace@v3
8484
with:
85-
find: "version: ${{ github.event.inputs.old_operator_version }}"
86-
replace: "version: ${{ github.event.inputs.new_operator_version }}"
85+
find: "${{ github.event.inputs.old_operator_version }}"
86+
replace: "${{ github.event.inputs.new_operator_version }}"
8787
exclude: "ChangeLog.md"
88-
include: "Chart.yaml"
88+
include: "helm-chart/splunk-operator/**.yaml"
8989
9090
- name: Update Helm App Version
9191
if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
92-
uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
92+
uses: jacobtomlinson/gha-find-replace@v3
9393
with:
94-
find: "appVersion: ${{ github.event.inputs.old_operator_version }}"
95-
replace: "appVersion: ${{ github.event.inputs.new_operator_version }}"
94+
find: "${{ github.event.inputs.old_operator_version }}"
95+
replace: "${{ github.event.inputs.new_operator_version }}"
9696
exclude: "ChangeLog.md"
97-
include: "Chart.yaml"
97+
include: "helm-chart/splunk-enterprise/**.yaml"
9898
9999
- name: Update Operator Image name in DOCS
100100
if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
101-
uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
101+
uses: jacobtomlinson/gha-find-replace@v3
102102
with:
103103
find: "splunk-operator:${{ github.event.inputs.old_operator_version }}"
104104
replace: "splunk-operator:${{ github.event.inputs.new_operator_version }}"
@@ -107,7 +107,7 @@ jobs:
107107
108108
- name: Update Splunk Operator Install URL in DOCS
109109
if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
110-
uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
110+
uses: jacobtomlinson/gha-find-replace@v3
111111
with:
112112
find: "/download/${{ github.event.inputs.old_operator_version }}/splunk-operator"
113113
replace: "/download/${{ github.event.inputs.new_operator_version }}/splunk-operator"
@@ -116,7 +116,7 @@ jobs:
116116
117117
- name: Update Splunk Operator VERSION in DOCS
118118
if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
119-
uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
119+
uses: jacobtomlinson/gha-find-replace@v3
120120
with:
121121
find: "${{ github.event.inputs.old_operator_version }} or later"
122122
replace: "${{ github.event.inputs.new_operator_version }} or later"
@@ -125,7 +125,7 @@ jobs:
125125
126126
- name: Update Splunk Operator upgrade string in DOCS
127127
if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
128-
uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
128+
uses: jacobtomlinson/gha-find-replace@v3
129129
with:
130130
find: "Steps to upgrade from version greater than 1.0.5 to ${{ github.event.inputs.old_operator_version }}"
131131
replace: "Steps to upgrade from version greater than 1.0.5 to ${{ github.event.inputs.new_operator_version }}"
@@ -134,7 +134,7 @@ jobs:
134134
135135
- name: Update Splunk Operator Release URL in DOCS
136136
if: github.event.inputs.old_operator_version != github.event.inputs.new_operator_version
137-
uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
137+
uses: jacobtomlinson/gha-find-replace@v3
138138
with:
139139
find: "https://github.com/splunk/splunk-operator/releases/download/${{ github.event.inputs.old_operator_version }}/splunk-operator-install.yaml"
140140
replace: "https://github.com/splunk/splunk-operator/releases/download/${{ github.event.inputs.new_operator_version }}/splunk-operator-install.yaml"
@@ -143,30 +143,30 @@ jobs:
143143
144144
- name: Update Splunk Enterprise Image in operator.yaml
145145
if: github.event.inputs.old_enterprise_version != github.event.inputs.new_enterprise_version
146-
uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
146+
uses: jacobtomlinson/gha-find-replace@v3
147147
with:
148148
find: "${{ github.event.inputs.old_enterprise_version }}"
149149
replace: "${{ github.event.inputs.new_enterprise_version }}"
150150
include: "**operator.yaml"
151151
152152
- name: Update Splunk Enterprise Release Image in .env file
153-
uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
153+
uses: jacobtomlinson/gha-find-replace@v3
154154
with:
155155
find: "${{ github.event.inputs.old_enterprise_version }}"
156156
replace: "${{ github.event.inputs.new_enterprise_version }}"
157157
include: ".env"
158158
159159
- name: Update Splunk Enterprise Image in helm
160160
if: github.event.inputs.old_enterprise_version != github.event.inputs.new_enterprise_version
161-
uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
161+
uses: jacobtomlinson/gha-find-replace@v3
162162
with:
163163
find: "${{ github.event.inputs.old_enterprise_version }}"
164164
replace: "${{ github.event.inputs.new_enterprise_version }}"
165165
include: "**values.yaml"
166166
167167
- name: Update Splunk Enterprise image in DOCS
168168
if: github.event.inputs.old_enterprise_version != github.event.inputs.new_enterprise_version
169-
uses: jacobtomlinson/gha-find-replace@f485fdc3f67a6d87ae6e3d11e41f648c26d7aee3
169+
uses: jacobtomlinson/gha-find-replace@v3
170170
with:
171171
find: "${{ github.event.inputs.old_enterprise_version }} or later"
172172
replace: "${{ github.event.inputs.new_enterprise_version }} or later"

0 commit comments

Comments
 (0)