Do not validate 'volumes' until only k8s 1.17+ are supported

Signed-off-by: Anderson Silva <[email protected]>
argoproj · Apr 2, 2021 · 43c3589 · 43c3589
1 parent 858b867
commit 43c3589
Show file tree

Hide file tree

Showing 8 changed files with 8,494 additions and 18,331 deletions.
diff --git a/hack/gen-crd-spec/main.go b/hack/gen-crd-spec/main.go
@@ -262,8 +262,9 @@ func removeK8S118Fields(un *unstructured.Unstructured) {
 		setValidationOverride(un, preserveUnknownFields, "spec.template.spec.initContainers[].resources.requests")
 		setValidationOverride(un, preserveUnknownFields, "spec.template.spec.ephemeralContainers[].resources.limits")
 		setValidationOverride(un, preserveUnknownFields, "spec.template.spec.ephemeralContainers[].resources.requests")
-		setValidationOverride(un, preserveUnknownFields, "spec.template.spec.volumes[].ephemeral.volumeClaimTemplate.spec.resources.limits")
-		setValidationOverride(un, preserveUnknownFields, "spec.template.spec.volumes[].ephemeral.volumeClaimTemplate.spec.resources.requests")
+		// Replace this with "spec.template.spec.volumes[].ephemeral.volumeClaimTemplate.spec.resources.{limits/requests}"
+		// when it's ok to only support k8s 1.17+
+		setValidationOverride(un, preserveUnknownFields, "spec.template.spec.volumes")
 		validation, _, _ := unstructured.NestedMap(un.Object, "spec", "validation", "openAPIV3Schema")
 		removeFieldHelper(validation, "x-kubernetes-list-type")
 		removeFieldHelper(validation, "x-kubernetes-list-map-keys")
@@ -275,8 +276,9 @@ func removeK8S118Fields(un *unstructured.Unstructured) {
 		setValidationOverride(un, preserveUnknownFields, "spec.templates[].template.spec.initContainers[].resources.requests")
 		setValidationOverride(un, preserveUnknownFields, "spec.templates[].template.spec.ephemeralContainers[].resources.limits")
 		setValidationOverride(un, preserveUnknownFields, "spec.templates[].template.spec.ephemeralContainers[].resources.requests")
-		setValidationOverride(un, preserveUnknownFields, "spec.templates[].template.spec.volumes[].ephemeral.volumeClaimTemplate.spec.resources.limits")
-		setValidationOverride(un, preserveUnknownFields, "spec.templates[].template.spec.volumes[].ephemeral.volumeClaimTemplate.spec.resources.requests")
+		// Replace this with "spec.templates[].template.spec.volumes[].ephemeral.volumeClaimTemplate.spec.resources.{limits/requests}"
+		// when it's ok to only support k8s 1.17+
+		setValidationOverride(un, preserveUnknownFields, "spec.templates[].template.spec.volumes")
 		validation, _, _ := unstructured.NestedMap(un.Object, "spec", "validation", "openAPIV3Schema")
 		removeFieldHelper(validation, "x-kubernetes-list-type")
 		removeFieldHelper(validation, "x-kubernetes-list-map-keys")
@@ -288,8 +290,9 @@ func removeK8S118Fields(un *unstructured.Unstructured) {
 		setValidationOverride(un, preserveUnknownFields, "spec.metrics[].provider.job.spec.template.spec.initContainers[].resources.requests")
 		setValidationOverride(un, preserveUnknownFields, "spec.metrics[].provider.job.spec.template.spec.ephemeralContainers[].resources.limits")
 		setValidationOverride(un, preserveUnknownFields, "spec.metrics[].provider.job.spec.template.spec.ephemeralContainers[].resources.requests")
-		setValidationOverride(un, preserveUnknownFields, "spec.metrics[].provider.job.spec.template.spec.volumes[].ephemeral.volumeClaimTemplate.spec.resources.limits")
-		setValidationOverride(un, preserveUnknownFields, "spec.metrics[].provider.job.spec.template.spec.volumes[].ephemeral.volumeClaimTemplate.spec.resources.requests")
+		// Replace this with "spec.metrics[].provider.job.spec.template.spec.volumes[].ephemeral.volumeClaimTemplate.spec.resources.{limits/requests}"
+		// when it's ok to only support k8s 1.17+
+		setValidationOverride(un, preserveUnknownFields, "spec.metrics[].provider.job.spec.template.spec.volumes")
 		validation, _, _ := unstructured.NestedMap(un.Object, "spec", "validation", "openAPIV3Schema")
 		removeFieldHelper(validation, "x-kubernetes-list-type")
 		removeFieldHelper(validation, "x-kubernetes-list-map-keys")

diff --git a/manifests/crds/analysis-run-crd.yaml b/manifests/crds/analysis-run-crd.yaml
diff --git a/manifests/crds/analysis-template-crd.yaml b/manifests/crds/analysis-template-crd.yaml
diff --git a/manifests/crds/cluster-analysis-template-crd.yaml b/manifests/crds/cluster-analysis-template-crd.yaml
diff --git a/manifests/crds/experiment-crd.yaml b/manifests/crds/experiment-crd.yaml
diff --git a/manifests/crds/rollout-crd.yaml b/manifests/crds/rollout-crd.yaml
diff --git a/manifests/install.yaml b/manifests/install.yaml
diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml