Merge pull request #103 from Nordix/fix-mael

🏃 Update v1a3 CRDs to add image checksum type and disk format
metal3-io · Jun 23, 2020 · 14e6efd · 14e6efd
2 parents 85b4805 + 35a4126
commit 14e6efd
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 10 deletions.
diff --git a/api/v1alpha3/common_types.go b/api/v1alpha3/common_types.go
@@ -53,4 +53,13 @@ type Image struct {
 
 	// Checksum is a md5sum value or a URL to retrieve one.
 	Checksum string `json:"checksum"`
+
+	// ChecksumType is the checksum algorithm for the image.
+	// e.g md5, sha256, sha512
+	// +kubebuilder:validation:Enum=md5;sha256;sha512
+	ChecksumType *string `json:"checksumType,omitempty"`
+
+	//DiskFormat contains the image disk format
+	// +kubebuilder:validation:Enum=raw;qcow2;vdi;vmdk
+	DiskFormat *string `json:"format,omitempty"`
 }
diff --git a/api/v1alpha3/zz_generated.conversion.go b/api/v1alpha3/zz_generated.conversion.go
diff --git a/api/v1alpha3/zz_generated.deepcopy.go b/api/v1alpha3/zz_generated.deepcopy.go
diff --git a/api/v1alpha4/common_types.go b/api/v1alpha4/common_types.go
@@ -65,6 +65,6 @@ type Image struct {
 	ChecksumType *string `json:"checksumType,omitempty"`
 
 	//DiskFormat contains the image disk format
-	// +kubebuilder:validation:Enum=raw;qcow2;qed;vdi;vmdk;vpc;vhd
+	// +kubebuilder:validation:Enum=raw;qcow2;vdi;vmdk
 	DiskFormat *string `json:"format,omitempty"`
 }
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_metal3machines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_metal3machines.yaml
@@ -278,6 +278,22 @@ spec:
                   checksum:
                     description: Checksum is a md5sum value or a URL to retrieve one.
                     type: string
+                  checksumType:
+                    description: ChecksumType is the checksum algorithm for the image.
+                      e.g md5, sha256, sha512
+                    enum:
+                    - md5
+                    - sha256
+                    - sha512
+                    type: string
+                  format:
+                    description: DiskFormat contains the image disk format
+                    enum:
+                    - raw
+                    - qcow2
+                    - vdi
+                    - vmdk
+                    type: string
                   url:
                     description: URL is a location of an image to deploy.
                     type: string
@@ -509,11 +525,8 @@ spec:
                     enum:
                     - raw
                     - qcow2
-                    - qed
                     - vdi
                     - vmdk
-                    - vpc
-                    - vhd
                     type: string
                   url:
                     description: URL is a location of an image to deploy.

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_metal3machinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_metal3machinetemplates.yaml
@@ -197,6 +197,22 @@ spec:
                             description: Checksum is a md5sum value or a URL to retrieve
                               one.
                             type: string
+                          checksumType:
+                            description: ChecksumType is the checksum algorithm for
+                              the image. e.g md5, sha256, sha512
+                            enum:
+                            - md5
+                            - sha256
+                            - sha512
+                            type: string
+                          format:
+                            description: DiskFormat contains the image disk format
+                            enum:
+                            - raw
+                            - qcow2
+                            - vdi
+                            - vmdk
+                            type: string
                           url:
                             description: URL is a location of an image to deploy.
                             type: string
@@ -358,11 +374,8 @@ spec:
                             enum:
                             - raw
                             - qcow2
-                            - qed
                             - vdi
                             - vmdk
-                            - vpc
-                            - vhd
                             type: string
                           url:
                             description: URL is a location of an image to deploy.