Skip to content

sync: merge main into develop#1841

Merged
vivekr-splunk merged 6 commits intodevelopfrom
merge/main-into-develop-20260410
Apr 10, 2026
Merged

sync: merge main into develop#1841
vivekr-splunk merged 6 commits intodevelopfrom
merge/main-into-develop-20260410

Conversation

@vivekr-splunk
Copy link
Copy Markdown
Collaborator

Summary

Why

Develop is currently missing the intake workflow files under tools/github-intake and does not yet have the app download dir fix. Rather than carrying two separate backport PRs, this keeps main and develop aligned with one merge.

Validation

  • local merge of origin/main into origin/develop applied cleanly
  • bash -n passed for tools/github-intake/issue-intake.sh
  • bash -n passed for tools/github-intake/pr-intake.sh
  • bash -n passed for tools/github-intake/lib/intake-common.sh
  • GOCACHE=/tmp/go-build go test ./pkg/splunk/enterprise -run TestCreateAppDownloadDir -count=1

Supersedes

gabrielm-splunk and others added 6 commits March 19, 2026 21:03
Promote Develop to main for Splunk Operator Release 3.1.0
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…10.2

Update Splunk Enterprise version to 10.2.0
* fix: handle app download dir stat errors

* cleanup createAppDownloadDir review feedback
* migration: add GitHub intake workflows for GitLab handoff

* intake: move GitHub intake scripts under tools

* intake: preserve script modes after move
}

// createAppDownloadDir creates the app download directory on the operator pod
func createAppDownloadDir(ctx context.Context, path string) error {
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.

Is this change expected? Just want to make sure we aren't overwriting changes that we made in develop

}

err = createAppDownloadDir(ctx, "/xyzzz.txt")
blockerFile, err := os.CreateTemp(t.TempDir(), "app-download-dir-blocker")
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.

Same here

Copy link
Copy Markdown
Collaborator

@gabrielm-splunk gabrielm-splunk left a comment

Choose a reason for hiding this comment

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

If changes specified are expected, LGTM

@vivekr-splunk
Copy link
Copy Markdown
Collaborator Author

without merging this to main, test will not succeed , merging this now

@vivekr-splunk vivekr-splunk merged commit 650b2bf into develop Apr 10, 2026
16 of 17 checks passed
@vivekr-splunk vivekr-splunk deleted the merge/main-into-develop-20260410 branch April 10, 2026 20:07
@github-actions github-actions bot locked and limited conversation to collaborators Apr 10, 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.

3 participants