Skip to content

Commit b2c69b1

Browse files
authored
Merge pull request #1497 from splunk/promote-develop-to-main-2.8.0
Promote Develop to main for Splunk Operator Release 2.8.0
2 parents ada76d5 + 510e771 commit b2c69b1

File tree

68 files changed

+750
-402
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

+750
-402
lines changed

.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
OPERATOR_SDK_VERSION=v1.31.0
2-
REVIEWERS=vivekr-splunk,akondur
2+
REVIEWERS=vivekr-splunk,rlieberman-splunk,patrykw-splunk,Igor-splunk,kasiakoziol
33
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
@@ -8,4 +8,4 @@ EKSCTL_VERSION=v0.191.0
88
EKS_CLUSTER_K8_VERSION=1.31
99
EKS_INSTANCE_TYPE=m5.2xlarge
1010
EKS_INSTANCE_TYPE_ARM64=c6g.4xlarge
11-
SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:9.4.0
11+
SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:9.4.1

.github/ISSUE_TEMPLATE/app-framework.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ description: File any requests related to app framework under this template
33
title: "App Framework: "
44
labels:
55
- app framework
6-
assignees:
7-
- gaurav-splunk
8-
- jryb
9-
- sgontla
106

117
body:
128
- type: dropdown

.github/ISSUE_TEMPLATE/generic.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
name: Generic
22
description: File generic requests under this template(use only if the issue does not match any of the other templates)
33
title: "Splunk Operator: "
4-
assignees:
5-
- jryb
6-
- kumarajeet
7-
- vivekr-splunk
84

95
body:
106
- type: dropdown

.github/ISSUE_TEMPLATE/ingress.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ description: File any requests related to ingestion under this template
33
title: "Ingestion: "
44
labels:
55
- ingestion
6-
assignees:
7-
- vebken-splunk
8-
- mgaldino-splunk
9-
- vivekr-splunk
106

117
body:
128
- type: dropdown

.github/ISSUE_TEMPLATE/monitoring-console.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ description: File any requests related to monitoring console under this template
33
title: "Monitoring Console: "
44
labels:
55
- monitoring console
6-
assignees:
7-
- kashok-splunk
86

97
body:
108
- type: dropdown

.github/ISSUE_TEMPLATE/secret-management.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ description: File any issues related to secret management under this template
33
title: "Secret Management: "
44
labels:
55
- secrets
6-
assignees:
7-
- akondur
86

97
body:
108
- type: dropdown

.github/ISSUE_TEMPLATE/smartstore.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ description: File any issues related to smart store under this template
33
title: "Smartstore: "
44
labels:
55
- smartstore
6-
assignees:
7-
- gaurav-splunk
8-
- sgontla
9-
- vivekr-splunk
106

117
body:
128
- type: dropdown

.github/pull_request_template.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
### Description
2+
3+
_What does this PR have in it?_
4+
5+
### Key Changes
6+
7+
_Highlight the updates in specific files_
8+
9+
### Testing and Verification
10+
11+
_How did you test these changes? What automated tests are added?_
12+
13+
### Related Issues
14+
15+
_Jira tickets, GitHub issues, Support tickets..._
16+
17+
### PR Checklist
18+
19+
- [ ] Code changes adhere to the project's coding standards.
20+
- [ ] Relevant unit and integration tests are included.
21+
- [ ] Documentation has been updated accordingly.
22+
- [ ] All tests pass locally.
23+
- [ ] The PR description follows the project's guidelines.

.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml

Lines changed: 2 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: Arm AL2023 Smoke Test WorkFlow
22
on:
3-
push:
4-
branches:
5-
- develop
6-
- main
3+
workflow_dispatch:
74
jobs:
85
check-formating:
96
runs-on: ubuntu-latest
@@ -104,60 +101,8 @@ jobs:
104101
env:
105102
COSIGN_PRIVATE_KEY: ${{ secrets.COSIGN_PRIVATE_KEY }}
106103
COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
107-
vulnerability-scan:
108-
permissions:
109-
actions: read
110-
contents: read
111-
security-events: write
112-
runs-on: ubuntu-latest
113-
needs: build-operator-image-arm-al2023
114-
env:
115-
SPLUNK_ENTERPRISE_IMAGE: ${{ secrets.SPLUNK_ENTERPRISE_IMAGE }}
116-
SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
117-
ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
118-
S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
119-
IMAGE_NAME: ${{ secrets.ECR_REPOSITORY }}/splunk/splunk-operator:${{ github.sha }}
120-
steps:
121-
- name: Set up cosign
122-
uses: sigstore/cosign-installer@main
123-
- uses: actions/checkout@v2
124-
- name: Dotenv Action
125-
id: dotenv
126-
uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
127-
- name: Set up Docker Buildx
128-
uses: docker/[email protected]
129-
- name: Configure AWS credentials
130-
uses: aws-actions/configure-aws-credentials@v1
131-
with:
132-
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
133-
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
134-
aws-region: ${{ secrets.AWS_DEFAULT_REGION }}
135-
136-
- name: Login to Amazon ECR
137-
uses: aws-actions/amazon-ecr-login@v1
138-
- name: Pull Splunk Operator Image Locally
139-
run: |
140-
docker pull ${{ env.IMAGE_NAME }}
141-
- name: Verify Signed Splunk Operator image
142-
run: |
143-
cosign verify --key env://COSIGN_PUBLIC_KEY ${{ env.IMAGE_NAME }}
144-
env:
145-
COSIGN_PUBLIC_KEY: ${{ secrets.COSIGN_PUBLIC_KEY }}
146-
- name: Run Trivy vulnerability scanner
147-
uses: aquasecurity/trivy-action@master
148-
with:
149-
image-ref: '${{ env.IMAGE_NAME }}'
150-
format: sarif
151-
#exit-code: 1
152-
severity: 'CRITICAL'
153-
ignore-unfixed: true
154-
output: 'trivy-results.sarif'
155-
- name: Upload Trivy scan results to GitHub Security tab
156-
uses: github/codeql-action/upload-sarif@v3
157-
with:
158-
sarif_file: 'trivy-results.sarif'
159104
smoke-tests-arm-al2023:
160-
needs: vulnerability-scan
105+
needs: build-operator-image-arm-al2023
161106
strategy:
162107
fail-fast: false
163108
matrix:

.github/workflows/arm-AL2023-int-test-workflow.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
name: Arm AL2023 Integration Test WorkFlow
22
on:
3-
push:
4-
branches:
5-
- develop
6-
- main
3+
workflow_dispatch:
74
jobs:
85
build-operator-image-arm-al2023:
96
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)