Merge branch 'master' into patch-1

Author: cdjohnson

.github/workflows/test.yml

@@ -24,14 +24,17 @@ jobs:
           file: coverage.out
           fail_ci_if_error: false
   e2e-minikube:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - run: |
-          sudo apt-get -y update
-          sudo apt-get -y upgrade
-          sudo apt-get -y install conntrack
-          podman version
+          sudo apt-get update \
+            && sudo apt-get remove buildah podman -y \
+            && sudo apt-get autoremove -y \
+            && sudo apt-get upgrade \
+            && sudo apt-get install podman dbus-x11 conntrack -y \
+            && podman version
+      - run: |
           curl -sLo minikube "$(curl -sL https://api.github.com/repos/kubernetes/minikube/releases/latest | jq -r '[.assets[] | select(.name == "minikube-linux-amd64")] | first | .browser_download_url')"
           chmod +x minikube
           sudo mv minikube /bin/
@@ -54,14 +57,19 @@ jobs:
           export DOCKER_REGISTRY_HOST=localhost:443
       - run: |
           KUBECONFIG="$HOME/.kube/config" DOCKER_REGISTRY_HOST=localhost:443 make build e2e
+
   e2e-kind:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - run: |
-          sudo apt-get -y update
-          sudo apt-get -y upgrade
-          podman version
+          sudo apt-get update \
+            && sudo apt-get remove buildah podman -y \
+            && sudo apt-get autoremove -y \
+            && sudo apt-get upgrade \
+            && sudo apt-get -y install podman dbus-x11 \
+            && podman version
+      - run: |
           curl -sLo kind "$(curl -sL https://api.github.com/repos/kubernetes-sigs/kind/releases/latest | jq -r '[.assets[] | select(.name == "kind-linux-amd64")] | first | .browser_download_url')"
           chmod +x kind
           sudo mv kind /bin/

Makefile

@@ -66,7 +66,9 @@ image-upstream:
 
 .PHONY: vendor
 vendor:
+	$(GO) mod tidy
 	$(GO) mod vendor
+	$(GO) mod verify
 
 .PHONY: codegen
 codegen:

OWNERS

@@ -15,12 +15,12 @@ reviewers:
   - anik120
   - exdx
   - awgreene
-  - Bowenislandsong
   - benluddy
   - hasbro17
   - ankitathomas
   - estroz
   - joelanford
   - jmrodri
+  - timflannagan
 # Bugzilla component
 component: "OLM"

README.md

