From 430b4d0f172f849369e18002ca075a37301d6470 Mon Sep 17 00:00:00 2001 From: cliveseldon Date: Thu, 16 Jul 2020 23:09:00 +0100 Subject: [PATCH] Revert CRD status exception and remove status from Seldon CRD (#1389) --- seldon/seldon-core-operator/base/resources.yaml | 6 ------ ...inition_seldondeployments.machinelearning.seldon.io.yaml | 6 ------ ...inition_seldondeployments.machinelearning.seldon.io.yaml | 6 ------ tests/validate_resources_test.go | 5 ----- 4 files changed, 23 deletions(-) diff --git a/seldon/seldon-core-operator/base/resources.yaml b/seldon/seldon-core-operator/base/resources.yaml index c0d2622bb5..dd8eb9728e 100644 --- a/seldon/seldon-core-operator/base/resources.yaml +++ b/seldon/seldon-core-operator/base/resources.yaml @@ -4238,12 +4238,6 @@ spec: - name: v1alpha3 served: true storage: false -status: - acceptedNames: - kind: '' - plural: '' - conditions: [] - storedVersions: [] --- # Source: seldon-core-operator/templates/clusterrole_seldon-manager-role.yaml apiVersion: rbac.authorization.k8s.io/v1 diff --git a/tests/stacks/ibm/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_seldondeployments.machinelearning.seldon.io.yaml b/tests/stacks/ibm/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_seldondeployments.machinelearning.seldon.io.yaml index 14c05f622b..f0537881d4 100644 --- a/tests/stacks/ibm/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_seldondeployments.machinelearning.seldon.io.yaml +++ b/tests/stacks/ibm/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_seldondeployments.machinelearning.seldon.io.yaml @@ -6920,9 +6920,3 @@ spec: - name: v1alpha3 served: true storage: false -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/tests/tests/legacy_kustomizations/seldon-core-operator/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_seldondeployments.machinelearning.seldon.io.yaml b/tests/tests/legacy_kustomizations/seldon-core-operator/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_seldondeployments.machinelearning.seldon.io.yaml index 889eff05ce..ce87cc51fd 100644 --- a/tests/tests/legacy_kustomizations/seldon-core-operator/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_seldondeployments.machinelearning.seldon.io.yaml +++ b/tests/tests/legacy_kustomizations/seldon-core-operator/test_data/expected/apiextensions.k8s.io_v1beta1_customresourcedefinition_seldondeployments.machinelearning.seldon.io.yaml @@ -6922,9 +6922,3 @@ spec: - name: v1alpha3 served: true storage: false -status: - acceptedNames: - kind: "" - plural: "" - conditions: [] - storedVersions: [] diff --git a/tests/validate_resources_test.go b/tests/validate_resources_test.go index 47048524c2..da2128a18c 100644 --- a/tests/validate_resources_test.go +++ b/tests/validate_resources_test.go @@ -229,11 +229,6 @@ func TestValidK8sResources(t *testing.T) { t.Errorf("Path %v; resource %v; has version and kind %v which should be changed to %v", path, m.Name, vAndK, v) } - //Skip Custom resource Definitions as they can have a status field - if m.Kind == "CustomResourceDefinition" { - continue - } - // Ensure status isn't set f := n.Field("status")