CSPL-3964: Upgrade operator sdk to 1.41.1 and Golang version to 1.24.4 #1574

gabrielm-splunk · 2025-09-10T17:26:17Z

Description

Upgrading operator-sdk to version 1.41.1 and Golang version to 1.24.4. There were some linting changes that trickled through, but were very minor, so just decided to leave in. Thankfully, there weren't any breaking changes, so this was pretty straightforward other than some go mod changes (ran go mod tidy to resolve). This will help resolve security vulnerability: https://splunk.atlassian.net/browse/VULN-42799

Key Changes

The main updates are in the .env and Dockerfile

Testing and Verification

Ran operator locally, installed operator on EKS cluster, and ran unit tests. Added this branch to be picked up by integration testing, so will monitor outputs of that.

Related Issues

PR Checklist

Code changes adhere to the project's coding standards.
Relevant unit and integration tests are included.
Documentation has been updated accordingly.
All tests pass locally.
The PR description follows the project's guidelines.

gabrielm-splunk · 2025-09-10T17:36:55Z

I see the check for biased language is failing here, any insights on how to solve? There were very minimal changes and the only change that's included that has the biased word master is in the deps for Masterminds

coveralls · 2025-09-10T17:37:53Z

Pull Request Test Coverage Report for Build 19141739219

Details

8 of 8 (100.0%) changed or added relevant lines in 8 files are covered.
No unchanged relevant lines lost coverage.
Overall coverage increased (+0.009%) to 86.561%

Totals
Change from base Build 19137368717:	0.009%
Covered Lines:	10718
Relevant Lines:	12382

💛 - Coveralls

rlieberman-splunk · 2025-09-10T18:35:20Z

I see the check for biased language is failing here, any insights on how to solve? There were very minimal changes and the only change that's included that has the biased word master is in the deps for Masterminds

We can add the go.mod file to https://github.com/splunk/splunk-operator/blob/main/.biased_lang_exclude. go.sum is already excluded. There's more information here if you need it too! https://github.com/splunk/biased-lang-linter/pkgs/container/biased_lang#excluding-directories-and-files

gabrielm-splunk · 2025-09-11T00:28:17Z

I see the check for biased language is failing here, any insights on how to solve? There were very minimal changes and the only change that's included that has the biased word master is in the deps for Masterminds

We can add the go.mod file to https://github.com/splunk/splunk-operator/blob/main/.biased_lang_exclude. go.sum is already excluded. There's more information here if you need it too! https://github.com/splunk/biased-lang-linter/pkgs/container/biased_lang#excluding-directories-and-files

Got it, done @rlieberman-splunk

kasiakoziol · 2025-09-11T06:19:13Z

https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.40.0/:

https://github.com/splunk/splunk-operator/blob/main/Makefile#L256 - Upgrade guide suggest using 1.55.0.
What about other things from this upgrade doc?

https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.41.0/

splunk-operator/Makefile

Line 207 in fb134af

CONTROLLER_TOOLS_VERSION ?= v0.16.1
splunk-operator/go.mod

Line 29 in fb134af

sigs.k8s.io/controller-runtime v0.14.5

kasiakoziol · 2025-09-11T06:11:09Z

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

      - develop
      - main
      - feature**
+      - CSPL-3964-upgrade-operator-sdk


Please remember to remove it before merge.

gabrielm-splunk · 2025-09-11T16:32:09Z

https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.40.0/:

https://github.com/splunk/splunk-operator/blob/main/Makefile#L256 - Upgrade guide suggest using 1.55.0.

What about other things from this upgrade doc?

https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.41.0/

splunk-operator/Makefile

Line 207 in fb134af

CONTROLLER_TOOLS_VERSION ?= v0.16.1

splunk-operator/go.mod

Line 29 in fb134af

sigs.k8s.io/controller-runtime v0.14.5

@kasiakoziol Yeah, I missed some of these. I was looking at a wrong version of the upgrade-sdk-version doc, will address today

.github/workflows/lint.yml

.github/workflows/test-e2e.yml

.github/workflows/test.yml

.github/workflows/test-e2e.yml

.github/workflows/lint.yml

.env

.github/workflows/test-e2e.yml

.github/workflows/test.yml

Makefile

