Merge pull request #284 from weaveworks-liquidmetal/provider

feat: Bump controller-pkg to expose Provider field
liquidmetal-dev · Oct 11, 2023 · 29a61b9 · 29a61b9
2 parents f95aa35 + 6aaa1f3
commit 29a61b9
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 5 deletions.
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_microvmmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_microvmmachines.yaml
@@ -111,6 +111,13 @@ spec:
                   type: object
                 minItems: 1
                 type: array
+              provider:
+                description: 'Provider allows you to specify the name of the microvm
+                  provider to use. If this isn''t supplied then the default provider
+                  will be used. NOTE that the default provider cannot be controlled
+                  here: it would have been chosen by the operator configuring Flintlock
+                  on the remote host.'
+                type: string
               providerID:
                 description: ProviderID is the unique identifier as specified by the
                   cloud provider.

diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_microvmmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_microvmmachinetemplates.yaml
@@ -148,6 +148,13 @@ spec:
                           type: object
                         minItems: 1
                         type: array
+                      provider:
+                        description: 'Provider allows you to specify the name of the
+                          microvm provider to use. If this isn''t supplied then the
+                          default provider will be used. NOTE that the default provider
+                          cannot be controlled here: it would have been chosen by
+                          the operator configuring Flintlock on the remote host.'
+                        type: string
                       providerID:
                         description: ProviderID is the unique identifier as specified
                           by the cloud provider.

