From 37d0f4bfcab35e1b51fa506fc5baf71d7eb0299b Mon Sep 17 00:00:00 2001 From: David Festal Date: Mon, 16 Dec 2019 14:56:57 +0100 Subject: [PATCH] Fix a CRD change that is incompatible with OS 3.11 (#140) * Fix a CRD change that is incompatible with OS 3.11 * Update Readme Signed-off-by: David Festal --- deploy/crds/org_v1_che_crd.yaml | 3 --- olm/README.md | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/deploy/crds/org_v1_che_crd.yaml b/deploy/crds/org_v1_che_crd.yaml index 77ee8f81a..a31d671b8 100644 --- a/deploy/crds/org_v1_che_crd.yaml +++ b/deploy/crds/org_v1_che_crd.yaml @@ -24,8 +24,6 @@ spec: status: {} validation: openAPIV3Schema: - description: The `CheCluster` custom resource allows defining and managing a - Che server installation properties: apiVersion: description: 'APIVersion defines the versioned schema of this representation @@ -499,7 +497,6 @@ spec: the pod is in this state. type: string type: object - type: object version: v1 versions: - name: v1 diff --git a/olm/README.md b/olm/README.md index 83a9a501a..4937806bf 100644 --- a/olm/README.md +++ b/olm/README.md @@ -5,6 +5,8 @@ OLM packages scripts are using some required dependencies that need to be instal - [https://github.com/kislyuk/yq](https://github.com/kislyuk/yq) and not [http://mikefarah.github.io/yq/](http://mikefarah.github.io/yq/) - [Operator SDK v0.10.0](https://github.com/operator-framework/operator-sdk/blob/v0.10.0/doc/user/install-operator-sdk.md) +WARNING: Please make sure to use the precise `v0.10.0` version of the `operator-sdk`. If you use a more recent version, you might generate a CRD that is not compatible with Kubernetes 1.11 and Openshift 3.11 (see issue https://github.com/eclipse/che/issues/15396). + If these dependencies are not installed, `docker-run.sh` can be used as a container bootstrap to run a given script with the appropriate dependencies. Example : `$ docker-run.sh update-nightly-olm-files.sh`