Repository navigation
CSPL-3964: Upgrade operator sdk to 1.41.1 and Golang version to 1.24.4 - #1574
gabrielm-splunk wants to merge 13 commits into
Conversation
|
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 |
Pull Request Test Coverage Report for Build 19141739219Details
💛 - Coveralls |
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 |
|
https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.40.0/:
https://sdk.operatorframework.io/docs/upgrading-sdk-version/v1.41.0/ |
| - develop | ||
| - main | ||
| - feature** | ||
| - CSPL-3964-upgrade-operator-sdk |
There was a problem hiding this comment.
Please remember to remove it before merge.
@kasiakoziol Yeah, I missed some of these. I was looking at a wrong version of the upgrade-sdk-version doc, will address today |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
a4416d1 to
a572a7d
Compare
a572a7d to
cb364e3
Compare
cb364e3 to
48a17ca
Compare
There was a problem hiding this comment.
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 |
722fb07 to
42cfdc0
Compare
|
|
||
| // 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 { |
| 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) |
There was a problem hiding this comment.
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.
| return nil, fmt.Errorf("kubeClient is nil") | ||
| } | ||
|
|
||
| // Register controllers with the manager |
There was a problem hiding this comment.
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
|
@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 |
…s we currently have as we work through adding real e2e testing.
…orts were mistakenly included).
…changes as well as rebasing to develop.
93141e5 to
4d01194
Compare
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 tidyto resolve). This will help resolve security vulnerability: https://splunk.atlassian.net/browse/VULN-42799Key Changes
The main updates are in the
.envandDockerfileTesting 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