Prepare for 0.6.0 release (#192)

Callisto13 · web-flow · commit 99c9ab519740 · 2022-07-04T11:48:05.000+01:00
* feat: Bump flintlock to v0.1.0

The `MountPoint` option has gone from the MicroVM Spec, otherwise there
are no changes.

* chore: Prepare for 0.6.0 release
diff --git a/api/v1alpha1/types.go b/api/v1alpha1/types.go
@@ -79,9 +79,6 @@ type Volume struct {
 	// +kubebuilder:default:=false
 	// +optional
 	ReadOnly bool `json:"readOnly,omitempty"`
-	// MountPoint is the mount point of the volume in the machine.
-	// +kubebuilder:validation:Required
-	MountPoint string `json:"mountPoint,omitempty"`
 }
 
 // IfaceType is a type representing the network interface types.
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_microvmmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_microvmmachines.yaml
@@ -121,10 +121,6 @@ spec:
                   image:
                     description: Image is the container image to use for the volume.
                     type: string
-                  mountPoint:
-                    description: MountPoint is the mount point of the volume in the
-                      machine.
-                    type: string
                   readOnly:
                     default: false
                     description: ReadOnly specifies that the volume is to be mounted
@@ -169,10 +165,6 @@ spec:
                     image:
                       description: Image is the container image to use for the volume.
                       type: string
-                    mountPoint:
-                      description: MountPoint is the mount point of the volume in
-                        the machine.
-                      type: string
                     readOnly:
                       default: false
                       description: ReadOnly specifies that the volume is to be mounted
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_microvmmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_microvmmachinetemplates.yaml
@@ -158,10 +158,6 @@ spec:
                             description: Image is the container image to use for the
                               volume.
                             type: string
-                          mountPoint:
-                            description: MountPoint is the mount point of the volume
-                              in the machine.
-                            type: string
                           readOnly:
                             default: false
                             description: ReadOnly specifies that the volume is to
@@ -210,10 +206,6 @@ spec:
                               description: Image is the container image to use for
                                 the volume.
                               type: string
-                            mountPoint:
-                              description: MountPoint is the mount point of the volume
-                                in the machine.
-                              type: string
                             readOnly:
                               default: false
                               description: ReadOnly specifies that the volume is to
diff --git a/docs/compatibility.md b/docs/compatibility.md
@@ -4,7 +4,8 @@ This table shows the compatibility between CAPMVM and Flintlock versions.
 
 | CAPMVM      | Flintlock              |
 | ----------- | ---------------------- |
-| `v0.5.0`    | `v0.1.0-alpha.9`       |
+| `v0.6.0`    | `v0.1.0`               |
+| `v0.5.x`    | `v0.1.0-alpha.9`       |
 | `v0.4.0`    | `v0.1.0-alpha.8`       |
 | `v0.3.0`    | `v0.1.0-alpha.6`       |
 | `v0.2.2`    | `v0.1.0-alpha.5`       |
diff --git a/docs/releasing.md b/docs/releasing.md
@@ -17,6 +17,13 @@ git pull --tags
 git describe --tags --abbrev=0
 ```
 
+## Update `metadata.yaml`
+
+If you are increasing by a major or minor version, edit `metadata.yaml` to contain
+the new contract.
+
+Open a PR and merge to main BEFORE you continue with the release.
+
 ## Create tag
 
 * Checkout upstream main
diff --git a/go.mod b/go.mod
@@ -6,8 +6,8 @@ require (
 	github.com/go-logr/logr v1.2.3
 	github.com/onsi/gomega v1.19.0
 	github.com/spf13/pflag v1.0.5
-	github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20220510103109-fab05d0b1346
-	github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20220510103109-fab05d0b1346
+	github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20220628141946-264f4544f49f
+	github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20220628141946-264f4544f49f
 	github.com/yitsushi/macpot v1.0.2
 	google.golang.org/grpc v1.47.0
 	google.golang.org/protobuf v1.28.0
diff --git a/go.sum b/go.sum
@@ -631,10 +631,10 @@ github.com/valyala/fastjson v1.6.3/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLr
 github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U=
 github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk=
 github.com/vmware/vmw-ovflib v0.0.0-20170608004843-1f217b9dc714/go.mod h1:jiPk45kn7klhByRvUq5i2vo1RtHKBHj+iWGFpxbXuuI=
-github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20220510103109-fab05d0b1346 h1:w/Ld8EgtzXjFQK0fB6pEfptON2DP2LxWB69sGiimkMw=
-github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20220510103109-fab05d0b1346/go.mod h1:JPML9O56MoPKGX97jfj++BtuFFS84jm4T+jWQBjO5Uc=
-github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20220510103109-fab05d0b1346 h1:5CxmOoxgQBfsHE6TXB0DphgYFHosWdqaap3F7sJ2kPQ=
-github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20220510103109-fab05d0b1346/go.mod h1:d65mpsT+pbMnMJZhUqeNtt7lcQnsX8cowl9dTRkniSI=
+github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20220628141946-264f4544f49f h1:I+BieoFUnOC9Y7m9NwGfK6wtEwzSkPeBLPEQf3+8r+Y=
+github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20220628141946-264f4544f49f/go.mod h1:JPML9O56MoPKGX97jfj++BtuFFS84jm4T+jWQBjO5Uc=
+github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20220628141946-264f4544f49f h1:zrUZz+usVtrvojEcbfG6Le+gv4467gXrlwRQGniRTaA=
+github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20220628141946-264f4544f49f/go.mod h1:d65mpsT+pbMnMJZhUqeNtt7lcQnsX8cowl9dTRkniSI=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
diff --git a/internal/services/microvm/convert.go b/internal/services/microvm/convert.go
@@ -32,7 +32,6 @@ func convertToFlintlockAPI(machineScope *scope.MachineScope) *flintlocktypes.Mic
 		RootVolume: &flintlocktypes.Volume{
 			Id:         "root",
 			IsReadOnly: mvmSpec.RootVolume.ReadOnly,
-			MountPoint: mvmSpec.RootVolume.MountPoint,
 			Source: &flintlocktypes.VolumeSource{
 				ContainerSource: &mvmSpec.RootVolume.Image,
 			},
@@ -55,7 +54,6 @@ func convertToFlintlockAPI(machineScope *scope.MachineScope) *flintlocktypes.Mic
 		apiVM.AdditionalVolumes = append(apiVM.AdditionalVolumes, &flintlocktypes.Volume{
 			Id:         volume.ID,
 			IsReadOnly: volume.ReadOnly,
-			MountPoint: volume.MountPoint,
 			Source: &flintlocktypes.VolumeSource{
 				ContainerSource: &volume.Image,
 			},
diff --git a/metadata.yaml b/metadata.yaml
@@ -20,3 +20,6 @@ releaseSeries:
   - major: 0
     minor: 5
     contract: v1beta1
+  - major: 0
+    minor: 6
+    contract: v1beta1

Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,6 @@ type Volume struct {`
`79`	`79`	`// +kubebuilder:default:=false`
`80`	`80`	`// +optional`
`81`	`81`	ReadOnly bool `json:"readOnly,omitempty"`
`82`		`- // MountPoint is the mount point of the volume in the machine.`
`83`		`- // +kubebuilder:validation:Required`
`84`		- MountPoint string `json:"mountPoint,omitempty"`
`85`	`82`	`}`
`86`	`83`
`87`	`84`	`// IfaceType is a type representing the network interface types.`