bump go lib to 1.21

.github/workflows/go-postsubmit.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.20'
+  GO_VERSION: '1.21'
   GO_REQUIRED_MIN_VERSION: ''
   GOPATH: '/home/runner/work/multicloud-integrations/multicloud-integrations/go'
 defaults:
@@ -32,9 +32,9 @@ jobs:
       - name: test
         run: make test
       - name: report-coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
-          token: ${{ secrets.CODECOV_UPLOAD_TOKEN }}
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: /home/runner/work/multicloud-integrations/multicloud-integrations/go/src/github.com/open-cluster-management/multicloud-integrations/coverage.out,/home/runner/work/multicloud-integrations/multicloud-integrations/go/src/github.com/open-cluster-management/multicloud-integrations/prop_coverage.out
           flags: unit
           name: unit

.github/workflows/go-presubmit.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   # Common versions
-  GO_VERSION: '1.20'
+  GO_VERSION: '1.21'
   GO_REQUIRED_MIN_VERSION: ''
   GOPATH: '/home/runner/work/multicloud-integrations/multicloud-integrations/go'
 defaults:
@@ -82,9 +82,9 @@ jobs:
       - name: test
         run: make test
       - name: report-coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         with:
-          token: ${{ secrets.CODECOV_UPLOAD_TOKEN }}
+          token: ${{ secrets.CODECOV_TOKEN }}
           files: /home/runner/work/multicloud-integrations/multicloud-integrations/go/src/github.com/open-cluster-management/multicloud-integrations/coverage.out,/home/runner/work/multicloud-integrations/multicloud-integrations/go/src/github.com/open-cluster-management/multicloud-integrations/prop_coverage.out
           flags: unit
           name: unit

.github/workflows/go-release.yml

@@ -6,7 +6,7 @@ on:
       - 'v*.*.*'
 env:
   # Common versions
-  GO_VERSION: '1.20'
+  GO_VERSION: '1.21'
   GO_REQUIRED_MIN_VERSION: ''
   GOPATH: '/home/runner/work/multicloud-integrations/multicloud-integrations/go'
   GITHUB_REF: ${{ github.ref }}

build/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/stolostron/builder:go1.20-linux AS builder
+FROM registry.ci.openshift.org/stolostron/builder:go1.21-linux AS builder
 
 WORKDIR /go/src/github.com/open-cluster-management-io/multicloud-integrations
 COPY . .

build/Dockerfile.prow

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/stolostron/builder:go1.20-linux AS builder
+FROM registry.ci.openshift.org/stolostron/builder:go1.21-linux AS builder
 
 WORKDIR /go/src/github.com/stolostron/multicloud-integrations
 COPY . .

build/Dockerfile.rhtap

@@ -1,4 +1,4 @@
-FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.20 AS builder
+FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_1.21 AS builder
 
 WORKDIR /go/src/github.com/open-cluster-management-io/multicloud-integrations
 COPY . .

build/run-code-lint.sh

@@ -22,7 +22,7 @@ gem install mdl
 gem install awesome_bot
 
 # Install golangci-lint
-curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin v1.51.2
+curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b "$(go env GOPATH)"/bin v1.57.2
 
 # Start lint task
 make -f Makefile.prow lint-all

cmd/gitopscluster/exec/manager.go

@@ -34,13 +34,13 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
 // Change below variables to serve metrics on different host or port.
 var (
-	metricsHost         = "0.0.0.0"
-	metricsPort         = 8388
-	operatorMetricsPort = 8688
+	metricsHost = "0.0.0.0"
+	metricsPort = 8388
 )
 
 // RunManager starts the actual manager
