Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added field to preserve fields during CRD validation (#1818)

Browse Source
This commit is contained in:
Rahul Bhati
2020-10-13 12:38:24 +05:30
committed by GitHub
parent ec22e22bbd
commit d975534bf7
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/crd/crdvalidations.go
+12 -8
View File
@@ -371,12 +371,14 @@ var (
Description: "Image for containing the language runtime.", Description: "Image for containing the language runtime.",
}, },
"container": { "container": {
Type: "object", Type: "object",
Description: "(Optional) Container allows the modification of the deployed runtime container using the Kubernetes Container spec. Fission overrides the following fields: Name, Image (set to the Runtime.Image), TerminationMessagePath, ImagePullPolicy\n You can set either PodSpec or Container, but not both.", Description: "(Optional) Container allows the modification of the deployed runtime container using the Kubernetes Container spec. Fission overrides the following fields: Name, Image (set to the Runtime.Image), TerminationMessagePath, ImagePullPolicy\n You can set either PodSpec or Container, but not both.",
XPreserveUnknownFields: boolPtr(true),
}, },
"podspec": { "podspec": {
Type: "object", Type: "object",
Description: "(Optional) Podspec allows modification of deployed runtime pod with Kubernetes PodSpec.\n You can set either PodSpec or Container, but not both.\n More info for podspec:\n https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#podspec-v1-core", Description: "(Optional) Podspec allows modification of deployed runtime pod with Kubernetes PodSpec.\n You can set either PodSpec or Container, but not both.\n More info for podspec:\n https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#podspec-v1-core",
XPreserveUnknownFields: boolPtr(true),
}, },
} }
runtimeSchema = apiextensionsv1beta1.JSONSchemaProps{ runtimeSchema = apiextensionsv1beta1.JSONSchemaProps{
@@ -396,12 +398,14 @@ var (
Description: "(Optional) Default build command to run for this build environment.", Description: "(Optional) Default build command to run for this build environment.",
}, },
"container": { "container": {
Type: "object", Type: "object",
Description: "(Optional) Container allows the modification of the deployed runtime container using the Kubernetes Container spec. Fission overrides the following fields: Name, Image (set to the Runtime.Image), TerminationMessagePath, ImagePullPolicy\n You can set either PodSpec or Container, but not both.", Description: "(Optional) Container allows the modification of the deployed runtime container using the Kubernetes Container spec. Fission overrides the following fields: Name, Image (set to the Runtime.Image), TerminationMessagePath, ImagePullPolicy\n You can set either PodSpec or Container, but not both.",
XPreserveUnknownFields: boolPtr(true),
}, },
"podspec": { "podspec": {
Type: "object", Type: "object",
Description: "(Optional) Podspec allows modification of deployed runtime pod with Kubernetes PodSpec.\n You can set either PodSpec or Container, but not both.", Description: "(Optional) Podspec allows modification of deployed runtime pod with Kubernetes PodSpec.\n You can set either PodSpec or Container, but not both.",
XPreserveUnknownFields: boolPtr(true),
}, },
} }
builderSchema = apiextensionsv1beta1.JSONSchemaProps{ builderSchema = apiextensionsv1beta1.JSONSchemaProps{
test/test_utils.sh
+2
View File
@@ -340,6 +340,8 @@ helm_uninstall_fission() {(set +e
echo "Uninstalling fission" echo "Uninstalling fission"
helm delete $id -n $ns || true helm delete $id -n $ns || true
kubectl delete ns f-$id || true kubectl delete ns f-$id || true
echo "Deleting CRDs"
kubectl get crd | grep "fission.io" | awk '{print $1}' | xargs -n1 kubectl delete crd
)} )}
export -f helm_uninstall_fission export -f helm_uninstall_fission