diff --git a/go.mod b/go.mod
@@ -13,11 +13,11 @@ require (
 	github.com/onsi/ginkgo/v2 v2.9.1
 	github.com/onsi/gomega v1.27.3
 	github.com/spf13/pflag v1.0.5
-	github.com/weaveworks-liquidmetal/controller-pkg/client v0.0.0-20230116125931-089fb91de682
-	github.com/weaveworks-liquidmetal/controller-pkg/services/microvm v0.0.0-20230314141046-be161234224e
-	github.com/weaveworks-liquidmetal/controller-pkg/types/microvm v0.0.0-20230113164813-f1ccd249c9ba
-	github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20230109155544-97f4f12ca184
-	github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20230109155544-97f4f12ca184
+	github.com/weaveworks-liquidmetal/controller-pkg/client v0.0.0-20230531132000-8b78794ae040
+	github.com/weaveworks-liquidmetal/controller-pkg/services/microvm v0.0.0-20230531132000-8b78794ae040
+	github.com/weaveworks-liquidmetal/controller-pkg/types/microvm v0.0.0-20230531132000-8b78794ae040
+	github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20230526050646-f421319741e7
+	github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20230526050646-f421319741e7
 	github.com/yitsushi/macpot v1.0.2
 	google.golang.org/grpc v1.50.1
 	google.golang.org/protobuf v1.28.1

diff --git a/go.sum b/go.sum
@@ -761,17 +761,39 @@ github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9o
 github.com/vmware/vmw-ovflib v0.0.0-20170608004843-1f217b9dc714/go.mod h1:jiPk45kn7klhByRvUq5i2vo1RtHKBHj+iWGFpxbXuuI=
 github.com/weaveworks-liquidmetal/controller-pkg/client v0.0.0-20230116125931-089fb91de682 h1:/sMHH7ShIXZfzpEKmCLIfEtC2UmkrZM7mHRjs+5EuXE=
 github.com/weaveworks-liquidmetal/controller-pkg/client v0.0.0-20230116125931-089fb91de682/go.mod h1:0snthlwNQ731b4CPJtSZ8I76FgS02wAOfyar9ss+X+U=
+github.com/weaveworks-liquidmetal/controller-pkg/client v0.0.0-20230531120904-dd84ec5eab9f h1:W9AB1wx/Ofk3OOIjRgkQaKbQ9JRip10/tfI9dfuUwwA=
+github.com/weaveworks-liquidmetal/controller-pkg/client v0.0.0-20230531120904-dd84ec5eab9f/go.mod h1:mCZXv8j3nCvp6H3xbFthJPLGrRuXzccvUR4qpucsFls=
+github.com/weaveworks-liquidmetal/controller-pkg/client v0.0.0-20230531132000-8b78794ae040 h1:JRPoWCSvPNT/qG8Ka7R8GgE/O120cTt9m+5Ksn22mns=
+github.com/weaveworks-liquidmetal/controller-pkg/client v0.0.0-20230531132000-8b78794ae040/go.mod h1:mCZXv8j3nCvp6H3xbFthJPLGrRuXzccvUR4qpucsFls=
 github.com/weaveworks-liquidmetal/controller-pkg/services/microvm v0.0.0-20230314141046-be161234224e h1:R9zDQSIQDwB1p8hkHk+gsNtBNYCHtdO/+7oFM7GMZO8=
 github.com/weaveworks-liquidmetal/controller-pkg/services/microvm v0.0.0-20230314141046-be161234224e/go.mod h1:Axe9n3zEbW5Q9ZtGiujFmyG9CPbcA8RVbF7nYhPL+wc=
+github.com/weaveworks-liquidmetal/controller-pkg/services/microvm v0.0.0-20230531120904-dd84ec5eab9f h1:jbWsr38mgql1XGqpvZ9XThbHfIHAHu5vflY+WWgbQEE=
+github.com/weaveworks-liquidmetal/controller-pkg/services/microvm v0.0.0-20230531120904-dd84ec5eab9f/go.mod h1:QtFQW5XzZXcDpICIMR22HumTyoR3l/dObiEXJ1WtxLA=
+github.com/weaveworks-liquidmetal/controller-pkg/services/microvm v0.0.0-20230531121559-9e13353d44c5 h1:Svk+XgO+zm+zOpRy1/QhI4HCieHw9OsTDdPPzcCZpME=
+github.com/weaveworks-liquidmetal/controller-pkg/services/microvm v0.0.0-20230531121559-9e13353d44c5/go.mod h1:r/jOB5TLC6hvsxewEPNA1irjqyXSEDq9FTvp4oxVCOA=
+github.com/weaveworks-liquidmetal/controller-pkg/services/microvm v0.0.0-20230531132000-8b78794ae040 h1:ZWbNN0vMbhNuoriMIo7akNKcgVWPBL27TJYng5J9ZqE=
+github.com/weaveworks-liquidmetal/controller-pkg/services/microvm v0.0.0-20230531132000-8b78794ae040/go.mod h1:r/jOB5TLC6hvsxewEPNA1irjqyXSEDq9FTvp4oxVCOA=
 github.com/weaveworks-liquidmetal/controller-pkg/types/microvm v0.0.0-20230113163837-eaa53ce86ced/go.mod h1:KPlbfZsmo9xlfzl98cFBqGYc9hpgSYljICR+LrqKJUA=
 github.com/weaveworks-liquidmetal/controller-pkg/types/microvm v0.0.0-20230113164813-f1ccd249c9ba h1:czFGmavIfOHuyVt+UInQBfF7tCCI3Ov/ZigJh37qzok=
 github.com/weaveworks-liquidmetal/controller-pkg/types/microvm v0.0.0-20230113164813-f1ccd249c9ba/go.mod h1:KPlbfZsmo9xlfzl98cFBqGYc9hpgSYljICR+LrqKJUA=
+github.com/weaveworks-liquidmetal/controller-pkg/types/microvm v0.0.0-20230531120904-dd84ec5eab9f h1:64Q6591P57N48U76pMaGvm9gdiAEb2RK5k+t529WV24=
+github.com/weaveworks-liquidmetal/controller-pkg/types/microvm v0.0.0-20230531120904-dd84ec5eab9f/go.mod h1:KPlbfZsmo9xlfzl98cFBqGYc9hpgSYljICR+LrqKJUA=
+github.com/weaveworks-liquidmetal/controller-pkg/types/microvm v0.0.0-20230531132000-8b78794ae040 h1:pStVsEygPVDvCxAmULkru0KjpFskAulhadjN0AzGptI=
+github.com/weaveworks-liquidmetal/controller-pkg/types/microvm v0.0.0-20230531132000-8b78794ae040/go.mod h1:KPlbfZsmo9xlfzl98cFBqGYc9hpgSYljICR+LrqKJUA=
 github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20221108110312-4cf137879fb2/go.mod h1:JPML9O56MoPKGX97jfj++BtuFFS84jm4T+jWQBjO5Uc=
 github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20230109155544-97f4f12ca184 h1:o0CJeY1Dbq+xxw5mx32S+5nOft5nf2NZMjIbHlLvFpQ=
 github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20230109155544-97f4f12ca184/go.mod h1:JPML9O56MoPKGX97jfj++BtuFFS84jm4T+jWQBjO5Uc=
+github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20230522070730-18c06de56a20 h1:H3hlE0o89gEtWJJJd08yRORcCY0X7Ujyn32TRxtPOMw=
+github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20230522070730-18c06de56a20/go.mod h1:WcqH8PmBC38GTduseUoUnI/j8fYFMt+jKxKui5t3wck=
+github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20230526050646-f421319741e7 h1:uhgT7xo9Q8LaOVA3DpV1sfKPL74ThRd78PhNN5BqNoc=
+github.com/weaveworks-liquidmetal/flintlock/api v0.0.0-20230526050646-f421319741e7/go.mod h1:WcqH8PmBC38GTduseUoUnI/j8fYFMt+jKxKui5t3wck=
 github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20221108110312-4cf137879fb2/go.mod h1:d65mpsT+pbMnMJZhUqeNtt7lcQnsX8cowl9dTRkniSI=
 github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20230109155544-97f4f12ca184 h1:7vrApNvF61104ULFq5lzH1IGfIE+94MwV/SmXlYvss0=
 github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20230109155544-97f4f12ca184/go.mod h1:d65mpsT+pbMnMJZhUqeNtt7lcQnsX8cowl9dTRkniSI=
+github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20230522070730-18c06de56a20 h1:Q/88mlcogfkf3Xn3ZR+U8vfPOx+NF13ThdpBnQKLCCo=
+github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20230522070730-18c06de56a20/go.mod h1:aCYaulYrPV5V3GtUDYMb43MSjk5cj+ioIiPWGwqoIJE=
+github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20230526050646-f421319741e7 h1:dR9Tfi22PvgjQsgECWIeWlixFfItZc+jMFc27FwtMco=
+github.com/weaveworks-liquidmetal/flintlock/client v0.0.0-20230526050646-f421319741e7/go.mod h1:aCYaulYrPV5V3GtUDYMb43MSjk5cj+ioIiPWGwqoIJE=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=