@@ -62,8 +62,9 @@ func RunManager() {
 
 	// Create a new Cmd to provide shared dependencies and start components
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		MetricsBindAddress:      fmt.Sprintf("%s:%d", metricsHost, metricsPort),
-		Port:                    operatorMetricsPort,
+		Metrics: metricsserver.Options{
+			BindAddress: fmt.Sprintf("%s:%d", metricsHost, metricsPort),
+		},
 		LeaderElection:          enableLeaderElection,
 		LeaderElectionID:        "multicloud-operators-gitopscluster-leader.open-cluster-management.io",
 		LeaderElectionNamespace: "kube-system",

cmd/gitopssyncresc/exec/manager.go

@@ -29,13 +29,13 @@ import (
 	"k8s.io/klog"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
 // Change below variables to serve metrics on different host or port.
 var (
-	metricsHost         = "0.0.0.0"
-	metricsPort         = 8392
-	operatorMetricsPort = 8692
+	metricsHost = "0.0.0.0"
+	metricsPort = 8392
 )
 
 // RunManager starts the actual manager
@@ -57,8 +57,9 @@ func RunManager() {
 
 	// Create a new Cmd to provide shared dependencies and start components
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		MetricsBindAddress:      fmt.Sprintf("%s:%d", metricsHost, metricsPort),
-		Port:                    operatorMetricsPort,
+		Metrics: metricsserver.Options{
+			BindAddress: fmt.Sprintf("%s:%d", metricsHost, metricsPort),
+		},
 		LeaderElection:          enableLeaderElection,
 		LeaderElectionID:        "multicloud-operators-gitopssyncresc-leader.open-cluster-management.io",
 		LeaderElectionNamespace: "kube-system",

cmd/multiclusterstatusaggregation/exec/manager.go

@@ -31,13 +31,13 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/manager/signals"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
 // Change below variables to serve metrics on different host or port.
 var (
-	metricsHost         = "0.0.0.0"
-	metricsPort         = 8383
-	operatorMetricsPort = 8686
+	metricsHost = "0.0.0.0"
+	metricsPort = 8383
 )
 
 // RunManager starts the actual manager
@@ -74,8 +74,9 @@ func RunManager() {
 		"retryPeriod", options.LeaderElectionRetryPeriod)
 
 	mgr, err := ctrl.NewManager(cfg, ctrl.Options{
-		MetricsBindAddress:      fmt.Sprintf("%s:%d", metricsHost, metricsPort),
-		Port:                    operatorMetricsPort,
+		Metrics: metricsserver.Options{
+			BindAddress: fmt.Sprintf("%s:%d", metricsHost, metricsPort),
+		},
 		LeaderElection:          enableLeaderElection,
 		LeaderElectionID:        "multicloud-operators-multiclusterstatusaggregation-leader.open-cluster-management.io",
 		LeaderElectionNamespace: "kube-system",

cmd/propagation/main.go

@@ -42,6 +42,7 @@ import (
 	argov1alpha1 "open-cluster-management.io/multicloud-integrations/pkg/apis/argocd/v1alpha1"
 	"open-cluster-management.io/multicloud-integrations/propagation-controller/application"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 )
 
 // PropagationCMDOptions for command line flag parsing
@@ -62,11 +63,10 @@ var options = PropagationCMDOptions{
 }
 
 var (
-	scheme              = runtime.NewScheme()
-	setupLog            = ctrl.Log.WithName("setup")
-	metricsHost         = "0.0.0.0"
-	metricsPort         = 8386
-	operatorMetricsPort = 8698
+	scheme      = runtime.NewScheme()
+	setupLog    = ctrl.Log.WithName("setup")
+	metricsHost = "0.0.0.0"
+	metricsPort = 8386
 )
 
 func init() {
@@ -79,6 +79,7 @@ func init() {
 
 func main() {
 	var enableLeaderElection bool
+
 	flag.StringVar(
 		&options.MetricsAddr,
 		"metrics-addr",
@@ -137,9 +138,10 @@ func main() {
 
 	// Create a new Cmd to provide shared dependencies and start components
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		Scheme:                  scheme,
-		MetricsBindAddress:      fmt.Sprintf("%s:%d", metricsHost, metricsPort),
-		Port:                    operatorMetricsPort,
+		Scheme: scheme,
+		Metrics: metricsserver.Options{
+			BindAddress: fmt.Sprintf("%s:%d", metricsHost, metricsPort),
+		},
 		LeaderElection:          enableLeaderElection,
 		LeaderElectionID:        "multicloud-operators-propagation-leader.open-cluster-management.io",
 		LeaderElectionNamespace: "kube-system",
@@ -189,6 +191,7 @@ func main() {
 	}
 
 	setupLog.Info("starting manager")
+
 	if err := mgr.Start(ctrl.SetupSignalHandler()); err != nil {
 		setupLog.Error(err, "problem running manager")
 		os.Exit(1)

common/config/.golangci.yml

@@ -1,38 +1,16 @@
 service:
   # When updating this, also update the version stored in docker/build-tools/Dockerfile in the multicloudlab/tools repo.
-  golangci-lint-version: 1.51.x # use the fixed version to not introduce new linters unexpectedly
+  golangci-lint-version: 1.57.x # use the fixed version to not introduce new linters unexpectedly
 run:
   # timeout for analysis, e.g. 30s, 5m, default is 1m
   deadline: 20m
   timeout: 20m
-  go: '1.17'
-
-  # which dirs to skip: they won't be analyzed;
-  # can use regexp here: generated.*, regexp is applied on full path;
-  # default value is empty list, but next dirs are always skipped independently
-  # from this option's value:
-  #   	vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
-  skip-dirs:
-    - genfiles$
-    - vendor$
-    - vbh$
-    - pkg/apis/argocd/v1alpha1$
-    - propagation-controller/application$
-    - cmd/propagation$
-
-  # which files to skip: they will be analyzed, but issues from them
-  # won't be reported. Default value is empty list, but there is
-  # no need to include all autogenerated files, we confidently recognize
-  # autogenerated files. If it's not please let us know.
-  skip-files:
-    - ".*\\.pb\\.go"
-    - ".*\\.gen\\.go"
 
 linters:
   enable-all: true
   disable:
-    - asasalint
     - bodyclose
+    - containedctx
     - contextcheck
     - cyclop
     - deadcode
@@ -61,36 +39,61 @@ linters:
     - gosec
     - ifshort
     - ineffassign
+    - interfacebloat
     - interfacer
     - ireturn
+    - loggercheck
     - maintidx 
     - maligned
+    - musttag
     - nakedret
     - nestif
     - nilerr
     - nilnil
     - nlreturn
     - noctx
+    - nosnakecase
     - nonamedreturns
     - nosnakecase
     - paralleltest
     - prealloc
     - predeclared
+    - rowserrcheck
+    - scopelint
     - staticcheck
     - structcheck
-    - scopelint
+    - sqlclosecheck
     - tagliatelle
     - tenv
     - testpackage
     - thelper
+    - usestdlibvars
+    - varcheck
     - varnamelen
     - wastedassign
     - wrapcheck
-    - varcheck
+    - inamedparam
+    - revive
+    - mirror
+    - godox
     - lll
+    - tagalign
+    - stylecheck
   fast: false
 
 linters-settings:
+  testifylint:
+    disable:
+      - require-error
+      - expected-actual
+  perfsprint:
+    errorf: false
+    sprintf1: false
+    strconcat: false
+  wsl:
+    allow-assign-and-anything: true
+    strict-append: false
+
   errcheck:
     # report about not checking of errors in type assetions: `a := b.(MyStruct)`;
     # default is false: such cases aren't reported by default.
@@ -111,7 +114,7 @@ linters-settings:
     min-confidence: 0.0
   gocognit:
     # minimal code complexity to report, 30 by default (but we recommend 10-20)
-    min-complexity: 75
+    min-complexity: 200
   gofmt:
     # simplify code: gofmt with `-s` option, true by default
     simplify: true
@@ -213,6 +216,7 @@ linters-settings:
       # - unnamedResult
       # - wrapperFunc
 
+
 issues:
   # List of regexps of issue texts to exclude, empty list by default.
   # But independently from this option we use default exclude patterns,
@@ -228,6 +232,17 @@ issues:
         - errcheck
         - maligned
 
+  skip-dirs:
+    - genfiles$
+    - vendor$
+    - vbh
+
+  skip-files:
+    - ".*\\.pb\\.go"
+    - ".*\\.gen\\.go"
+    - ".*.helmrelease.*\\.go"
+    - ".*.ansiblejob.*\\.go"
+
   # Independently from option `exclude` we use default exclude patterns,
   # it can be disabled by this option. To list all
   # excluded by default patterns execute `golangci-lint run --help`.

common/scripts/lint_go.sh

@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.51.2
+curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.57.2
 
 export GOLANGCI_LINT_CACHE=/tmp/golangci-cache
 export GOROOT=`go env GOROOT`

deploy/ocm/install.sh

@@ -9,7 +9,7 @@ KUBECTL=${KUBECTL:-kubectl}
 rm -rf ocm
 
 echo "############  Cloning ocm"
-git clone https://github.com/open-cluster-management-io/ocm.git
+git clone --depth 1 --branch release-0.13 https://github.com/open-cluster-management-io/ocm.git
 
 cd ocm || {
   printf "cd failed, ocm does not exist"