CSPL-3964: Upgrading operator sdk.

Author: gabrielm-splunk

.env

@@ -1,5 +1,5 @@
-OPERATOR_SDK_VERSION=v1.39.0
-REVIEWERS=vivekr-splunk,rlieberman-splunk,patrykw-splunk,Igor-splunk,kasiakoziol,kubabuczak
+OPERATOR_SDK_VERSION=v1.42.0
+REVIEWERS=vivekr-splunk,rlieberman-splunk,patrykw-splunk,Igor-splunk,kasiakoziol,kubabuczak,gabrielm-splunk
 GO_VERSION=1.25.5
 AWSCLI_URL=https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.8.6.zip
 KUBECTL_VERSION=v1.29.1

.github/workflows/build-test-push-workflow.yml

@@ -64,6 +64,7 @@ jobs:
       SPLUNK_OPERATOR_IMAGE_NAME: splunk/splunk-operator
       ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
       S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
+      SPLUNK_GENERAL_TERMS: --accept-sgt-current-at-splunk-com
     steps:
     - name: Set up cosign
       uses: sigstore/cosign-installer@main
@@ -122,6 +123,7 @@ jobs:
       ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
       S3_REGION: ${{ secrets.AWS_DEFAULT_REGION }}
       IMAGE_NAME: ${{ secrets.ECR_REPOSITORY }}/splunk/splunk-operator:${{ github.sha }}
+      SPLUNK_GENERAL_TERMS: --accept-sgt-current-at-splunk-com
     steps:
     - name: Set up cosign
       uses: sigstore/cosign-installer@main
@@ -197,6 +199,7 @@ jobs:
       EKS_SSH_PUBLIC_KEY: ${{ secrets.EKS_SSH_PUBLIC_KEY }}
       CLUSTER_WIDE: "true"
       DEPLOYMENT_TYPE: ""
+      SPLUNK_GENERAL_TERMS: --accept-sgt-current-at-splunk-com
     steps:
       - name: Chekcout code
         uses: actions/checkout@v2

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

@@ -10,6 +10,7 @@ on:
       - develop
       - main
       - feature**
+      - CSPL-3964_Upgrade-operator-sdk
 jobs:
   build-operator-image:
     runs-on: ubuntu-latest

Makefile

@@ -59,7 +59,9 @@ BUNDLE_IMG ?= ${IMAGE_TAG_BASE}-bundle:v${VERSION}
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.34.0
+# Automatically derive the version from go.mod
+ENVTEST_VERSION := $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-%d.%d", $$2, $$3}')
+ENVTEST_K8S_VERSION := $(shell go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d", $$3}')
 
 ignore-not-found ?= True
 
@@ -135,7 +137,7 @@ scheck: ## Run static check against code
 vet: setup/ginkgo	 ## Run go vet against code.
 	go vet ./...
 
-test: manifests generate fmt vet envtest ## Run tests.
+test: manifests generate fmt vet setup-envtest ## Run tests.
 	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use ${ENVTEST_K8S_VERSION} --bin-dir $(LOCALBIN) -p path)" ginkgo --junit-report=unit_test.xml --output-dir=`pwd` -vv --trace --keep-going --timeout=3h --cover --covermode=count --coverprofile=coverage.out ./pkg/splunk/common ./pkg/splunk/enterprise ./pkg/splunk/client ./pkg/splunk/util ./internal/controller ./pkg/splunk/splkcontroller
 
 
@@ -241,6 +243,11 @@ envtest: $(ENVTEST) ## Download envtest-setup locally if necessary.
 $(ENVTEST): $(LOCALBIN)
 	test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
 
+.PHONY: setup-envtest
+setup-envtest: envtest ## Set up ENVTEST binaries for the correct version
+	@$(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path || { \
+	  echo "Error setting up envtest"; exit 1; }
+
 ## Generate bundle manifests and metadata, then validate generated files.
 ## In addition, copy the newly generated crd files to helm crds.
 .PHONY: bundle
@@ -272,7 +279,7 @@ ifeq (,$(shell which opm 2>/dev/null))
 	set -e ;\
 	mkdir -p $(dir $(OPM)) ;\
 	OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \
-	curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.24.2/$${OS}-$${ARCH}-opm ;\
+	curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.55.0/$${OS}-$${ARCH}-opm ;\
 	chmod +x $(OPM) ;\
 	}
 else

bundle/manifests/enterprise.splunk.com_clustermanagers.yaml

@@ -6,6 +6,7 @@ metadata:
   creationTimestamp: null
   labels:
     name: splunk-operator
+    app.kubernetes.io/name: splunk-operator
   name: clustermanagers.enterprise.splunk.com
 spec:
   group: enterprise.splunk.com

bundle/manifests/enterprise.splunk.com_clustermasters.yaml

@@ -6,6 +6,7 @@ metadata:
   creationTimestamp: null
   labels:
     name: splunk-operator
+    app.kubernetes.io/name: splunk-operator
   name: clustermasters.enterprise.splunk.com
 spec:
   group: enterprise.splunk.com

bundle/manifests/enterprise.splunk.com_indexerclusters.yaml

@@ -6,6 +6,7 @@ metadata:
   creationTimestamp: null
   labels:
     name: splunk-operator
+    app.kubernetes.io/name: splunk-operator
   name: indexerclusters.enterprise.splunk.com
 spec:
   group: enterprise.splunk.com

bundle/manifests/enterprise.splunk.com_licensemanagers.yaml

@@ -6,6 +6,7 @@ metadata:
   creationTimestamp: null
   labels:
     name: splunk-operator
+    app.kubernetes.io/name: splunk-operator
   name: licensemanagers.enterprise.splunk.com
 spec:
   group: enterprise.splunk.com

bundle/manifests/enterprise.splunk.com_licensemasters.yaml

@@ -6,6 +6,7 @@ metadata:
   creationTimestamp: null
   labels:
     name: splunk-operator
+    app.kubernetes.io/name: splunk-operator
   name: licensemasters.enterprise.splunk.com
 spec:
   group: enterprise.splunk.com

bundle/manifests/enterprise.splunk.com_monitoringconsoles.yaml

@@ -6,6 +6,7 @@ metadata:
   creationTimestamp: null
   labels:
     name: splunk-operator
+    app.kubernetes.io/name: splunk-operator
   name: monitoringconsoles.enterprise.splunk.com
 spec:
   group: enterprise.splunk.com