Merge branch 'master' into master

Author: fredbalves86

DOWNSTREAM_OWNERS

@@ -0,0 +1,25 @@
+approvers:
+  - dinhxuanvu
+  - kevinrizza
+  - anik120
+  - awgreene
+  - ankitathomas
+  - joelanford
+  - perdasilva
+  - oceanc80
+  - grokspawn
+  - tmshort
+  - ncdc
+reviewers:
+  - dinhxuanvu
+  - kevinrizza
+  - anik120
+  - awgreene
+  - ankitathomas
+  - joelanford
+  - perdasilva
+  - oceanc80
+  - grokspawn
+  - tmshort
+  - ncdc
+component: "OLM"

Makefile

@@ -105,7 +105,7 @@ bin/cpb: FORCE
 	CGO_ENABLED=0 go build $(GO_BUILD_OPTS) -ldflags '-extldflags "-static"' -o $@ github.com/operator-framework/operator-lifecycle-manager/util/cpb
 
 unit/olm: bin/kubebuilder
-	echo "Running the OLM unit tests"
+	@echo "Running the OLM unit tests"
 	$(MAKE) unit WHAT=operator-lifecycle-manager
 
 unit/registry:
@@ -139,15 +139,18 @@ vendor:
 manifests: ## Generate manifests
 	OLM_VERSION=$(OLM_VERSION) ./scripts/generate_crds_manifests.sh
 
+.PHONY: generate-manifests
+generate-manifests: OLM_VERSION=0.0.1-snapshot
+generate-manifests: manifests
+
 .PHONY: diff
 diff:
 	git diff --stat HEAD --ignore-submodules --exit-code
 
 verify-vendor: vendor
 	$(MAKE) diff
 
-verify-manifests: OLM_VERSION=0.19.0 # set static version to avoid failing for commit based versioning
-verify-manifests: manifests
+verify-manifests: generate-manifests
 	$(MAKE) diff
 
 verify-nested-vendor:
@@ -157,32 +160,33 @@ verify-nested-vendor:
 verify-commits:
 	./scripts/verify_commits.sh $(PULL_BASE_SHA) # see https://github.com/kubernetes/test-infra/blob/master/prow/jobs.md#job-environment-variables
 
+# Update scripts/sync_pop_candidate.sh if anything is changed in this recipe
 .PHONY: verify
 verify:
-	echo "Checking for unstaged root vendor changes"
+	@echo "Checking for unstaged root vendor changes"
 	$(MAKE) verify-vendor
-	echo "Checking whether the CVO manifests need to be generated"
+	@echo "Checking whether the CVO manifests need to be generated"
 	$(MAKE) verify-manifests
-	echo "Checking for unsynced nested [go.mod,go.sum] files"
+	@echo "Checking for unsynced nested [go.mod,go.sum] files"
 	$(MAKE) verify-nested-vendor
-	echo "Checking commit integrity"
+	@echo "Checking commit integrity"
 	$(MAKE) verify-commits
 
 .PHONY: crc-start
 crc-start:
-	echo "Starting CRC"
+	@echo "Starting CRC"
 	./scripts/crc-start.sh
 
 .PHONY: crc-build
 crc-build:
-	echo "Building olm image"
+	@echo "Building olm image"
 	IMG="olm:test" $(MAKE) build/olm-container
-	echo "Building opm image"
+	@echo "Building opm image"
 	IMG="opm:test" $(MAKE) build/registry-container
 
 .PHONY: crc-deploy
 crc-deploy:
-	echo "Deploying OLM"
+	@echo "Deploying OLM"
 	./scripts/crc-deploy.sh
 
 .PHONY: crc

README.md

@@ -1,3 +1,16 @@
 # operator-framework-olm
 
-This repository is a monorepo superset of the projects that comprises the Operator Lifecycle Manager runtime and tooling for use with Openshift.
+This repository is a monorepo superset of the projects that comprises the
+Operator Lifecycle Manager runtime and tooling for use with Openshift.
+
+The upstream projects are:
+* [api](https://github.com/operator-framework/api)
+* [operator-registry](https://github.com/operator-framework/operator-registry)
+* [operator-lifecycle-manager](https://github.com/operator-framework/operator-lifecycle-manager)
+
+These projects are located in the `staging` directory. Changes to the
+contents of the `staging` directory need to be made upstream first (links
+above), and then downstreamed to this repository.
+
+Please refer to the [scripts README.md](scripts/README.md) to learn how to
+downstream commits from those projects to this repo.

base.Dockerfile

@@ -1,6 +1,6 @@
 # Dockerfile to bootstrap build and test in openshift-ci
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.11
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14
 
 ARG KUBEBUILDER_RELEASE=2.3.1
 # Install test dependencies

cmd/package-server-manager/main.go

@@ -13,6 +13,7 @@ import (
 
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
@@ -27,6 +28,7 @@ const (
 	defaultNamespace            = "openshift-operator-lifecycle-manager"
 	defaultMetricsPort          = "0"
 	defaultHealthCheckPort      = ":8080"
+	defaultPprofPort            = ":6060"
 	leaderElectionConfigmapName = "packageserver-controller-lock"
 )
 
@@ -56,6 +58,10 @@ func run(cmd *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
+	pprofAddr, err := cmd.Flags().GetString("pprof")
+	if err != nil {
+		return err
+	}
 
 	ctrl.SetLogger(zap.New(zap.UseDevMode(true)))
 	setupLog := ctrl.Log.WithName("setup")
@@ -75,13 +81,14 @@ func run(cmd *cobra.Command, args []string) error {
 		RenewDeadline:           &le.RenewDeadline.Duration,
 		RetryPeriod:             &le.RetryPeriod.Duration,
 		HealthProbeBindAddress:  healthCheckAddr,
-		NewCache: cache.BuilderWithOptions(cache.Options{
-			SelectorsByObject: cache.SelectorsByObject{
+		PprofBindAddress:        pprofAddr,
+		Cache: cache.Options{
+			ByObject: map[client.Object]cache.ByObject{
 				&olmv1alpha1.ClusterServiceVersion{}: {
 					Field: packageserverCSVFields.AsSelector(),
 				},
 			},
-		}),
+		},
 	})
 	if err != nil {
 		setupLog.Error(err, "failed to setup manager instance")

cmd/package-server-manager/start.go

@@ -15,6 +15,7 @@ func newStartCmd() *cobra.Command {
 	cmd.Flags().String("name", defaultName, "configures the metadata.name for the packageserver csv resource")
 	cmd.Flags().String("namespace", defaultNamespace, "configures the metadata.namespace that contains the packageserver csv resource")
 	cmd.Flags().String("health", defaultHealthCheckPort, "configures the health check port that the kubelet is configured to probe")
+	cmd.Flags().String("pprof", defaultPprofPort, "configures the pprof port that the process exposes")
 	cmd.Flags().Bool("disable-leader-election", false, "configures whether leader election will be disabled")
 
 	return cmd