CSPL-3675 Update Operator-SDK to v1.39 #1488

Igor-splunk · 2025-04-14T08:58:16Z

v1.33 migration
v1.34 migration
v1.36 migration
v1.38 migration
v1.39 migration

Changes related to the OperatorSDK upgrade:

Perform upgrade from OperatorSDK v1.31.0 to v1.39
Adjust Operator structure (folders, file names etc)
Update Golang version from 1.23.0 to 1.24.2
Reimplement deprecated functionspredicate.GenerationChangedPredicate{} and predicate.AnnotationChangedPredicate{}, for predicate

Other changes

Fix SPLUNK_ENTERPRISE_IMAGE var value
Fix tests' stability

coveralls · 2025-04-14T09:06:10Z

Pull Request Test Coverage Report for Build 15969470039

Details

238 of 242 (98.35%) changed or added relevant lines in 13 files are covered.
1 unchanged line in 1 file lost coverage.
Overall coverage increased (+0.07%) to 86.711%

Changes Missing Coverage	Covered Lines	Changed/Added Lines	%
pkg/splunk/enterprise/upgrade.go	0	4	0.0%

Files with Coverage Reduction	New Missed Lines	%
pkg/splunk/enterprise/afwscheduler.go	1	92.96%

Totals
Change from base Build 15887396749:	0.07%
Covered Lines:	10629
Relevant Lines:	12258

💛 - Coveralls

…L-3675-operator-sdk # Conflicts: # .biased_lang_exclude

# Conflicts: # .env # go.mod

internal/controller/suite_test.go

rlieberman-splunk · 2025-04-24T15:27:42Z

cmd/main.go

@@ -123,56 +125,56 @@ func main() {
 		os.Exit(1)
 	}