.devcontainer/post-install.sh

.github/workflows/test-e2e.yml

.github/workflows/test.yml

config/certmanager/certificate-metrics.yaml

config/certmanager/certificate-webhook.yaml

config/certmanager/issuer.yaml

config/certmanager/certificate-webhook.yaml

config/certmanager/certificate-metrics.yaml

test/secret/manager_secret_s1_test.go

patrykw-splunk

Open question, does this MR should include certificate watcher changes?
I'm also wondering if Cert-manager specific resources from the upgrade guide should be included here.

Here is a reference
https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.40.0/

gabrielm-splunk · 2025-10-13T16:01:50Z

Open question, does this MR should include certificate watcher changes? I'm also wondering if Cert-manager specific resources from the upgrade guide should be included here.

Here is a reference https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.40.0/

We discussed this offline and determined that we will handle cert-manager-specific changes in a follow-up PR

gabrielm-splunk · 2025-10-29T14:31:15Z

test/appframework_aws/s1/appframework_aws_suite_test.go

+
+	// Override script locations to use absolute paths for integration tests
+	// These are relative to test/appframework_aws/s1/, so we go up 3 levels to project root
+	enterprise.GetReadinessScriptLocation = func() string {


Although not fully ideal, I saw precedent for doing this for examples here and here so felt more comfortable with this (test was failing trying to run these scripts prior to this)

gabrielm-splunk · 2025-10-29T14:37:34Z

test/testenv/s3utils.go

-		untarredAppRootFolder := string(bytepath)
-		untarredAppRootFolder = untarredAppRootFolder[:len(untarredAppRootFolder)-1] //removing \n at the end of folder path
+		// Use filepath.ReadDir to reliably get the first directory
+		entries, err := os.ReadDir(untarredCurrentAppFolder)


Description on why these changes were necessary:

Sometimes the wildcard parsing here would cause us to not be able to properly pick up the first directory, causing the disabled app changes to not be processed sometimes. This change uses Go idiomatic way to do the same thing in a more reliable way.

gabrielm-splunk · 2025-10-29T14:38:39Z

test/testenv/testenv.go

 		return nil, fmt.Errorf("kubeClient is nil")
 	}

+	// Register controllers with the manager


Not 100% sure why this is now necessary since the upgrade, but the Monitoring Console would hang while waiting to become ready without this "manual" controller registration

kasiakoziol · 2025-10-29T15:02:59Z

@gabrielm-splunk If you want to upgrade to 1.34, you have to pull my changes from develop because that's not only a one line change.

gabrielm-splunk · 2025-10-29T23:01:31Z

@gabrielm-splunk If you want to upgrade to 1.34, you have to pull my changes from develop because that's not only a one line change.

@kasiakoziol I did rebase off of develop, so it does contain those changes, unless you pushed within the last couple of hours

…ge check

…o 1.41.1.

…s we currently have as we work through adding real e2e testing.

… now.

…orts were mistakenly included).

…changes as well as rebasing to develop.

gabrielm-splunk requested review from Igor-splunk, kasiakoziol, patrykw-splunk, rlieberman-splunk and vivekr-splunk September 10, 2025 17:32

kasiakoziol reviewed Sep 11, 2025

View reviewed changes

github-advanced-security bot found potential problems Sep 15, 2025

View reviewed changes

.github/workflows/lint.yml Fixed Show fixed Hide fixed

.github/workflows/test-e2e.yml Fixed Show fixed Hide fixed

.github/workflows/test.yml Fixed Show fixed Hide fixed

github-advanced-security bot found potential problems Sep 15, 2025

View reviewed changes

.github/workflows/test-e2e.yml Fixed Show fixed Hide fixed

github-advanced-security bot found potential problems Sep 15, 2025

View reviewed changes

.github/workflows/lint.yml Fixed Show fixed Hide fixed

kubabuczak reviewed Sep 18, 2025

View reviewed changes

.env Outdated Show resolved Hide resolved

gabrielm-splunk force-pushed the CSPL-3964-upgrade-operator-sdk branch from a4416d1 to a572a7d Compare September 25, 2025 07:38

rlieberman-splunk approved these changes Sep 25, 2025

View reviewed changes

kasiakoziol reviewed Sep 26, 2025

