Skip to content

Fix duplicated CRDs in quickstart manifests. #1542

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 4 commits into from
Jun 4, 2020
Merged

Fix duplicated CRDs in quickstart manifests. #1542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee8492e
Don't put CRD manifests into olm.yaml.
benluddy May 22, 2020
dce33a2
Preserve .crd.yaml suffix for manifests copied from api.
benluddy May 22, 2020
9f79161
Remove CRD manifests from 0.15.1 quickstart's olm.yaml.
benluddy May 22, 2020
bb104a3
Add test for release installation instructions.
benluddy May 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .github/workflows/quickstart.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Copy Markdown
Member

@kevinrizza kevinrizza Jun 1, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 ...t/crds/0000_50_olm_00-catalogsources.yaml → ...ds/0000_50_olm_00-catalogsources.crd.yaml
View file
Open in desktop
File renamed without changes.
0 ...000_50_olm_00-clusterserviceversions.yaml → ...50_olm_00-clusterserviceversions.crd.yaml
View file
Open in desktop
File renamed without changes.
0 ...art/crds/0000_50_olm_00-installplans.yaml → ...crds/0000_50_olm_00-installplans.crd.yaml
View file
Open in desktop
File renamed without changes.
0 ...t/crds/0000_50_olm_00-operatorgroups.yaml → ...ds/0000_50_olm_00-operatorgroups.crd.yaml
View file
Open in desktop
File renamed without changes.
0 ...rt/crds/0000_50_olm_00-subscriptions.yaml → ...rds/0000_50_olm_00-subscriptions.crd.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...0.15.1/0000_50_olm_00-catalogsources.yaml → ....1/0000_50_olm_00-catalogsources.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...000_50_olm_00-clusterserviceversions.yaml → ...50_olm_00-clusterserviceversions.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...s/0.15.1/0000_50_olm_00-installplans.yaml → ...15.1/0000_50_olm_00-installplans.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...0.15.1/0000_50_olm_00-operatorgroups.yaml → ....1/0000_50_olm_00-operatorgroups.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# Source: olm/crds/0000_50_olm_00-operatorgroups.yaml
# Source: olm/crds/0000_50_olm_00-operatorgroups.crd.yaml
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
2 changes: 1 addition & 1 deletion .../0.15.1/0000_50_olm_00-subscriptions.yaml → ...5.1/0000_50_olm_00-subscriptions.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# Source: olm/crds/0000_50_olm_00-subscriptions.yaml
# Source: olm/crds/0000_50_olm_00-subscriptions.crd.yaml
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
2 changes: 1 addition & 1 deletion ...0.15.1/0000_50_olm_00-catalogsources.yaml → ....1/0000_50_olm_00-catalogsources.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...000_50_olm_00-clusterserviceversions.yaml → ...50_olm_00-clusterserviceversions.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...s/0.15.1/0000_50_olm_00-installplans.yaml → ...15.1/0000_50_olm_00-installplans.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ...0.15.1/0000_50_olm_00-operatorgroups.yaml → ....1/0000_50_olm_00-operatorgroups.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# Source: olm/crds/0000_50_olm_00-operatorgroups.yaml
# Source: olm/crds/0000_50_olm_00-operatorgroups.crd.yaml
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
2 changes: 1 addition & 1 deletion .../0.15.1/0000_50_olm_00-subscriptions.yaml → ...5.1/0000_50_olm_00-subscriptions.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
# Source: olm/crds/0000_50_olm_00-subscriptions.yaml
# Source: olm/crds/0000_50_olm_00-subscriptions.crd.yaml
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
Expand Down
5 changes: 5 additions & 0 deletions deploy/upstream/quickstart/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,7 @@ status:
plural: ""
conditions: []
storedVersions: []

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -9147,6 +9148,7 @@ status:
plural: ""
conditions: []
storedVersions: []

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -9453,6 +9455,7 @@ status:
plural: ""
conditions: []
storedVersions: []

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -9764,6 +9767,7 @@ status:
plural: ""
conditions: []
storedVersions: []

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
Expand Down Expand Up @@ -11604,3 +11608,4 @@ status:
plural: ""
conditions: []
storedVersions: []

Loading