Merge branch 'master' into ci/add-resource-debugging-support

Author: timflannagan

.github/PULL_REQUEST_TEMPLATE.md

@@ -8,17 +8,35 @@ Note: Make sure your branch is rebased to the latest upstream master.
 
 **Description of the change:**
 
-
 **Motivation for the change:**
 
+**Architectural changes:**
+
+<!--
+If necessary, briefly describe any architectural changes, other options considered, and/or link to any EPs or design docs
+-->
+
+**Testing remarks:**
+
+<!--
+Call out any information around how you've tested the code change that may be useful for reviewers. For instance:
+ * any edge-cases you have (dis)covered
+ * how you have reproduced and tested for regressions in bug fixes
+ * how you've tested for flakes in e2e tests or flake fixes
+-->
+
 **Reviewer Checklist**
 - [ ] Implementation matches the proposed design, or proposal is updated to match implementation
 - [ ] Sufficient unit test coverage
 - [ ] Sufficient end-to-end test coverage
+- [ ] Bug fixes are accompanied by regression test(s)
+- [ ] e2e tests and flake fixes are accompanied evidence of flake testing, e.g. executing the test 100(0) times
+- [ ] tech debt/todo is accompanied by issue link(s) in comments in the surrounding code
+- [ ] Tests are comprehensible, e.g. Ginkgo DSL is being used appropriately
 - [ ] Docs updated or added to `/doc`
 - [ ] Commit messages sensible and descriptive
-- [ ] Tests marked as `[FLAKE]` are truly flaky
-- [ ] Tests that remove the `[FLAKE]` tag are no longer flaky
+- [ ] Tests marked as `[FLAKE]` are truly flaky and have an issue
+- [ ] Code is properly formatted
 
 
 <!--

.github/workflows/e2e-tests.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-go@v2
         with:
-          go-version: '~1.17'
+          go-version: '~1.18'
       - run: mkdir -p artifacts
       - run: make e2e-local E2E_TEST_CHUNK=${{ matrix.parallel-id }} E2E_TEST_NUM_CHUNKS=${{ strategy.job-total }} E2E_NODES=2 ARTIFACT_DIR=./artifacts/ SKIP='\[FLAKE\]'
       - name: Archive Test Artifacts # test results, failed or not, are always uploaded.

.github/workflows/flaky-e2e.yml

@@ -14,12 +14,12 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-go@v2
         with:
-          go-version: '~1.17'
+          go-version: '~1.18'
       - run: mkdir -p artifacts
       - run: make e2e-local E2E_NODES=1 TEST='\[FLAKE\]' ARTIFACT_DIR=./artifacts/
       - name: Archive Test Artifacts # test results, failed or not, are always uploaded.
         if: ${{ always() }}
         uses: actions/upload-artifact@v2
         with:
           name: e2e-test-output-${{(github.event.pull_request.head.sha||github.sha)}}-${{ github.run_id }}
