From f65e5b0cff3fd7bf4a5c35a7b1bdb7dd6a20295d Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Wed, 21 Jul 2021 18:40:20 +0300 Subject: [PATCH] fix: Make CRD file compatible with OpenShift 3.11 (#957) Signed-off-by: Anatolii Bazko --- Makefile | 3 +++ .../bases/org.eclipse.che_checlusterrestores_crd-v1beta1.yaml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0789e05c6..dc6885a52 100644 --- a/Makefile +++ b/Makefile @@ -234,6 +234,9 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust yq -rYi ".spec.subresources.status = {}" "$(ECLIPSE_CHE_BACKUP_CRD_V1BETA1)" yq -rYi ".spec.subresources.status = {}" "$(ECLIPSE_CHE_RESTORE_CRD_V1BETA1)" + # remove .spec.validation.openAPIV3Schema.type field + yq -rYi "del(.spec.validation.openAPIV3Schema.type)" "$(ECLIPSE_CHE_RESTORE_CRD_V1BETA1)" + # remove "required" attributes from v1beta1 crd files $(MAKE) removeRequiredAttribute "filePath=$(ECLIPSE_CHE_CRD_V1BETA1)" $(MAKE) removeRequiredAttribute "filePath=$(ECLIPSE_CHE_BACKUP_SERVER_CONFIGURATION_CRD_V1BETA1)" diff --git a/config/crd/bases/org.eclipse.che_checlusterrestores_crd-v1beta1.yaml b/config/crd/bases/org.eclipse.che_checlusterrestores_crd-v1beta1.yaml index 9d44146f7..4d8c8b48d 100644 --- a/config/crd/bases/org.eclipse.che_checlusterrestores_crd-v1beta1.yaml +++ b/config/crd/bases/org.eclipse.che_checlusterrestores_crd-v1beta1.yaml @@ -65,7 +65,6 @@ spec: description: 'Restore progress state: InProgress, Failed, Succeeded' type: string type: object - type: object version: v1 versions: - name: v1