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)
 }

staging/operator-registry/cmd/opm/render/cmd.go

@@ -2,7 +2,6 @@ package render
 
 import (
 	"io"
-	"io/ioutil"
 	"log"
 	"os"
 
@@ -45,7 +44,7 @@ database files.
 			// 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 render.Run and logged as fatal errors.
-			logrus.SetOutput(ioutil.Discard)
+			logrus.SetOutput(io.Discard)
 
 			reg, err := util.CreateCLIRegistry(cmd)
 			if err != nil {
@@ -72,6 +71,6 @@ database files.
 
 func nullLogger() *logrus.Entry {
 	logger := logrus.New()
-	logger.SetOutput(ioutil.Discard)
+	logger.SetOutput(io.Discard)
 	return logrus.NewEntry(logger)
 }

staging/operator-registry/pkg/configmap/configmap_writer.go

@@ -3,7 +3,6 @@ package configmap
 import (
 	"context"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"regexp"
 
@@ -85,7 +84,7 @@ func (c *ConfigMapWriter) Populate(maxDataSizeLimit uint64) error {
 	var totalSize uint64
 	for _, dir := range subDirs {
 		completePath := c.manifestsDir + dir
-		files, err := ioutil.ReadDir(completePath)
+		files, err := os.ReadDir(completePath)
 		if err != nil {
 			logrus.Errorf("read dir failed: %v", err)
 			return err
@@ -95,7 +94,7 @@ func (c *ConfigMapWriter) Populate(maxDataSizeLimit uint64) error {
 			log := logrus.WithField("file", completePath+file.Name())
 			log.Info("Reading file")
 
-			content, err := ioutil.ReadFile(completePath + file.Name())
+			content, err := os.ReadFile(completePath + file.Name())
 			if err != nil {
 				log.Errorf("read failed: %v", err)
 				return err

staging/operator-registry/pkg/image/mock.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"errors"
 	"io/fs"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sync"
@@ -40,7 +39,7 @@ func (i *MockImage) unpack(dir string) error {
 		if err := os.MkdirAll(pathDir, 0777); err != nil {
 			return err
 		}
-		return ioutil.WriteFile(path, data, 0666)
+		return os.WriteFile(path, data, 0666)
 	})
 }
 

staging/operator-registry/pkg/image/registry_test.go

@@ -5,7 +5,6 @@ import (
 	"crypto/x509"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"math"
 	"math/rand"
 	"net/http"
@@ -35,7 +34,7 @@ type newRegistryFunc func(t *testing.T, cafile string) (image.Registry, cleanupF
 
 func poolForCertFile(t *testing.T, file string) *x509.CertPool {
 	rootCAs := x509.NewCertPool()
-	certs, err := ioutil.ReadFile(file)
+	certs, err := os.ReadFile(file)
 	require.NoError(t, err)
 	require.True(t, rootCAs.AppendCertsFromPEM(certs))
 	return rootCAs

staging/operator-registry/pkg/lib/bundle/chartutil.go

@@ -19,7 +19,6 @@ limitations under the License.
 package bundle
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -125,7 +124,7 @@ func IsChartDir(dirName string) (bool, error) {
 		return false, errors.Errorf("no %s exists in directory %q", ChartfileName, dirName)
 	}
 
-	chartYamlContent, err := ioutil.ReadFile(chartYaml)
+	chartYamlContent, err := os.ReadFile(chartYaml)
 	if err != nil {
 		return false, errors.Errorf("cannot read %s in directory %q", ChartfileName, dirName)
 	}

staging/operator-registry/pkg/lib/bundle/exporter.go

@@ -2,7 +2,6 @@ package bundle
 
 import (
 	"context"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -34,7 +33,7 @@ func (i *BundleExporter) Export(skipTLSVerify, plainHTTP bool) error {
 
 	log := logrus.WithField("img", i.image)
 
-	tmpDir, err := ioutil.TempDir("./", "bundle_tmp")
+	tmpDir, err := os.MkdirTemp("./", "bundle_tmp")
 	if err != nil {
 		return err
 	}

staging/operator-registry/pkg/lib/bundle/generate.go

@@ -3,7 +3,6 @@ package bundle
 import (
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -180,7 +179,7 @@ func CopyYamlOutput(annotationsContent []byte, manifestDir, outputDir, workingDi
 	}
 
 	// Now, generate the `metadata/` dir and write the annotations
-	file, err := ioutil.ReadFile(filepath.Join(copyDir, MetadataDir, AnnotationsFile))
+	file, err := os.ReadFile(filepath.Join(copyDir, MetadataDir, AnnotationsFile))
 	if os.IsNotExist(err) || overwrite {
 		writeDir := filepath.Join(copyDir, MetadataDir)
 		err = WriteFile(AnnotationsFile, writeDir, annotationsContent)
@@ -209,7 +208,7 @@ func GetMediaType(directory string) (string, error) {
 	k8sFiles := make(map[string]*unstructured.Unstructured)
 
 	// Read all file names in directory
-	items, _ := ioutil.ReadDir(directory)
+	items, _ := os.ReadDir(directory)
 	for _, item := range items {
 		if item.IsDir() {
 			continue
@@ -218,7 +217,7 @@ func GetMediaType(directory string) (string, error) {
 		files = append(files, item.Name())
 
 		fileWithPath := filepath.Join(directory, item.Name())
-		fileBlob, err := ioutil.ReadFile(fileWithPath)
+		fileBlob, err := os.ReadFile(fileWithPath)
 		if err != nil {
 			return "", fmt.Errorf("Unable to read file %s in bundle", fileWithPath)
 		}
@@ -367,7 +366,7 @@ func WriteFile(fileName, directory string, content []byte) error {
 		}
 	}
 	log.Infof("Writing %s in %s", fileName, directory)
-	err := ioutil.WriteFile(filepath.Join(directory, fileName), content, DefaultPermission)
+	err := os.WriteFile(filepath.Join(directory, fileName), content, DefaultPermission)
 	if err != nil {
 		return err
 	}
@@ -376,7 +375,7 @@ func WriteFile(fileName, directory string, content []byte) error {
 
 // copy the contents of a potentially nested manifest dir into an output dir.
 func copyManifestDir(from, to string, overwrite bool) error {
-	fromFiles, err := ioutil.ReadDir(from)
+	fromFiles, err := os.ReadDir(from)
 	if err != nil {
 		return err
 	}
@@ -431,7 +430,11 @@ func copyManifestDir(from, to string, overwrite bool) error {
 			return err
 		}
 
-		err = os.Chmod(toFilePath, fromFile.Mode())
+		info, err := fromFile.Info()
+		if err != nil {
+			return err
+		}
+		err = os.Chmod(toFilePath, info.Mode())
 		if err != nil {
 			return err
 		}