-          path: ${{ github.workspace }}/bin/artifacts/*
+          path: ${{ github.workspace }}/bin/artifacts/*

.github/workflows/goreleaser.yaml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: '~1.17'
+          go-version: '~1.18'
 
       - name: Get the image tag
         if: startsWith(github.ref, 'refs/tags')

.github/workflows/run-kind-local.yml

@@ -11,7 +11,7 @@ jobs:
     - uses: actions/checkout@v1
     - uses: actions/setup-go@v2
       with:
-        go-version: '~1.17'
+        go-version: '~1.18'
     - name: Install kind
       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')"

.github/workflows/run-minikube-local.yml

@@ -11,7 +11,7 @@ jobs:
     - uses: actions/checkout@v1
     - uses: actions/setup-go@v2
       with:
-        go-version: '~1.17'
+        go-version: '~1.18'
     - name: Install minikube
       run: |
         sudo apt-get install conntrack

.github/workflows/sanity.yaml

@@ -12,7 +12,7 @@ jobs:
     - uses: actions/checkout@v1
     - uses: actions/setup-go@v2
       with:
-        go-version: '~1.17'
+        go-version: '~1.18'
     - name: Run sanity checks
       run: make vendor && make diff
   lint:
@@ -22,4 +22,4 @@ jobs:
     - name: Run linting checks
       uses: "golangci/golangci-lint-action@v2"
       with:
-        version: "v1.45.2"
+        version: "v1.46.0"

.github/workflows/unit.yml

@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-go@v2
         with:
-          go-version: '~1.17'
+          go-version: '~1.18'
       - name: Envtest setup
         run: |
           go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest

.github/workflows/verify.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v1
       - uses: actions/setup-go@v2
         with:
-          go-version: '~1.17'
+          go-version: '~1.18'
 
         # Note(tflannag): We need to explicitly setup the GOPATH as the generate-internal-groups.sh
         # codegen script still relies on $GOPATH being set and will return an error otherwise.

.goreleaser.yml

@@ -132,3 +132,13 @@ changelog:
       - '^test:'
 release:
   draft: true
+  header: |
+    ## Install
+
+    ### Scripted
+
+    ```
+    curl -L https://github.com/operator-framework/operator-lifecycle-manager/releases/download/{{ .Tag }}/install.sh -o install.sh
+    chmod +x install.sh
+    ./install.sh {{ .Tag }}
+    ```

Makefile

@@ -132,7 +132,7 @@ E2E_TEST_NUM_CHUNKS ?= 4
 ifneq (all,$(E2E_TEST_CHUNK))
 TEST := $(shell go run ./test/e2e/split/... -chunks $(E2E_TEST_NUM_CHUNKS) -print-chunk $(E2E_TEST_CHUNK) ./test/e2e)
 endif
-E2E_OPTS ?= $(if $(E2E_SEED),-seed '$(E2E_SEED)') $(if $(SKIP), -skip '$(SKIP)') $(if $(TEST),-focus '$(TEST)') $(if $(ARTIFACT_DIR), -junit-report '$(ARTIFACT_DIR)junit_e2e.xml') -flake-attempts $(E2E_FLAKE_ATTEMPTS) -nodes $(E2E_NODES) -timeout $(E2E_TIMEOUT) -v -randomize-suites -race -trace -progress
+E2E_OPTS ?= $(if $(E2E_SEED),-seed '$(E2E_SEED)') $(if $(SKIP), -skip '$(SKIP)') $(if $(TEST),-focus '$(TEST)') $(if $(ARTIFACT_DIR), -output-dir $(ARTIFACT_DIR) -junit-report junit_e2e.xml) -flake-attempts $(E2E_FLAKE_ATTEMPTS) -nodes $(E2E_NODES) -timeout $(E2E_TIMEOUT) -v -randomize-suites -race -trace -progress
 E2E_INSTALL_NS ?= operator-lifecycle-manager
 E2E_TEST_NS ?= operators
 
@@ -230,9 +230,6 @@ release: manifests
 	docker pull $(IMAGE_REPO):$(ver)
 	$(MAKE) target=upstream ver=$(ver) quickstart=true package
 
-verify-release: release
-	$(MAKE) diff
-
 package: olmref=$(shell docker inspect --format='{{index .RepoDigests 0}}' $(IMAGE_REPO):$(ver))
 package:
 ifndef target

OWNERS

@@ -25,3 +25,4 @@ reviewers:
   - timflannagan
   - perdasilva
   - akihikokuroda
+  - oceanc80

cmd/catalog/main.go

@@ -9,9 +9,9 @@ import (
 
 	configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
 	"github.com/sirupsen/logrus"
-	utilclock "k8s.io/apimachinery/pkg/util/clock"
 	k8sscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/clientcmd"
+	utilclock "k8s.io/utils/clock"
 
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog"

cmd/olm/main.go

@@ -60,6 +60,9 @@ var (
 	tlsKeyPath = pflag.String(
 		"tls-key", "", "Path to use for private key (requires tls-cert)")
 
+	protectedCopiedCSVNamespaces = pflag.String("protectedCopiedCSVNamespaces",
+		"", "A comma-delimited set of namespaces where global Copied CSVs will always appear, even if Copied CSVs are disabled")
+
 	tlsCertPath = pflag.String(
 		"tls-cert", "", "Path to use for certificate key (requires tls-key)")
 
@@ -162,6 +165,7 @@ func main() {
 		olm.WithOperatorClient(opClient),
 		olm.WithRestConfig(config),
 		olm.WithConfigClient(versionedConfigClient),
+		olm.WithProtectedCopiedCSVNamespaces(*protectedCopiedCSVNamespaces),
 	)
 	if err != nil {
 		logger.WithError(err).Fatal("error configuring operator")