Merge pull request #1542 from benluddy/release-fixes

Fix duplicated CRDs in quickstart manifests.

Author: openshift-merge-robot

.github/workflows/quickstart.yml

@@ -0,0 +1,23 @@
+name: release-checks
+on:
+  pull_request:
+    paths:
+    - 'deploy/upstream/quickstart/**'
+jobs:
+  install-quickstart:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - 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/
+        curl -LO "https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl"
+        chmod +x kubectl
+        sudo mv kubectl /bin/
+        kind create cluster
+        kind export kubeconfig
+        kubectl apply -f deploy/upstream/quickstart/crds.yaml
+        kubectl wait --timeout=5m --for=condition=Established crd $(kubectl get crd --output=jsonpath='{.items[*].metadata.name}')
+        kubectl apply -f deploy/upstream/quickstart/olm.yaml
+        kubectl wait --timeout=5m --for=condition=Available -n olm deploy olm-operator catalog-operator packageserver

Makefile

@@ -224,7 +224,7 @@ endif
 	./scripts/package_release.sh $(ver) deploy/$(target)/manifests/$(ver) deploy/$(target)/values.yaml
 	ln -sfFn ./$(ver) deploy/$(target)/manifests/latest
 ifeq ($(quickstart), true)
-	./scripts/package_quickstart.sh deploy/$(target)/manifests/$(ver) deploy/chart/crds deploy/$(target)/quickstart/olm.yaml deploy/$(target)/quickstart/crds.yaml deploy/$(target)/quickstart/install.sh
+	./scripts/package_quickstart.sh deploy/$(target)/manifests/$(ver) deploy/$(target)/quickstart/olm.yaml deploy/$(target)/quickstart/crds.yaml deploy/$(target)/quickstart/install.sh
 endif
 
 .PHONY: run-console-local

deploy/chart/crds/0000_50_olm_00-catalogsources.yaml renamed to deploy/chart/crds/0000_50_olm_00-catalogsources.crd.yaml

@@ -1,5 +1,5 @@
 ---
-# Source: olm/crds/0000_50_olm_00-catalogsources.yaml
+# Source: olm/crds/0000_50_olm_00-catalogsources.crd.yaml
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:

deploy/chart/crds/0000_50_olm_00-clusterserviceversions.yaml renamed to deploy/chart/crds/0000_50_olm_00-clusterserviceversions.crd.yaml

@@ -1,5 +1,5 @@
 ---
-# Source: olm/crds/0000_50_olm_00-clusterserviceversions.yaml
+# Source: olm/crds/0000_50_olm_00-clusterserviceversions.crd.yaml
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:

deploy/chart/crds/0000_50_olm_00-installplans.yaml renamed to deploy/chart/crds/0000_50_olm_00-installplans.crd.yaml

@@ -1,5 +1,5 @@
 ---
-# Source: olm/crds/0000_50_olm_00-installplans.yaml
+# Source: olm/crds/0000_50_olm_00-installplans.crd.yaml
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata: