Skip to content

Commit bebafce

Browse files
authored
Merge pull request #1368 from splunk/release/2.6.1
Splunk Operator 2.6.1 release
2 parents 8222cd4 + cb50ad3 commit bebafce

File tree

50 files changed

+40741
-41675
lines changed

Some content is hidden

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

50 files changed

+40741
-41675
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/**"

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.21.1 as builder
2+
FROM golang:1.23.0 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

0 commit comments

Comments
 (0)