Skip to content
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.

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

fix: Make CRDs compatible with OpenShift 3.11 #961

Merged
merged 1 commit into from
Jul 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ spec:
description: CheBackupServerConfigurationStatus defines the observed state
of CheBackupServerConfiguration
type: object
type: object
version: v1
versions:
- name: v1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ spec:
description: 'Backup progress state: InProgress, Failed, Succeeded'
type: string
type: object
type: object
version: v1
versions:
- name: v1
Expand Down
1 change: 0 additions & 1 deletion config/crd/bases/org_v1_che_crd-v1beta1.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1051,7 +1051,6 @@ spec:
the Pod is in this state.
type: string
type: object
type: object
version: v1
versions:
- name: v1
Expand Down