Add openAPIV3Schema validation to Helm CRD (#1253)

* Add openAPIV3Schema validation to Helm CRD - make git path and values required fields - set FluxHelmRelease short name to fhr - prep for multi-version CRD - cleanup old chart archives
fluxcd · Jul 26, 2018 · ed45f41 · ed45f41
1 parent dfcfd33
commit ed45f41
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 0 deletions.
diff --git a/chart/flux-0.1.0.tgz b/chart/flux-0.1.0.tgz
diff --git a/chart/flux-0.1.1.tgz b/chart/flux-0.1.1.tgz
diff --git a/chart/flux/templates/helm-operator-crd.yaml b/chart/flux/templates/helm-operator-crd.yaml
@@ -14,6 +14,27 @@ spec:
     kind: FluxHelmRelease
     listKind: FluxHelmReleaseList
     plural: fluxhelmreleases
+    shortNames:
+    - fhr
   scope: Namespaced
   version: v1alpha2
+  versions:
+    - name: v1alpha2
+      served: true
+      storage: true
+  validation:
+    openAPIV3Schema:
+      properties:
+        spec:
+          required:
+            - chartGitPath
+            - values
+          properties:
+            releaseName:
+              type: string
+              pattern: "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
+            chartGitPath:
+              type: string
+            values:
+              type: object
 {{- end -}}
diff --git a/deploy-helm/flux-helm-release-crd.yaml b/deploy-helm/flux-helm-release-crd.yaml
@@ -9,5 +9,26 @@ spec:
     kind: FluxHelmRelease
     listKind: FluxHelmReleaseList
     plural: fluxhelmreleases
+    shortNames:
+    - fhr
   scope: Namespaced
   version: v1alpha2
+  versions:
+    - name: v1alpha2
+      served: true
+      storage: true
+  validation:
+    openAPIV3Schema:
+      properties:
+        spec:
+          required:
+            - chartGitPath
+            - values
+          properties:
+            releaseName:
+              type: string
+              pattern: "^[a-z0-9]([-a-z0-9]*[a-z0-9])?$"
+            chartGitPath:
+              type: string
+            values:
+              type: object