Skip to content

Promote Develop to main for Splunk Operator Release 3.1.0#1752

Closed
github-actions[bot] wants to merge 228 commits intomainfrom
promote-develop-to-main-3.1.0
Closed

Promote Develop to main for Splunk Operator Release 3.1.0#1752
github-actions[bot] wants to merge 228 commits intomainfrom
promote-develop-to-main-3.1.0

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Mar 6, 2026

Automated Pull Request To Merge Develop To Main For Release Version 3.1.0

kasiakoziol and others added 30 commits May 8, 2025 14:05
CSPL-3714 Merge main to develop to sync Changelog.md
…tion

CSPL-3704 #1474 Secret Management: SOK deletes automatically smartstore secrets created
…-idxc

Bugfix/CSPL-3705 #1493 Update of IDXC configMap volumes does not apply properly
Co-authored-by: Patryk Wasielewski <pwasiele@splunk.com>
* Updates for integration tests and documentation with latest ES version

* Update enterprise security versions and app files

* remove branch from inte test workflow
* add more automation to pre-release workflow

* update version and replaced version in bundle files

* update dockerfile sok version, not enterprise version

* fix typo
* split run-tests.sh into multiple files

* trigger integration tests on branch

* use scriptdir to run sh files

* remove trigger int test workflow

* test azure, gcp, and namespace scoped workflows

* cleanup workflows
#1509)

* add support for admin-managed-pv annotation

---------

Co-authored-by: Patryk Wasielewski <pwasiele@splunk.com>
…aviton

Removing App Framework Tests for C3 and M4 from ARM Pipelines
CSPL-3702 Fix script variables to use {} instead of ()
@github-actions
Copy link
Copy Markdown
Contributor Author

github-actions bot commented Mar 6, 2026

CLA Assistant Lite bot CLA Assistant Lite bot All contributors have signed the COC ✍️ ✅

@gabrielm-splunk gabrielm-splunk force-pushed the promote-develop-to-main-3.1.0 branch from 758875b to e7b8c97 Compare March 6, 2026 03:31
Copy link
Copy Markdown
Collaborator

@kasiakoziol kasiakoziol left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR requires resolving conflicts.

@patryk
Copy link
Copy Markdown

patryk commented Mar 6, 2026

Hi, the bot pinged me again.

@gabrielm-splunk gabrielm-splunk force-pushed the promote-develop-to-main-3.1.0 branch from e7b8c97 to c76e460 Compare March 7, 2026 03:00
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has been in main for 6 years, so I don't think this needs to stop our release

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should track it - please log a ticket and make sure we will address this in next sprint

@patrykw-splunk
Copy link
Copy Markdown
Collaborator

I have read the CLA Document and I hereby sign the CLA

Copy link
Copy Markdown
Collaborator

@patrykw-splunk patrykw-splunk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like too many commits are present in this PR

@gabrielm-splunk gabrielm-splunk force-pushed the promote-develop-to-main-3.1.0 branch from 116a073 to 4d85db6 Compare March 9, 2026 23:00
Remove duplicate imports that were causing vet failures:
- testutils in controller test files
- scheme, ctrl2 in controller_test.go
- server in testenv.go

* Ingestion and Indexing Separation
* Validation webhook implementation for improved CR validation
* Telemetry support for Splunk Operator
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would specify what kind of telemetry

* Properly process peers for Monitoring Console
* Update requeue timer from 1 day to 6 hours

#### Documentation
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Improve auto-generated GitHub page: add just-the-docs jeckyl theme and improve navigation

kubabuczak
kubabuczak previously approved these changes Mar 10, 2026
@kubabuczak kubabuczak dismissed their stale review March 10, 2026 09:45

Actually there are commits from last release

@gabrielm-splunk
Copy link
Copy Markdown
Collaborator

Closing this out, as we have decided to handle/fix:

  1. Author commits
  2. Merge conflicts
    In separate PR to develop. Now are promoting develop to main in a clean state

@github-actions github-actions bot locked and limited conversation to collaborators Mar 17, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.