@@ -1,7 +1,8 @@
 [![Build Status](https://travis-ci.com/operator-framework/operator-registry.svg?branch=master)](https://travis-ci.com/operator-framework/operator-registry)
+
 # operator-registry
 
-Operator Registry runs in a Kubernetes or OpenShift cluster to provide operator catalog data to [Operator Lifecycle Manager](https://github.com/operator-framework/operator-lifecycle-manager). 
+Operator Registry runs in a Kubernetes or OpenShift cluster to provide operator catalog data to [Operator Lifecycle Manager](https://github.com/operator-framework/operator-lifecycle-manager).
 
 # Overview
 
@@ -13,23 +14,23 @@ This project provides the following binaries:
  * `registry-server`, which takes a sqlite database loaded with manifests, and exposes a gRPC interface to it.
    * Deprecated - use `opm registry serve` instead 
  * `configmap-server`, which takes a kubeconfig and a configmap reference, and parses the configmap into the sqlite database before exposing it via the same interface as `registry-server`.
- 
+
 And libraries:
- 
- * `pkg/client` - providing a high-level client interface for the gRPC api.
- * `pkg/api` - providing low-level client libraries for the gRPC interface exposed by `registry-server`.
- * `pkg/registry` - providing basic registry types like Packages, Channels, and Bundles.
- * `pkg/sqlite` - providing interfaces for building sqlite manifest databases from `ConfigMap`s or directories, and for querying an existing sqlite database.
- * `pkg/lib` - providing external interfaces for interacting with this project as an api that defines a set of standards for operator bundles and indexes.
- * `pkg/containertools` - providing an interface to interact with and shell out to common container tooling binaries (if installed on the environment)
+
+* `pkg/client` - providing a high-level client interface for the gRPC api.
+* `pkg/api` - providing low-level client libraries for the gRPC interface exposed by `registry-server`.
+* `pkg/registry` - providing basic registry types like Packages, Channels, and Bundles.
+* `pkg/sqlite` - providing interfaces for building sqlite manifest databases from `ConfigMap`s or directories, and for querying an existing sqlite database.
+* `pkg/lib` - providing external interfaces for interacting with this project as an api that defines a set of standards for operator bundles and indexes.
+* `pkg/containertools` - providing an interface to interact with and shell out to common container tooling binaries (if installed on the environment)
 
 **NOTE:** The purpose of `opm` tool is to help who needs to manage index catalogues for OLM instances. However, if you are looking for a tool to help you to integrate your operator project with OLM then you should use [Operator-SDK](https://github.com/operator-framework/operator-sdk).
 
 # Manifest format
 
 We refer to a directory of files with one ClusterServiceVersion as a "bundle". A bundle typically includes a ClusterServiceVersion and the CRDs that define the owned APIs of the CSV in its manifest directory, though additional objects may be included. It also includes an annotations file in its metadata folder which defines some higher level aggregate data that helps to describe the format and package information about how the bundle should be added into an index of bundles.
 
-```
+```bash
  # example bundle
  etcd
  ├── manifests
@@ -41,19 +42,18 @@ We refer to a directory of files with one ClusterServiceVersion as a "bundle". A
 
 When loading manifests into the database, the following invariants are validated:
 
- * The bundle must have at least one channel defined in the annotations.
- * Every bundle has exactly one ClusterServiceVersion.
- * If a ClusterServiceVersion `owns` a CRD, that CRD must exist in the bundle.
+* The bundle must have at least one channel defined in the annotations.
+* Every bundle has exactly one ClusterServiceVersion.
+* If a ClusterServiceVersion `owns` a CRD, that CRD must exist in the bundle.
 
 Bundle directories are identified solely by the fact that they contain a ClusterServiceVersion, which provides an amount of freedom for layout of manifests.
 
-Check out the [operator bundle design](docs/design/operator-bundle.md) for more detail on the bundle format. 
+Check out the [operator bundle design](docs/design/operator-bundle.md) for more detail on the bundle format.
 
 # Bundle images
 
 Using [OCI spec](https://github.com/opencontainers/image-spec/blob/master/spec.md) container images as a method of storing the manifest and metadata contents of individual bundles, `opm` interacts directly with these images to generate and incrementally update the database. Once you have your [manifests defined](https://operator-framework.github.io/olm-book/docs/packaging-an-operator.html#writing-your-operator-manifests) and have created a directory in the format defined above, building the image is as simple as defining a [Dockerfile](docs/design/operator-bundle.md#Bundle-Dockerfile) and building that image:
 
-
 ```sh
 podman build -t quay.io/my-container-registry-namespace/my-manifest-bundle:latest -f bundle.Dockerfile .
 ```
@@ -139,7 +139,7 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
 metadata:
   name: etcd-subscription
-  namespace: default 
+  namespace: default
 spec:
   channel: alpha
   name: etcd
@@ -152,7 +152,7 @@ spec:
 After starting a catalog locally:
 
 ```sh
-$ docker run --rm -p 50051:50051 <index image>
+docker run --rm -p 50051:50051 <index image>
 ```
 
 [grpcurl](https://github.com/fullstorydev/grpcurl) is a useful tool for interacting with the api:
@@ -171,8 +171,9 @@ ListPackages
 ```
 
 ```sh
-$ grpcurl -plaintext  localhost:50051 api.Registry/ListPackages
+grpcurl -plaintext  localhost:50051 api.Registry/ListPackages
 ```
+
 ```json
 {
   "name": "etcd"
@@ -183,8 +184,9 @@ $ grpcurl -plaintext  localhost:50051 api.Registry/ListPackages
 ```
 
 ```sh
-$ grpcurl -plaintext -d '{"name":"etcd"}' localhost:50051 api.Registry/GetPackage
+grpcurl -plaintext -d '{"name":"etcd"}' localhost:50051 api.Registry/GetPackage
 ```
+
 ```json
 {
   "name": "etcd",
@@ -202,6 +204,7 @@ $ grpcurl -plaintext -d '{"name":"etcd"}' localhost:50051 api.Registry/GetPackag
 $ grpcurl localhost:50051 describe api.Registry.GetBundleForChannel
 api.Registry.GetBundleForChannel is a method:
 ```
+
 ```json
 {
   "name": "GetBundleForChannel",
@@ -216,6 +219,7 @@ api.Registry.GetBundleForChannel is a method:
 $ grpcurl localhost:50051 describe api.GetBundleInChannelRequest
 api.GetBundleInChannelRequest is a message:
 ```
+
 ```json
 {
   "name": "GetBundleInChannelRequest",
@@ -248,8 +252,9 @@ api.GetBundleInChannelRequest is a message:
 ```
 
 ```sh
-$ grpcurl -plaintext -d '{"pkgName":"etcd","channelName":"alpha"}' localhost:50051 api.Registry/GetBundleForChannel
+grpcurl -plaintext -d '{"pkgName":"etcd","channelName":"alpha"}' localhost:50051 api.Registry/GetBundleForChannel
 ```
+
 ```json
 {
   "csvName": "etcdoperator.v0.9.2",

cmd/opm/index/add.go

@@ -195,9 +195,8 @@ func getContainerTools(cmd *cobra.Command) (string, string, error) {
 	if containerTool != "" {
 		if pullTool == "" && buildTool == "" {
 			return containerTool, containerTool, nil
-		} else {
-			return "", "", fmt.Errorf("container-tool cannot be set alongside pull-tool or build-tool")
 		}
+		return "", "", fmt.Errorf("container-tool cannot be set alongside pull-tool or build-tool")
 	}
 
 	// Check for defaults, then return

go.mod

@@ -55,7 +55,6 @@ require (
 	k8s.io/api v0.20.0
 	k8s.io/apiextensions-apiserver v0.20.0
 	k8s.io/apimachinery v0.20.0
-	k8s.io/apiserver v0.20.0
 	k8s.io/client-go v0.20.0
 	k8s.io/klog v1.0.0
 	k8s.io/kubectl v0.20.0

go.sum

@@ -70,8 +70,7 @@ func clearDir(dir string) {
 	for _, item := range items {
 		if item.IsDir() {
 			continue
-		} else {
-			os.Remove(filepath.Join(dir, item.Name()))
 		}
+		os.Remove(filepath.Join(dir, item.Name()))
 	}
 }

pkg/lib/bundle/utils_test.go

@@ -150,46 +150,45 @@ func populate(ctx context.Context, loader registry.Load, graphLoader registry.Gr
 				}
 				return err
 			}
-			if overwritten != "" {
-				// get all bundle paths for that package - we will re-add these to regenerate the graph
-				bundles, err := querier.GetBundlesForPackage(ctx, img.Bundle.Package)
-				if err != nil {
-					return err
-				}
-				type unpackedImage struct {
-					to      image.Reference
-					from    string
-					cleanup func()
-					err     error
-				}
-				unpacked := make(chan unpackedImage)
-				for bundle := range bundles {
-					// parallelize image pulls
-					go func(bundle registry.BundleKey, img *registry.ImageInput) {
-						if bundle.CsvName != img.Bundle.Name {
-							to, from, cleanup, err := unpackImage(ctx, reg, image.SimpleReference(bundle.BundlePath))
-							unpacked <- unpackedImage{to: to, from: from, cleanup: cleanup, err: err}
-						} else {
-							unpacked <- unpackedImage{to: to, from: from, cleanup: func() { return }, err: nil}
-						}
-					}(bundle, img)
-				}
-				if _, ok := overwriteImageMap[img.Bundle.Package]; !ok {
-					overwriteImageMap[img.Bundle.Package] = make(map[image.Reference]string, 0)
-				}
-				for i := 0; i < len(bundles); i++ {
-					unpack := <-unpacked
-					if unpack.err != nil {
-						return unpack.err
-					}
-					overwriteImageMap[img.Bundle.Package][unpack.to] = unpack.from
-					if _, ok := unpackedImageMap[unpack.to]; ok {
-						delete(unpackedImageMap, unpack.to)
+			if overwritten == "" {
+				return fmt.Errorf("index add --overwrite-latest is only supported when using bundle images")
+			}
+			// get all bundle paths for that package - we will re-add these to regenerate the graph
+			bundles, err := querier.GetBundlesForPackage(ctx, img.Bundle.Package)
+			if err != nil {
+				return err
+			}
+			type unpackedImage struct {
+				to      image.Reference
+				from    string
+				cleanup func()
+				err     error
+			}
+			unpacked := make(chan unpackedImage)
+			for bundle := range bundles {
+				// parallelize image pulls
+				go func(bundle registry.BundleKey, img *registry.ImageInput) {
+					if bundle.CsvName != img.Bundle.Name {
+						to, from, cleanup, err := unpackImage(ctx, reg, image.SimpleReference(bundle.BundlePath))
+						unpacked <- unpackedImage{to: to, from: from, cleanup: cleanup, err: err}
+					} else {
+						unpacked <- unpackedImage{to: to, from: from, cleanup: func() { return }, err: nil}
 					}
-					defer unpack.cleanup()
+				}(bundle, img)
+			}
+			if _, ok := overwriteImageMap[img.Bundle.Package]; !ok {
+				overwriteImageMap[img.Bundle.Package] = make(map[image.Reference]string, 0)
+			}
+			for i := 0; i < len(bundles); i++ {
+				unpack := <-unpacked
+				if unpack.err != nil {
+					return unpack.err
 				}
-			} else {
-				return fmt.Errorf("index add --overwrite-latest is only supported when using bundle images")
+				overwriteImageMap[img.Bundle.Package][unpack.to] = unpack.from
+				if _, ok := unpackedImageMap[unpack.to]; ok {
+					delete(unpackedImageMap, unpack.to)
+				}
+				defer unpack.cleanup()
 			}
 		}
 	}

pkg/lib/registry/registry.go

@@ -56,9 +56,9 @@ func validateOwnedCRDs(bundle *registry.Bundle, csv *registry.ClusterServiceVers
 	for _, ownedKey := range ownedKeys {
 		if _, ok := keySet[*ownedKey]; !ok {
 			result.Add(errors.ErrInvalidBundle(fmt.Sprintf("owned CRD %s not found in bundle %q", keyToString(*ownedKey), bundle.Name), *ownedKey))
-		} else {
-			delete(keySet, *ownedKey)
+			continue
 		}
+		delete(keySet, *ownedKey)
 	}
 	// CRDs not defined in the CSV present in the bundle
 	for key := range keySet {

pkg/lib/validation/bundle.go

@@ -42,11 +42,10 @@ func (g *BundleGraphLoader) AddBundleToGraph(bundle *Bundle, graph *Package, ann
 
 	if graph.DefaultChannel == "" {
 		// Infer default channel from channel list
-		if annotations.SelectDefaultChannel() != "" {
-			graph.DefaultChannel = annotations.SelectDefaultChannel()
-		} else {
+		if annotations.SelectDefaultChannel() == "" {
 			return nil, fmt.Errorf("Default channel is missing and can't be inferred")
 		}
+		graph.DefaultChannel = annotations.SelectDefaultChannel()
 	}
 
 	// generate the DAG for each channel the new bundle is being insert into

pkg/registry/bundlegraphloader.go

@@ -645,7 +645,7 @@ func (s *SQLQuerier) GetApisForEntry(ctx context.Context, entryID int64) (provid
 	kinds := map[string]struct{}{}
 	versions := map[string]struct{}{}
 
-	providedQuery := `SELECT properties.value FROM properties 
+	providedQuery := `SELECT properties.value FROM properties
 		 	  		  INNER JOIN channel_entry ON channel_entry.operatorbundle_name = properties.operatorbundle_name
 			  		  WHERE properties.type=? AND channel_entry.entry_id=?`
 
@@ -821,11 +821,10 @@ func (s *SQLQuerier) GetBundlePathsForPackage(ctx context.Context, pkgName strin
 		if err := rows.Scan(&imgName); err != nil {
 			return nil, err
 		}
-		if imgName.Valid && imgName.String != "" {
-			images = append(images, imgName.String)
-		} else {
+		if imgName.Valid && imgName.String == "" {
 			return nil, fmt.Errorf("Index malformed: cannot find paths to bundle images")
 		}
+		images = append(images, imgName.String)
 	}
 	return images, nil
 }
@@ -1173,7 +1172,7 @@ func (s *SQLQuerier) GetDependenciesForBundle(ctx context.Context, name, version
 }
 
 func (s *SQLQuerier) GetPropertiesForBundle(ctx context.Context, name, version, path string) (properties []*api.Property, err error) {
-	propQuery := `SELECT DISTINCT type, value FROM properties 
+	propQuery := `SELECT DISTINCT type, value FROM properties
 				 WHERE operatorbundle_name=?
 				 AND (operatorbundle_version=? OR operatorbundle_version is NULL)
 				 AND (operatorbundle_path=? OR operatorbundle_path is NULL)`

pkg/sqlite/query.go

@@ -493,8 +493,6 @@ var _ = Describe("opm", func() {
 	})
 
 	Context("using podman", func() {
-		//FIXME skip podman tests due to failed to add podman to systemd sandbox cgroup
-		return
 		if err := exec.Command("podman", "info").Run(); err != nil {
 			GinkgoT().Log("container tool podman not found - skipping podman-based opm e2e tests: %s", err)
 			return

test/e2e/opm_test.go

@@ -717,15 +717,13 @@ k8s.io/apimachinery/third_party/forked/golang/json
 k8s.io/apimachinery/third_party/forked/golang/netutil
 k8s.io/apimachinery/third_party/forked/golang/reflect
 # k8s.io/apiserver v0.20.0
-## explicit
 k8s.io/apiserver/pkg/apis/apiserver
 k8s.io/apiserver/pkg/apis/apiserver/install
 k8s.io/apiserver/pkg/apis/apiserver/v1
 k8s.io/apiserver/pkg/apis/apiserver/v1alpha1
 k8s.io/apiserver/pkg/apis/apiserver/v1beta1
 k8s.io/apiserver/pkg/server/egressselector
 k8s.io/apiserver/pkg/server/egressselector/metrics
-k8s.io/apiserver/pkg/storage/names
 k8s.io/apiserver/pkg/util/webhook
 # k8s.io/client-go v0.20.0
 ## explicit