-	if err = (&controllers.ClusterMasterReconciler{
+	if err = (&controller2.ClusterMasterReconciler{


Change this to splunk-controller instead.

internal/controller/clustermanager_controller.go

rlieberman-splunk · 2025-04-24T15:35:34Z

pkg/splunk/controller/controller.go

+	err = ctrl.Watch(
+		source.Kind(mgr.GetCache(), instance, &handler.TypedEnqueueRequestForObject[splcommon.MetaObject]{}),
+	)
+	//err = ctrl.Watch(&source.Kind{Type: instance}, &handler.EnqueueRequestForObject{})


Remove commented line if not needed.

.biased_lang_exclude

kasiakoziol · 2025-06-17T10:15:18Z

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

@@ -5,6 +5,7 @@ on:
      - develop
      - main
      - feature**
+      - CSPL-3675-operator-sdk


Please remember to remove it once verified.

cmd/main.go

kasiakoziol · 2025-06-17T10:31:20Z

internal/controller/clustermaster_controller.go

+			handler.EnqueueRequestForOwner(
+				mgr.GetScheme(),
+				mgr.GetRESTMapper(),
+				&appsv1.StatefulSet{},


Should we include handler.OnlyControllerOwner() here and below?

This one im not sure about 100% @vivekr-splunk Could You take a look?

Removed for now but if we want to split the operator in the future we should probably take a look at that

kasiakoziol · 2025-06-17T10:33:51Z

internal/controller/common/predicate.go

+			return !e.DeleteStateUnknown
+		},
+	}
+	return err


We can directly return without declaring a var err, Same below.

kasiakoziol · 2025-06-17T10:34:52Z

internal/controller/common/predicate.go

-			if !stringInSlice(newObj.Name, []string{"clustermasters.enterprise.splunk.com",
+			// Process only specific CRD names
+			if !stringInSlice(newObj.Name, []string{
+				"clustermasters.enterprise.splunk.com",


What about clustermanagers?

It wasn't there before, should it even be there? @vivekr-splunk

kasiakoziol

Please remove branch from integ tests pipeline on merge

Copilot

Pull Request Overview

This PR upgrades the Operator SDK to v1.39 and updates related APIs, generated code, and CRDs to match new SDK requirements.

Update RESTClientForGVK calls to include an http.Client parameter
Replace deprecated MetricsBindAddress with the new server.Options API
Switch from ResourceRequirements to VolumeResourceRequirements for PVCs (requires verification)
Rename the controller package imports to splkcontroller across code and tests
Bump go.mod and regenerate CRDs with x-kubernetes-list-type: atomic and additional fields

Reviewed Changes

Copilot reviewed 91 out of 98 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
test/testenv/verificationutils.go	Added stabilization sleep and `StabilizationDuration` constant (missing import)
test/testenv/util.go	Introduced `DumpGetSecrets` and changed PVC resources type
pkg/splunk/enterprise/configuration.go	Changed PVC resources type
test/testenv/testenv.go	Updated manager `Metrics` options
go.mod	Bumped Go version and updated SDK and dependency versions

Comments suppressed due to low confidence (4)

test/testenv/util.go:740

[nitpick] The comment says "list of pods" but this function is fetching secrets. Update the comment to accurately describe that it lists secrets.

// DumpGetSecrets prints and returns list of pods in the namespace

test/testenv/verificationutils.go:36

The time package is not imported, causing a compile error. Add import "time" at the top of the file.

var StabilizationDuration = time.Second * 20

test/testenv/util.go:527

There is no corev1.VolumeResourceRequirements type in Kubernetes API; it should remain corev1.ResourceRequirements to define PVC resource requests.

			Resources: corev1.VolumeResourceRequirements{

pkg/splunk/enterprise/configuration.go:142

Incorrect use of corev1.VolumeResourceRequirements—this type does not exist. Use corev1.ResourceRequirements for PVC specs.

				Resources: corev1.VolumeResourceRequirements{

Copilot · 2025-06-27T10:57:30Z

test/testenv/util.go

+
+	output, err := exec.Command("kubectl", "get", "secrets", "-n", ns).Output()
+	if err != nil {
+		return nil


Returning nil on error may lead to nil-slice operations downstream. Consider returning an empty slice or logging the error before returning.

Suggested change

return nil

logf.Log.Error(err, "Failed to execute command", "command", "kubectl get secrets -n "+ns)

return []string{}

patrykw-splunk

LGTM!

igor.grzankowski added 3 commits April 14, 2025 10:46

v1.33 migration

a963e2e

Upgrade bias language excl

3690262

Upgrade bias language excl

9a33b9b

igor.grzankowski added 8 commits April 14, 2025 11:06

Merge remote-tracking branch 'origin/CSPL-3675-operator-sdk' into CSP…

6810b82

…L-3675-operator-sdk # Conflicts: # .biased_lang_exclude

v.1.34.0 migration

452fc63

v.1.34.0 migration

d15891c

fix docker-buildx

9943654

fix docker-buildx

3029bbe

fix docker-buildx

a175dce

v 1.3.6 migration

0f32b96

v 1.3.8 migration

10bbfad

Igor-splunk changed the title ~~Draft:CSPL-3675~~ Draft:CSPL-3675 Update Operator-SDK to v1.39 Apr 15, 2025

igor.grzankowski added 2 commits April 16, 2025 14:31

v 1.3.9 migration

04e2782

Merge branch 'develop' into CSPL-3675-operator-sdk

c0adb8b

# Conflicts: # .env # go.mod

patrykw-splunk reviewed Apr 17, 2025

View reviewed changes

internal/controller/suite_test.go Show resolved Hide resolved

igor.grzankowski added 6 commits April 22, 2025 14:44

Update controller.go

2b73278

Update ns watching

787eb60

Update ns watching

b71204f

fix tests

fababeb

fix tests

281162a

fix test

c222936

rlieberman-splunk reviewed Apr 24, 2025

View reviewed changes

vivekr-splunk assigned Igor-splunk Apr 24, 2025

Vivek Reddy and others added 6 commits April 29, 2025 15:42

fixed test cases fo rfake client

98c8396

fixed test cases

24244ab

fixed v3 test cases

559f255

fixed test cases

2249a5f

upgrade operator crd

7fe764c

use WithAuthenticationAndAuthorization filter provider

68470f3

kasiakoziol reviewed Jun 17, 2025

View reviewed changes

Apply review suggestions

2e37489

Igor-splunk changed the title ~~Draft:CSPL-3675 Update Operator-SDK to v1.39~~ CSPL-3675 Update Operator-SDK to v1.39 Jun 17, 2025

igor.grzankowski added 3 commits June 17, 2025 15:36

Remove onlycontrollerowner

9e7b92e

Remove comment

2f1c1b4

rename to intController

4653468

Igor-splunk requested review from vivekr-splunk, rlieberman-splunk, kasiakoziol and patrykw-splunk June 23, 2025 10:55

kasiakoziol approved these changes Jun 23, 2025

View reviewed changes

test

aabe029

kasiakoziol force-pushed the CSPL-3675-operator-sdk branch from 2a20504 to aabe029 Compare June 25, 2025 09:16

Patryk Wasielewski and others added 3 commits June 25, 2025 14:28

Add debug logs for appframeworksS1 test

6512b4f

test

b2d444a

test

6547244

kasiakoziol force-pushed the CSPL-3675-operator-sdk branch from e813abe to 6547244 Compare June 26, 2025 14:20

kasiakoziol added 4 commits June 26, 2025 16:31

test

0669f68

test

ca7997e

test

dbc490e

fix

e245363

kasiakoziol requested a review from Copilot June 27, 2025 10:55

Copilot AI reviewed Jun 27, 2025

View reviewed changes

kasiakoziol added 2 commits June 27, 2025 13:26

test owner type in controller

e3b4312

cleanup

4a61c5d

rlieberman-splunk approved these changes Jun 27, 2025

View reviewed changes

patrykw-splunk approved these changes Jun 27, 2025

View reviewed changes

Remove branch form int testing

c762723

Igor-splunk merged commit 6c4484d into develop Jun 30, 2025
27 checks passed

Igor-splunk deleted the CSPL-3675-operator-sdk branch June 30, 2025 12:35

	return nil
	logf.Log.Error(err, "Failed to execute command", "command", "kubectl get secrets -n "+ns)
	return []string{}

CSPL-3675 Update Operator-SDK to v1.39 #1488

CSPL-3675 Update Operator-SDK to v1.39 #1488

Uh oh!

Conversation

Igor-splunk commented Apr 14, 2025 • edited by patrykw-splunk Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

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

Uh oh!

Pull Request Test Coverage Report for Build 15969470039

Details

💛 - Coveralls

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kasiakoziol left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Copilot AI Jun 27, 2025

Choose a reason for hiding this comment

Uh oh!

patrykw-splunk left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Igor-splunk commented Apr 14, 2025 •

edited by patrykw-splunk

Loading

coveralls commented Apr 14, 2025 •

edited

Loading