From 82aaa30659f354d13f02189fe78d39cbe49b1200 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Thu, 22 Jul 2021 12:09:25 +0300 Subject: [PATCH] fix: Make CRDs compatible with OpenShift 3.11 (#961) Signed-off-by: Anatolii Bazko --- Makefile | 3 +++ ....eclipse.che_chebackupserverconfigurations_crd-v1beta1.yaml | 1 - .../bases/org.eclipse.che_checlusterbackups_crd-v1beta1.yaml | 1 - config/crd/bases/org_v1_che_crd-v1beta1.yaml | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d33513694..fadafb66e 100644 --- a/Makefile +++ b/Makefile @@ -239,6 +239,9 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust 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_CRD_V1BETA1)" + yq -rYi "del(.spec.validation.openAPIV3Schema.type)" "$(ECLIPSE_CHE_BACKUP_SERVER_CONFIGURATION_CRD_V1BETA1)" + yq -rYi "del(.spec.validation.openAPIV3Schema.type)" "$(ECLIPSE_CHE_BACKUP_CRD_V1BETA1)" yq -rYi "del(.spec.validation.openAPIV3Schema.type)" "$(ECLIPSE_CHE_RESTORE_CRD_V1BETA1)" # remove "required" attributes from v1beta1 crd files diff --git a/config/crd/bases/org.eclipse.che_chebackupserverconfigurations_crd-v1beta1.yaml b/config/crd/bases/org.eclipse.che_chebackupserverconfigurations_crd-v1beta1.yaml index b1214473b..440ae51dc 100644 --- a/config/crd/bases/org.eclipse.che_chebackupserverconfigurations_crd-v1beta1.yaml +++ b/config/crd/bases/org.eclipse.che_chebackupserverconfigurations_crd-v1beta1.yaml @@ -131,7 +131,6 @@ spec: description: CheBackupServerConfigurationStatus defines the observed state of CheBackupServerConfiguration type: object - type: object version: v1 versions: - name: v1 diff --git a/config/crd/bases/org.eclipse.che_checlusterbackups_crd-v1beta1.yaml b/config/crd/bases/org.eclipse.che_checlusterbackups_crd-v1beta1.yaml index 2060c76a9..c60f99f95 100644 --- a/config/crd/bases/org.eclipse.che_checlusterbackups_crd-v1beta1.yaml +++ b/config/crd/bases/org.eclipse.che_checlusterbackups_crd-v1beta1.yaml @@ -71,7 +71,6 @@ spec: description: 'Backup progress state: InProgress, Failed, Succeeded' type: string type: object - type: object version: v1 versions: - name: v1 diff --git a/config/crd/bases/org_v1_che_crd-v1beta1.yaml b/config/crd/bases/org_v1_che_crd-v1beta1.yaml index ff8cb8e32..f9027af7f 100644 --- a/config/crd/bases/org_v1_che_crd-v1beta1.yaml +++ b/config/crd/bases/org_v1_che_crd-v1beta1.yaml @@ -1051,7 +1051,6 @@ spec: the Pod is in this state. type: string type: object - type: object version: v1 versions: - name: v1