View reviewed changes

.github/workflows/test-e2e.yml Outdated Show resolved Hide resolved

.github/workflows/test.yml Outdated Show resolved Hide resolved

Makefile Outdated Show resolved Hide resolved

gabrielm-splunk force-pushed the CSPL-3964-upgrade-operator-sdk branch from a572a7d to cb364e3 Compare October 1, 2025 06:13

patrykw-splunk reviewed Oct 1, 2025

View reviewed changes

gabrielm-splunk force-pushed the CSPL-3964-upgrade-operator-sdk branch from cb364e3 to 48a17ca Compare October 10, 2025 07:33

patrykw-splunk reviewed Oct 10, 2025

View reviewed changes

test/secret/manager_secret_s1_test.go Show resolved Hide resolved

patrykw-splunk reviewed Oct 10, 2025

View reviewed changes

gabrielm-splunk force-pushed the CSPL-3964-upgrade-operator-sdk branch from 722fb07 to 42cfdc0 Compare October 29, 2025 14:17

gabrielm-splunk commented Oct 29, 2025

View reviewed changes

gabrielm-splunk added 13 commits November 6, 2025 10:53

CSPL-2964: Upgrading operator sdk to 1.41.1 and golang version to 1.24.4

98983cf

CSPL-3964: Adding go.mod to .biased_lang_exclude due to biased langua…

9567c9b

…ge check

CSPL-3964: Apply changes from operator-sdk upgrade docs for upgrade t…

d86307a

…o 1.41.1.

CSPL-3964: Temporarily fixing e2e make targets to just run test suite…

7cfb8ec

…s we currently have as we work through adding real e2e testing.

CSPL-3964: Updating golangci-lint-action version.

8b626d1

CSPL-3964: Removing linting from operator-sdk and golang upgrade, for…

de29cfe

… now.

CSPL-3964: Adding perms suggested for workflow.

3f90659

CSPL-3964: Removing some unused config stuff.

4bee5f9

CSPL-3964: Removing some (seemingly) unecessary stuff.

c27baac

CSPL-3964: Reverting changes to test dir (where GoLand re-ordered imp…

679d30d

…orts were mistakenly included).

CSPL-3964: Fixing smoke test failures caused by operator-sdk upgrade …

ae1cb14

…changes as well as rebasing to develop.

CSPL-3964: Updating K8s version in .env to proper value.

a59f388

CSPL-3964: Fixing failing tests from previous failed run.

4d01194

gabrielm-splunk force-pushed the CSPL-3964-upgrade-operator-sdk branch from 93141e5 to 4d01194 Compare November 6, 2025 15:59

gabrielm-splunk closed this Nov 19, 2025

CSPL-3964: Upgrade operator sdk to 1.41.1 and Golang version to 1.24.4 #1574

CSPL-3964: Upgrade operator sdk to 1.41.1 and Golang version to 1.24.4 #1574

Uh oh!

Conversation

gabrielm-splunk commented Sep 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Key Changes

Testing and Verification

Related Issues

PR Checklist

Uh oh!

gabrielm-splunk commented Sep 10, 2025

Uh oh!

coveralls commented Sep 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request Test Coverage Report for Build 19141739219

Details

💛 - Coveralls

Uh oh!

rlieberman-splunk commented Sep 10, 2025

Uh oh!

gabrielm-splunk commented Sep 11, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kasiakoziol commented Sep 11, 2025

Uh oh!

kasiakoziol Sep 11, 2025

Choose a reason for hiding this comment

Uh oh!

gabrielm-splunk commented Sep 11, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

patrykw-splunk left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

gabrielm-splunk commented Oct 13, 2025

Uh oh!

gabrielm-splunk Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

gabrielm-splunk Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

gabrielm-splunk Oct 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kasiakoziol commented Oct 29, 2025

Uh oh!

gabrielm-splunk commented Oct 29, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

gabrielm-splunk commented Sep 10, 2025 •

edited

Loading

coveralls commented Sep 10, 2025 •

edited

Loading

gabrielm-splunk commented Sep 11, 2025 •

edited

Loading

patrykw-splunk left a comment •

edited

Loading

gabrielm-splunk Oct 29, 2025 •

edited

Loading