Merge pull request #609 from openshift-bot/synchronize-upstream

NO-ISSUE: Synchronize From Upstream Repositories

Author: openshift-merge-bot[bot]

staging/operator-lifecycle-manager/OWNERS

@@ -9,6 +9,7 @@ approvers:
   - grokspawn
   - joelanford
   - tmshort
+  - ncdc
 # review == this code is good /lgtm
 reviewers:
   - kevinrizza
@@ -26,3 +27,4 @@ reviewers:
   - dtfranz
   - tmshort
   - stevekuznetsov
+  - ncdc

staging/operator-lifecycle-manager/pkg/controller/registry/reconciler/grpc.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/google/go-cmp/cmp"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -202,10 +203,14 @@ func (c *GrpcRegistryReconciler) currentPodsWithCorrectImageAndSpec(logger *logr
 	newPod := source.Pod(serviceAccount)
 	for _, p := range pods {
 		images, hash := correctImages(source, p), podHashMatch(p, newPod)
-		logger.WithFields(logrus.Fields{
+		logger = logger.WithFields(logrus.Fields{
 			"current-pod.namespace": p.Namespace, "current-pod.name": p.Name,
 			"correctImages": images, "correctHash": hash,
-		}).Info("evaluating current pod")
+		})
+		logger.Info("evaluating current pod")
+		if !hash {
+			logger.Infof("pod spec diff: %s", cmp.Diff(p.Spec, newPod.Spec))
+		}
 		if correctImages(source, p) && podHashMatch(p, newPod) {
 			found = append(found, p)
 		}

staging/operator-registry/alpha/action/init.go

@@ -3,7 +3,6 @@ package action
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 
 	"github.com/h2non/filetype"
 
@@ -25,15 +24,15 @@ func (i Init) Run() (*declcfg.Package, error) {
 		DefaultChannel: i.DefaultChannel,
 	}
 	if i.DescriptionReader != nil {
-		descriptionData, err := ioutil.ReadAll(i.DescriptionReader)
+		descriptionData, err := io.ReadAll(i.DescriptionReader)
 		if err != nil {
 			return nil, fmt.Errorf("read description: %v", err)
 		}
 		pkg.Description = string(descriptionData)
 	}
 
 	if i.IconReader != nil {
-		iconData, err := ioutil.ReadAll(i.IconReader)
+		iconData, err := io.ReadAll(i.IconReader)
 		if err != nil {
 			return nil, fmt.Errorf("read icon: %v", err)
 		}

staging/operator-registry/alpha/action/migrate.go

@@ -3,7 +3,6 @@ package action
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 
 	"github.com/operator-framework/operator-registry/alpha/declcfg"
@@ -20,7 +19,7 @@ type Migrate struct {
 }
 
 func (m Migrate) Run(ctx context.Context) error {
-	entries, err := ioutil.ReadDir(m.OutputDir)
+	entries, err := os.ReadDir(m.OutputDir)
 	if err != nil && !os.IsNotExist(err) {
 		return err
 	}

staging/operator-registry/alpha/action/render.go

@@ -6,7 +6,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"path/filepath"
 	"sort"
@@ -60,7 +60,7 @@ type Render struct {
 
 func nullLogger() *logrus.Entry {
 	logger := logrus.New()
-	logger.SetOutput(ioutil.Discard)
+	logger.SetOutput(io.Discard)
 	return logrus.NewEntry(logger)
 }
 
@@ -155,7 +155,7 @@ func (r Render) imageToDeclcfg(ctx context.Context, imageRef string) (*declcfg.D
 	if err != nil {
 		return nil, err
 	}
-	tmpDir, err := ioutil.TempDir("", "render-unpack-")
+	tmpDir, err := os.MkdirTemp("", "render-unpack-")
 	if err != nil {
 		return nil, err
 	}

staging/operator-registry/cmd/opm/alpha/bundle/unpack.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"crypto/x509"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -99,7 +98,7 @@ func unpackBundle(cmd *cobra.Command, args []string) error {
 	}
 	if rootCA != "" {
 		rootCAs := x509.NewCertPool()
-		certs, err := ioutil.ReadFile(rootCA)
+		certs, err := os.ReadFile(rootCA)
 		if err != nil {
 			return err
 		}
@@ -129,7 +128,7 @@ func unpackBundle(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	dir, err := ioutil.TempDir("", "bundle-")
+	dir, err := os.MkdirTemp("", "bundle-")
 	if err != nil {
 		return err
 	}

staging/operator-registry/cmd/opm/alpha/bundle/validate.go

@@ -2,7 +2,6 @@ package bundle
 
 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -80,7 +79,7 @@ func validateFunc(cmd *cobra.Command, _ []string) error {
 	}
 	imageValidator := bundle.NewImageValidator(registry, logger, optional)
 
-	dir, err := ioutil.TempDir("", "bundle-")
+	dir, err := os.MkdirTemp("", "bundle-")
 	logger.Infof("Create a temp directory at %s", dir)
 	if err != nil {
 		return err

staging/operator-registry/cmd/opm/alpha/template/basic.go

@@ -2,7 +2,6 @@ package template
 
 import (
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 
@@ -50,7 +49,7 @@ When FILE is '-' or not provided, the template is read from standard input`,
 			// The bundle loading impl is somewhat verbose, even on the happy path,
 			// so discard all logrus default logger logs. Any important failures will be
 			// returned from template.Render and logged as fatal errors.
-			logrus.SetOutput(ioutil.Discard)
+			logrus.SetOutput(io.Discard)
 
 			reg, err := util.CreateCLIRegistry(cmd)
 			if err != nil {

staging/operator-registry/cmd/opm/alpha/template/semver.go

@@ -3,7 +3,6 @@ package template
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 
@@ -53,7 +52,7 @@ When FILE is '-' or not provided, the template is read from standard input`,
 			// The bundle loading impl is somewhat verbose, even on the happy path,
 			// so discard all logrus default logger logs. Any important failures will be
 			// returned from template.Render and logged as fatal errors.
-			logrus.SetOutput(ioutil.Discard)
+			logrus.SetOutput(io.Discard)
 
 			reg, err := util.CreateCLIRegistry(cmd)
 			if err != nil {

staging/operator-registry/cmd/opm/internal/util/util.go

@@ -2,7 +2,7 @@ package util
 
 import (
 	"errors"
-	"io/ioutil"
+	"io"
 	"os"
 
 	"github.com/operator-framework/operator-registry/pkg/image/containerdregistry"
@@ -69,6 +69,6 @@ func CreateCLIRegistry(cmd *cobra.Command) (*containerdregistry.Registry, error)
 
 func nullLogger() *logrus.Entry {
 	logger := logrus.New()
-	logger.SetOutput(ioutil.Discard)
+	logger.SetOutput(io.Discard)
 	return logrus.NewEntry(logger)
 }