update golagci-lint

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

.github/workflows/sanity.yaml

@@ -24,8 +24,7 @@ jobs:
       with:
         go-version-file: "go.mod"
     - name: Run linting checks
-      uses: "golangci/golangci-lint-action@v6"
+      uses: golangci/golangci-lint-action@v6
       with:
-        version: "v1.55.2"
-        skip-pkg-cache: true
+        version: v1.57.2
 

.golangci.yaml

@@ -1,11 +1,5 @@
 run:
   timeout: 8m
-  skip-dirs:
-  - pkg/lib
-  - pkg/api
-  - pkg/fakes
-  - pkg/package-server/apis
-  - test/e2e
 
 linters:
   enable:
@@ -41,7 +35,13 @@ linters-settings:
 issues:
   max-issues-per-linter: 0
   max-same-issues: 0
+  exclude-dirs:
+    - pkg/lib
+    - pkg/api
+    - pkg/fakes
+    - pkg/package-server/apis
+    - test/e2e
 
 output:
-  format: tab
+  formats: tab
   sort-results: true

go.mod

@@ -2,7 +2,7 @@ module github.com/operator-framework/operator-lifecycle-manager
 
 go 1.22.0
 
-toolchain go1.22.2
+toolchain go1.22.3
 
 require (
 	github.com/blang/semver/v4 v4.0.0
@@ -31,7 +31,7 @@ require (
 	github.com/otiai10/copy v1.14.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.19.0
-	github.com/prometheus/client_model v0.6.0
+	github.com/prometheus/client_model v0.6.1
 	github.com/prometheus/common v0.51.1
 	github.com/sirupsen/logrus v1.9.3
 	github.com/spf13/cobra v1.8.0
@@ -62,10 +62,8 @@ require (
 
 // todo: remove this once k8s.io/component-base is updated to use the new prometheus/client_model
 replace (
-	github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.16.0
-	github.com/prometheus/client_model => github.com/prometheus/client_model v0.4.0
-	github.com/prometheus/common => github.com/prometheus/common v0.44.0
-	github.com/prometheus/procfs => github.com/prometheus/procfs v0.10.1
+	github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.18.0
+	github.com/prometheus/common => github.com/prometheus/common v0.47.0
 )
 
 require (
@@ -170,7 +168,6 @@ require (
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/mattn/go-sqlite3 v1.14.22 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect

go.sum

@@ -213,6 +213,7 @@ func NewOperator(ctx context.Context, kubeconfigPath string, clock utilclock.Clo
 		bundleUnpackTimeout:      bundleUnpackTimeout,
 		clientFactory:            clients.NewFactory(validatingConfig),
 	}
+
 	op.sources = grpc.NewSourceStore(logger, 10*time.Second, 10*time.Minute, op.syncSourceState)
 	op.sourceInvalidator = resolver.SourceProviderFromRegistryClientProvider(op.sources, logger)
 	resolverSourceProvider := NewOperatorGroupToggleSourceProvider(op.sourceInvalidator, logger, op.lister.OperatorsV1().OperatorGroupLister())

pkg/controller/operators/catalog/operator.go

@@ -174,6 +174,13 @@ func (s *SourceStore) Add(key registry.CatalogKey, address string) (*SourceConn,
 		return nil, err
 	}
 
+	// non-blocking call to start exercising the connection
+	// recent changes to the grpc library have changed the way connection status was transitioning.
+	// it seems that previously, creating the connection would make a connection attempt and start the state machine.
+	// now, it seems like the connection is no longer being attempted - so we must call it here in lieu of a better
+	// solution. One suggestion might be to
+	// conn.Connect()
+
 	ctx, cancel := context.WithCancel(context.Background())
 	source := SourceConn{
 		SourceMeta: SourceMeta{
@@ -233,6 +240,11 @@ func (s *SourceStore) watch(ctx context.Context, key registry.CatalogKey, source
 					// This function is non-blocking. Therefore, when it returns we'll still return IDLE
 					// as the state (we'll see further state changes in subsequent iterations of the loop).
 					source.Conn.Connect()
+					regitryClient := registry.NewClientFromConn(source.Conn)
+
+					// Let's force a health check to make sure the connection is healthy
+					c, err := regitryClient.HealthCheck(ctx, 10*time.Second)
+					s.logger.WithError(err).WithField("address", source.Address).Debugf("gRPC health check: %v", c)
 
 					// notify subscriber
 					s.notify <- SourceState{Key: key, State: newState}

pkg/controller/registry/grpc/source.go

@@ -147,7 +147,7 @@ var (
 	catalogSourceReady = prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Name: "catalogsource_ready",
-			Help: "State of a CatalogSource. 1 indicates that the CatalogSource is in a READY state. 0 indicates CatalogSource is in a Non READY state.",
+			Help: "State of a CatalogSource. 1 indicates that the CatalogSource is in a READY/IDLE state. 0 indicates CatalogSource is in a Non READY/IDLE state.",
 		},
 		[]string{NamespaceLabel, NameLabel},
 	)
@@ -262,6 +262,8 @@ func CounterForSubscription(name, installedCSV, channelName, packageName, planAp
 func RegisterCatalogSourceState(name, namespace string, state connectivity.State) {
 	switch state {
 	case connectivity.Ready:
+		fallthrough
+	case connectivity.Idle:
 		catalogSourceReady.WithLabelValues(namespace, name).Set(1)
 	default:
 		catalogSourceReady.WithLabelValues(namespace, name).Set(0)

pkg/metrics/metrics.go

@@ -3,6 +3,7 @@ package e2e
 import (
 	"context"
 	"fmt"
+	"google.golang.org/grpc/connectivity"
 	"os"
 
 	operatorsv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
@@ -20,7 +21,6 @@ const (
 	olmCatalogLabel    string = "olm.catalogSource"
 	catalogMountPath   string = "/opt/olm"
 	catalogServicePort int32  = 50051
-	catalogReadyState  string = "READY"
 )
 
 type MagicCatalog struct {
@@ -147,7 +147,7 @@ func (c *MagicCatalog) catalogSourceIsReady(ctx context.Context) error {
 			return false, err
 		}
 		state := catalogSource.Status.GRPCConnectionState.LastObservedState
-		if state != catalogReadyState {
+		if state != connectivity.Idle.String() && state != connectivity.Ready.String() {
 			return false, nil
 		}
 		return true, nil

test/e2e/magic_catalog.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"google.golang.org/grpc/connectivity"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -3607,7 +3608,8 @@ func updateInternalCatalog(t GinkgoTInterface, c operatorclient.ClientInterface,
 		before := fetchedInitialCatalog.Status.ConfigMapResource
 		after := catalog.Status.ConfigMapResource
 		if after != nil && after.LastUpdateTime.After(before.LastUpdateTime.Time) && after.ResourceVersion != before.ResourceVersion &&
-			catalog.Status.GRPCConnectionState.LastConnectTime.After(after.LastUpdateTime.Time) && catalog.Status.GRPCConnectionState.LastObservedState == "READY" {
+			catalog.Status.GRPCConnectionState.LastConnectTime.After(after.LastUpdateTime.Time) &&
+			(catalog.Status.GRPCConnectionState.LastObservedState == connectivity.Ready.String() || catalog.Status.GRPCConnectionState.LastObservedState == connectivity.Idle.String()) {
 			fmt.Println("catalog updated")
 			return true
 		}

test/e2e/subscription_e2e_test.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"google.golang.org/grpc/connectivity"
 	"os"
 	"regexp"
 	"strings"
@@ -364,7 +365,8 @@ func catalogSourceRegistryPodSynced() func(catalog *operatorsv1alpha1.CatalogSou
 			lastState = state
 			lastTime = time.Now()
 		}
-		if registry != nil && connState != nil && !connState.LastConnectTime.IsZero() && connState.LastObservedState == "READY" {
+		if registry != nil && connState != nil && !connState.LastConnectTime.IsZero() &&
+			(connState.LastObservedState == connectivity.Ready.String() || connState.LastObservedState == connectivity.Idle.String()) {
 			fmt.Printf("probing catalog %s pod with address %s\n", catalog.GetName(), registry.Address())
 			return registryPodHealthy(registry.Address())
 		}