openshift/installer
1
0
Fork 0
mirror of https://github.com/openshift/installer.git synced 2026-02-05 15:47:14 +01:00
Code Issues Releases Activity

Update cluster-api-provider-baremetal to latest

Browse Source
This commit is contained in:
Zane Bitter
2021-12-07 14:13:03 -05:00
parent 570b2b97dd
commit d6acf257a7
7 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -56,7 +56,7 @@ require (
github.com/openshift/client-go v0.0.0-20211025111749-96ca2abfc56c
github.com/openshift/cloud-credential-operator v0.0.0-20200316201045-d10080b52c9e
github.com/openshift/cluster-api-provider-alibaba v0.0.0-20211123142315-d16daa4e6349
github.com/openshift/cluster-api-provider-baremetal v0.0.0-20200323172559-7d335b32a0eb
github.com/openshift/cluster-api-provider-baremetal v0.0.0-20210924143856-c2d3ece4da38
github.com/openshift/cluster-api-provider-ibmcloud v0.0.0-20211008100740-4d7907adbd6b
github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20191219173431-2336783d4603
github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20211111151530-06177b773958

8
go.sum
View File

@@ -1529,6 +1529,7 @@ github.com/openshift/api v0.0.0-20210331193751-3acddb19d360/go.mod h1:dZ4kytOo3s
github.com/openshift/api v0.0.0-20210412212256-79bd8cfbbd59/go.mod h1:dZ4kytOo3svxJHNYd0J55hwe/6IQG5gAUHUE0F3Jkio=
github.com/openshift/api v0.0.0-20210416115537-a60c0dc032fd/go.mod h1:dZ4kytOo3svxJHNYd0J55hwe/6IQG5gAUHUE0F3Jkio=
github.com/openshift/api v0.0.0-20210730095913-85e1d547cdee/go.mod h1:ntkQrC1Z6AxxkhDlVpDVjkD+pzdwVUalWyfH40rSyyM=
github.com/openshift/api v0.0.0-20210816181336-8ff39b776da3/go.mod h1:x81TFA31x1OMT9SYWukQqJ/KbmeveRN6fo+XeGRK8g0=
github.com/openshift/api v0.0.0-20211025104849-a11323ccb6ea/go.mod h1:RsQCVJu4qhUawxxDP7pGlwU3IA4F01wYm3qKEu29Su8=
github.com/openshift/api v0.0.0-20211108165917-be1be0e89115/go.mod h1:RsQCVJu4qhUawxxDP7pGlwU3IA4F01wYm3qKEu29Su8=
github.com/openshift/api v0.0.0-20211119153416-313e51eab8c8 h1:FBV3/2ac0uE3MGExSzx/TqJKWNpNjHrpxRBIbmxI654=
@@ -1557,13 +1558,14 @@ github.com/openshift/cluster-api-provider-alibaba v0.0.0-20211123142315-d16daa4e
github.com/openshift/cluster-api-provider-aws v0.2.1-0.20210121023454-5ffc5f422a80 h1:fFHoy/1QCLUcfo/NceEM8jGY2Tafl1BmyLa7tReN328=
github.com/openshift/cluster-api-provider-aws v0.2.1-0.20210121023454-5ffc5f422a80/go.mod h1:JV7aXj/LZ8B4MwIQdhGxpTO2PCG8+7UKFd6FaOZCSzA=
github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20210626224711-5d94c794092f/go.mod h1:GR+ocB8I+Z7JTSBdO+DMu/diBfH66lRlRpnc1KWysUM=
github.com/openshift/cluster-api-provider-baremetal v0.0.0-20200323172559-7d335b32a0eb h1:nwd4ckZkzvhjk5kaL5RnjgZSyE1w6fHmAXZt1lxjoiw=
github.com/openshift/cluster-api-provider-baremetal v0.0.0-20200323172559-7d335b32a0eb/go.mod h1:S+wtA0Rm2FZ5ccC9zNQXUWUDesR6Jsdn5eb6HjAR+Gs=
github.com/openshift/cluster-api-provider-baremetal v0.0.0-20210924143856-c2d3ece4da38 h1:Q6VimHTiOuMXtSstyXMa3/GC7Pdx8CphdKEmiB7tQHQ=
github.com/openshift/cluster-api-provider-baremetal v0.0.0-20210924143856-c2d3ece4da38/go.mod h1:TyotVVwHJhqcDfX/0MkCjLOh7y6+RshdurRIboZ0/Hk=
github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200701112720-3a7d727c9a10/go.mod h1:wgkZrOlcIMWTzo8khB4Js2PoDJDlIUUdzCBm7BuDdqw=
github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200713133651-5c8a640669ac/go.mod h1:XVYX9JE339nKbDDa/W481XD+1GTeqeaBm8bDPr7WE7I=
github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20200901173901-9056dbc8c9b9/go.mod h1:rcwAydGZX+z4l91wtOdbq+fqDwuo6iu0YuFik3UUc+8=
github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20201002065957-9854f7420570/go.mod h1:7NRECVE26rvP1/fs1CbhfY5gsgnnFQNhb9txTFzWmUw=
github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20201201000827-1117a4fc438c/go.mod h1:21N0wWjiTQypZ7WosEYhcGJHr9JoDR1RBFztE0NvdYM=
github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20210615203611-a02074e8d5bb/go.mod h1:KLZ9LTM+EPEny4VXWNbBkJndhfKakmlqafeOfC0jxXA=
github.com/openshift/cluster-api-provider-ibmcloud v0.0.0-20211008100740-4d7907adbd6b h1:atciNID+jTAqvQT0t/hAE+KVFLCxv2asXGih2py2dpg=
github.com/openshift/cluster-api-provider-ibmcloud v0.0.0-20211008100740-4d7907adbd6b/go.mod h1:xkkPB22FMQyrv3G0HLobylRsosJP4Voi8Yojg5WEYrs=
github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20191219173431-2336783d4603 h1:MC6BSZYxFPoqqKj9PdlGjHGVKcMsvn6Kv1NiVzQErZ8=
@@ -1593,6 +1595,7 @@ github.com/openshift/machine-api-operator v0.2.1-0.20200926044412-b7d860f8074c/g
github.com/openshift/machine-api-operator v0.2.1-0.20201002104344-6abfb5440597/go.mod h1:+oAfoCl+TUd2TM79/6NdqLpFUHIJpmqkKdmiHe2O7mw=
github.com/openshift/machine-api-operator v0.2.1-0.20210104142355-8e6ae0acdfcf/go.mod h1:U5eAHChde1XvtQy3s1Zcr7ll4X7heb0SzYpaiAwxmQc=
github.com/openshift/machine-api-operator v0.2.1-0.20210504014029-a132ec00f7dd/go.mod h1:DFZBMPtC2TYZH5NE9+2JQIpbZAnruqc9F26QmbOm9pw=
github.com/openshift/machine-api-operator v0.2.1-0.20210820103535-d50698c302f5/go.mod h1:ko7xmso6c25h9UL6Ai0I5l+6OgyVf+ebinAYXnwlGNg=
github.com/openshift/machine-api-operator v0.2.1-0.20211102083422-ee77ca7b9fd1/go.mod h1:8kWuB/zhnlBsNOyD1yz0epINZX5IodG3Z4iDwQrYKx0=
github.com/openshift/machine-api-operator v0.2.1-0.20211111133920-c8bba3e64310/go.mod h1:8kWuB/zhnlBsNOyD1yz0epINZX5IodG3Z4iDwQrYKx0=
github.com/openshift/machine-config-operator v0.0.1-0.20201009041932-4fe8559913b8 h1:C4gCipkWTDp0B9jb0wZdLgB+HWC7EzVVwQOeNaKnTRA=
@@ -2639,6 +2642,7 @@ k8s.io/code-generator v0.21.0-beta.1/go.mod h1:IpCUojpiKp25KNB3/UbEeElznqpQUMvhA
k8s.io/code-generator v0.21.0-rc.0/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q=
k8s.io/code-generator v0.21.0/go.mod h1:hUlps5+9QaTrKx+jiM4rmq7YmH8wPOIko64uZCHDh6Q=
k8s.io/code-generator v0.22.0-rc.0/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o=
k8s.io/code-generator v0.22.0/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o=
k8s.io/code-generator v0.22.1/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o=
k8s.io/code-generator v0.22.2/go.mod h1:eV77Y09IopzeXOJzndrDyCI88UBok2h6WxAlBwpxa+o=
k8s.io/component-base v0.18.0-beta.2/go.mod h1:HVk5FpRnyzQ/MjBr9//e/yEBjTVa2qjGXCTuUzcD7ks=

2
vendor/github.com/openshift/cluster-api-provider-baremetal/pkg/apis/apis.go generated vendored
View File

@@ -15,7 +15,7 @@ limitations under the License.
*/
// Generate deepcopy for apis
//go:generate go run ../../vendor/k8s.io/code-generator/cmd/deepcopy-gen/main.go -O zz_generated.deepcopy -i ./... -h ../../hack/boilerplate.go.txt
//go:generate go run ../../vendor/sigs.k8s.io/controller-tools/cmd/controller-gen paths=./... object:headerFile=../../hack/boilerplate.go.txt
// Package apis contains Kubernetes API groups.
package apis

18
vendor/github.com/openshift/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1/baremetalmachineproviderspec_types.go generated vendored
View File

@@ -29,13 +29,15 @@ import (
// BareMetalMachineProviderSpec holds data that the actuator needs to provision
// and manage a Machine.
// +k8s:openapi-gen=true
type BareMetalMachineProviderSpec struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
// Image is the image to be provisioned.
Image Image `json:"image"`
Image Image `json:"image,omitempty"`
// Custom Deploy Procedure
CustomDeploy CustomDeploy `json:"customDeploy,omitempty"`
// UserData references the Secret that holds user data needed by the bare metal
// operator. The Namespace is optional; it will default to the Machine's
@@ -74,14 +76,22 @@ type Image struct {
Checksum string `json:"checksum"`
}
// Custom deploy is a description of a customized deploy process.
type CustomDeploy struct {
// Custom deploy method name.
// This name is specific to the deploy ramdisk used. If you don't have
// a custom deploy ramdisk, you shouldn't use CustomDeploy.
Method string `json:"method"`
}
// IsValid returns an error if the object is not valid, otherwise nil. The
// string representation of the error is suitable for human consumption.
func (s *BareMetalMachineProviderSpec) IsValid() error {
missing := []string{}
if s.Image.URL == "" {
if s.CustomDeploy.Method == "" && s.Image.URL == "" {
missing = append(missing, "Image.URL")
}
if s.Image.Checksum == "" {
if s.CustomDeploy.Method == "" && s.Image.Checksum == "" {
missing = append(missing, "Image.Checksum")
}
if len(missing) > 0 {

1
vendor/github.com/openshift/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1/baremetalmachineproviderstatus_types.go generated vendored
View File

@@ -24,7 +24,6 @@ import (
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// BareMetalMachineProviderStatus is the Schema for the baremetalmachineproviderstatuses API
// +k8s:openapi-gen=true
type BareMetalMachineProviderStatus struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`

32
vendor/github.com/openshift/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1/zz_generated.deepcopy.go generated vendored
View File

@@ -15,12 +15,13 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
// Code generated by main. DO NOT EDIT.
// Code generated by controller-gen. DO NOT EDIT.
package v1alpha1
import (
v1 "k8s.io/api/core/v1"
"k8s.io/api/core/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
)
@@ -30,13 +31,13 @@ func (in *BareMetalMachineProviderSpec) DeepCopyInto(out *BareMetalMachineProvid
out.TypeMeta = in.TypeMeta
in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
out.Image = in.Image
out.CustomDeploy = in.CustomDeploy
if in.UserData != nil {
in, out := &in.UserData, &out.UserData
*out = new(v1.SecretReference)
**out = **in
}
in.HostSelector.DeepCopyInto(&out.HostSelector)
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BareMetalMachineProviderSpec.
@@ -61,7 +62,7 @@ func (in *BareMetalMachineProviderSpec) DeepCopyObject() runtime.Object {
func (in *BareMetalMachineProviderSpecList) DeepCopyInto(out *BareMetalMachineProviderSpecList) {
*out = *in
out.TypeMeta = in.TypeMeta
out.ListMeta = in.ListMeta
in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]BareMetalMachineProviderSpec, len(*in))
@@ -69,7 +70,6 @@ func (in *BareMetalMachineProviderSpecList) DeepCopyInto(out *BareMetalMachinePr
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BareMetalMachineProviderSpecList.
@@ -95,7 +95,6 @@ func (in *BareMetalMachineProviderStatus) DeepCopyInto(out *BareMetalMachineProv
*out = *in
out.TypeMeta = in.TypeMeta
in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BareMetalMachineProviderStatus.
@@ -120,7 +119,7 @@ func (in *BareMetalMachineProviderStatus) DeepCopyObject() runtime.Object {
func (in *BareMetalMachineProviderStatusList) DeepCopyInto(out *BareMetalMachineProviderStatusList) {
*out = *in
out.TypeMeta = in.TypeMeta
out.ListMeta = in.ListMeta
in.ListMeta.DeepCopyInto(&out.ListMeta)
if in.Items != nil {
in, out := &in.Items, &out.Items
*out = make([]BareMetalMachineProviderStatus, len(*in))
@@ -128,7 +127,6 @@ func (in *BareMetalMachineProviderStatusList) DeepCopyInto(out *BareMetalMachine
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new BareMetalMachineProviderStatusList.
@@ -149,6 +147,21 @@ func (in *BareMetalMachineProviderStatusList) DeepCopyObject() runtime.Object {
return nil
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *CustomDeploy) DeepCopyInto(out *CustomDeploy) {
*out = *in
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CustomDeploy.
func (in *CustomDeploy) DeepCopy() *CustomDeploy {
if in == nil {
return nil
}
out := new(CustomDeploy)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *HostSelector) DeepCopyInto(out *HostSelector) {
*out = *in
@@ -166,7 +179,6 @@ func (in *HostSelector) DeepCopyInto(out *HostSelector) {
(*in)[i].DeepCopyInto(&(*out)[i])
}
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HostSelector.
@@ -187,7 +199,6 @@ func (in *HostSelectorRequirement) DeepCopyInto(out *HostSelectorRequirement) {
*out = make([]string, len(*in))
copy(*out, *in)
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new HostSelectorRequirement.
@@ -203,7 +214,6 @@ func (in *HostSelectorRequirement) DeepCopy() *HostSelectorRequirement {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *Image) DeepCopyInto(out *Image) {
*out = *in
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Image.

4
vendor/modules.txt vendored
View File

@@ -1752,8 +1752,8 @@ github.com/openshift/cluster-api/pkg/apis/machine/v1beta1
## explicit; go 1.16
github.com/openshift/cluster-api-provider-alibaba/pkg/apis
github.com/openshift/cluster-api-provider-alibaba/pkg/apis/alibabacloudprovider/v1beta1
# github.com/openshift/cluster-api-provider-baremetal v0.0.0-20200323172559-7d335b32a0eb
## explicit
# github.com/openshift/cluster-api-provider-baremetal v0.0.0-20210924143856-c2d3ece4da38
## explicit; go 1.16
github.com/openshift/cluster-api-provider-baremetal/pkg/apis
github.com/openshift/cluster-api-provider-baremetal/pkg/apis/baremetal/v1alpha1
# github.com/openshift/cluster-api-provider-ibmcloud v0.0.0-20211008100740-4d7907adbd6b