MLE-24871: Update Library Versions for Operator 1.1 Release

.golangci.yml

@@ -16,25 +16,28 @@ issues:
       linters:
         - dupl
         - lll
+    - path: "test/*"
+      linters:
+        - dupl
+        - errcheck
+        - goconst
+        - gocyclo
+        - lll
+        - unused
+    - path: "pkg/*"
+      linters:
+        - lll
+        - unparam
 linters:
   disable-all: true
   enable:
-    - dupl
     - errcheck
-    - exportloopref
-    - goconst
-    - gocyclo
     - gofmt
     - goimports
     - gosimple
     - govet
     - ineffassign
-    - lll
-    - misspell
-    - nakedret
-    - prealloc
     - staticcheck
     - typecheck
     - unconvert
-    - unparam
     - unused

Dockerfile

@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.23.6 AS builder
+FROM golang:1.24.9 AS builder
 ARG TARGETOS
 ARG TARGETARCH
 

Jenkinsfile

@@ -202,6 +202,14 @@ pipeline {
                                                              00 05 * * * % E2E_MARKLOGIC_IMAGE_VERSION=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless:latest-11; PUBLISH_IMAGE=false''' : '')
     }
 
+    environment {
+        PATH = "/space/go/bin:${env.PATH}"
+        MINIKUBE_HOME = "/space/minikube/"
+        KUBECONFIG = "/space/.kube-config"
+        GOPATH = "/space/go"
+    }
+
+
     parameters {
         string(name: 'E2E_MARKLOGIC_IMAGE_VERSION', defaultValue: 'ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless:latest-12', description: 'Docker image to use for tests.', trim: true)
         string(name: 'VERSION', defaultValue: '1.1.0', description: 'Version to tag the image with.', trim: true)

Makefile

@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 1.0.0
+VERSION ?= 1.1.0
 
 # VERIFY_HUGE_PAGES defines if hugepages test is enabled or not for e2e test
 VERIFY_HUGE_PAGES ?= false
@@ -12,7 +12,7 @@ export E2E_DOCKER_IMAGE ?= $(IMG)
 export E2E_KUSTOMIZE_VERSION ?= $(KUSTOMIZE_VERSION)
 export E2E_CONTROLLER_TOOLS_VERSION ?= $(CONTROLLER_TOOLS_VERSION)
 export E2E_MARKLOGIC_IMAGE_VERSION ?= progressofficial/marklogic-db:11.3.1-ubi-rootless-2.1.3
-export E2E_KUBERNETES_VERSION ?= v1.31.0
+export E2E_KUBERNETES_VERSION ?= v1.31.13
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.31.0
@@ -65,8 +65,8 @@ OPERATOR_SDK_VERSION ?= v1.34.2
 
 # Image URL to use all building/pushing image targets
 # Image for dev: ml-marklogic-operator-dev.bed-artifactory.bedford.progress.com/marklogic-operator-kubernetes
-# IMG ?= progressofficial/marklogic-operator-kubernetes:$(VERSION)
-IMG ?= "testrepo/marklogic-operator-image-dev:1.0.0"
+IMG ?= progressofficial/marklogic-operator-kubernetes:$(VERSION)
+# IMG ?= "testrepo/marklogic-operator-image-dev:$(VERSION)"
 
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
@@ -173,11 +173,11 @@ e2e-cleanup-minikube:
 	minikube delete
 
 GOLANGCI_LINT = $(shell pwd)/bin/golangci-lint
-GOLANGCI_LINT_VERSION ?= v1.54.2
+GOLANGCI_LINT_VERSION ?= v1.62.2
 golangci-lint:
 	@[ -f $(GOLANGCI_LINT) ] || { \
 	set -e ;\
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(shell dirname $(GOLANGCI_LINT)) $(GOLANGCI_LINT_VERSION) ;\
+	GOBIN=$(shell dirname $(GOLANGCI_LINT)) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION) ;\
 	}
 
 .PHONY: lint
@@ -265,7 +265,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest
 
 ## Tool Versions
 KUSTOMIZE_VERSION ?= v5.5.0
-CONTROLLER_TOOLS_VERSION ?= v0.17.1
+CONTROLLER_TOOLS_VERSION ?= v0.19.0
 
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. If wrong version is installed, it will be removed before downloading.
@@ -368,6 +368,7 @@ $(HELMIFY): $(LOCALBIN)
 	test -s $(LOCALBIN)/helmify || GOBIN=$(LOCALBIN) go install github.com/arttor/helmify/cmd/helmify@latest
 
 helm: manifests kustomize helmify
+	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
 	$(KUSTOMIZE) build config/default | $(HELMIFY) -image-pull-secrets -original-name charts/marklogic-operator-kubernetes 
 
 .PHONY: image-scan

NOTICE.txt

@@ -15,12 +15,12 @@ This document provides notice information for the third-party components used by
 Third Party Components
 
 
-api v0.32.1 (Apache-2.0)
-apimachinery v0.32.1 (Apache-2.0)
-client-go v0.32.1 (Apache-2.0)
-controller-runtime v0.20.1 (Apache-2.0)
+api v0.34.1 (Apache-2.0)
+apimachinery v0.34.1 (Apache-2.0)
+client-go v0.34.1 (Apache-2.0)
+controller-runtime v0.22.3 (Apache-2.0)
 k8s-objectmatcher v1.10.0 (Apache-2.0)
-logr v1.4.2 (Apache-2.0
+logr v1.4.3 (Apache-2.0)
 
 
  Common Licenses
@@ -31,27 +31,27 @@ logr v1.4.2 (Apache-2.0
 
 The following software may be included in this project (last updated February 11, 2025):
 
-Api v0.32.1 (Apache-2.0)
+Api v0.34.1 (Apache-2.0)
 
-    https://github.com/kubernetes/api/tree/v0.32.1
+    https://github.com/kubernetes/api/tree/v0.34.1
 
     For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
-Apimachinery v0.32.1 (Apache-2.0)
+Apimachinery v0.34.1 (Apache-2.0)
 
-    https://github.com/kubernetes/apimachinery/tree/v0.32.1
+    https://github.com/kubernetes/apimachinery/tree/v0.34.1
 
     For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
-client-go v0.32.1 (Apache-2.0)
+client-go v0.34.1 (Apache-2.0)
 
-    https://github.com/kubernetes/client-go/tree/v0.32.1
+    https://github.com/kubernetes/client-go/tree/v0.34.1
 
     For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
-Controller-runtime v0.20.1 (Apache-2.0)
+Controller-runtime v0.22.3 (Apache-2.0)
 
-    https://github.com/kubernetes-sigs/controller-runtime/tree/v0.20.1
+    https://github.com/kubernetes-sigs/controller-runtime/tree/v0.22.3
 
     For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
@@ -70,9 +70,9 @@ The source file patch/deletenull.go is based on https://github.com/kubernetes/ku
 
     For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 
-Logr v1.4.2 (Apache-2.0)
+Logr v1.4.3 (Apache-2.0)
 
-    https://github.com/go-logr/logr/tree/v1.4.2
+    https://github.com/go-logr/logr/tree/v1.4.3
 
     For the full text of the Apache-2.0 license, see Apache License 2.0 (Apache-2.0)
 

charts/marklogic-operator-kubernetes/Chart.yaml

@@ -13,9 +13,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.0
+version: 1.1.0
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.0.0"
+appVersion: "1.1.0"