From b406fbd167f05c7c7dbe3f4030231cd962f56d12 Mon Sep 17 00:00:00 2001 From: Christopher J Schaefer Date: Thu, 9 Feb 2023 11:39:37 -0600 Subject: [PATCH] Update machine-api-provider-ibmcloud packages Update the go mod and vendor packages to pull in the necessary IBM Cloud MAPI changes for NetworkResourceGroupName support. --- go.mod | 4 ++-- go.sum | 4 ++-- .../LICENSE | 0 .../pkg/apis/addtoschema_ibmcloudprovider_v1.go | 2 +- .../pkg/apis/apis.go | 0 .../pkg/apis/ibmcloudprovider/v1/doc.go | 2 +- .../v1/ibmcloudproviderconfig_types.go | 11 ++++++++++- .../v1/ibmcloudproviderstatus_types.go | 10 ++++++++++ .../pkg/apis/ibmcloudprovider/v1/register.go | 2 +- .../apis/ibmcloudprovider/v1/zz_generated.deepcopy.go | 0 vendor/modules.txt | 10 +++++----- 11 files changed, 32 insertions(+), 13 deletions(-) rename vendor/github.com/openshift/{cluster-api-provider-ibmcloud => machine-api-provider-ibmcloud}/LICENSE (100%) rename vendor/github.com/openshift/{cluster-api-provider-ibmcloud => machine-api-provider-ibmcloud}/pkg/apis/addtoschema_ibmcloudprovider_v1.go (92%) rename vendor/github.com/openshift/{cluster-api-provider-ibmcloud => machine-api-provider-ibmcloud}/pkg/apis/apis.go (100%) rename vendor/github.com/openshift/{cluster-api-provider-ibmcloud => machine-api-provider-ibmcloud}/pkg/apis/ibmcloudprovider/v1/doc.go (92%) rename vendor/github.com/openshift/{cluster-api-provider-ibmcloud => machine-api-provider-ibmcloud}/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderconfig_types.go (83%) rename vendor/github.com/openshift/{cluster-api-provider-ibmcloud => machine-api-provider-ibmcloud}/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderstatus_types.go (79%) rename vendor/github.com/openshift/{cluster-api-provider-ibmcloud => machine-api-provider-ibmcloud}/pkg/apis/ibmcloudprovider/v1/register.go (98%) rename vendor/github.com/openshift/{cluster-api-provider-ibmcloud => machine-api-provider-ibmcloud}/pkg/apis/ibmcloudprovider/v1/zz_generated.deepcopy.go (100%) diff --git a/go.mod b/go.mod index 0497917fb4..273d579cb1 100644 --- a/go.mod +++ b/go.mod @@ -62,11 +62,11 @@ require ( github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c github.com/openshift/cloud-credential-operator v0.0.0-20200316201045-d10080b52c9e github.com/openshift/cluster-api-provider-baremetal v0.0.0-20220408122422-7a548effc26e - github.com/openshift/cluster-api-provider-ibmcloud v0.0.1-0.20220201105455-8014e5e894b0 github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20230203123120-e55e92c14b2c github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20220323121149-e3f2850dd519 github.com/openshift/hive/apis v0.0.0-20220222213051-def9088fdb5a github.com/openshift/library-go v0.0.0-20220920133651-093893cf326b + github.com/openshift/machine-api-provider-ibmcloud v0.0.0-20230124105206-50aa171a52e1 github.com/openshift/machine-config-operator v0.0.0 github.com/ovirt/go-ovirt v0.0.0-20210809163552-d4276e35d3db github.com/pborman/uuid v1.2.0 @@ -102,7 +102,7 @@ require ( k8s.io/klog v1.0.0 k8s.io/klog/v2 v2.90.0 k8s.io/utils v0.0.0-20230115233650-391b47cb4029 - sigs.k8s.io/controller-tools v0.9.2 + sigs.k8s.io/controller-tools v0.10.0 sigs.k8s.io/yaml v1.3.0 ) diff --git a/go.sum b/go.sum index ed65188853..813c7cc89f 100644 --- a/go.sum +++ b/go.sum @@ -1088,8 +1088,6 @@ github.com/openshift/cloud-provider-vsphere v1.19.1-0.20211222185833-7829863d055 github.com/openshift/cloud-provider-vsphere v1.19.1-0.20211222185833-7829863d0558/go.mod h1:bgZfB07YK1CBbJRkFE13BHG+k53Qq0IuQyrehZAbv7M= github.com/openshift/cluster-api-provider-baremetal v0.0.0-20220408122422-7a548effc26e h1:FWzYb0sH16yVOyySUwY5yXtZFW/U2bPoK38SEGjC5D8= github.com/openshift/cluster-api-provider-baremetal v0.0.0-20220408122422-7a548effc26e/go.mod h1:Q5WzHV1JZw/XNRnXCo8JfyOSegL13a+lhV4sc44lpSI= -github.com/openshift/cluster-api-provider-ibmcloud v0.0.1-0.20220201105455-8014e5e894b0 h1:G68R/I4HB4F4LawreWxKruqThNpmmXf5DSAsJALc9FY= -github.com/openshift/cluster-api-provider-ibmcloud v0.0.1-0.20220201105455-8014e5e894b0/go.mod h1:CLnQ32mWHZtlQeHX0lYLMA+QTrrdXbg9K8smrWOPXMk= github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20230203123120-e55e92c14b2c h1:gq3EVbCFath848QkE71dMjdBTnzpRoYvD+Nnj2Wp97U= github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20230203123120-e55e92c14b2c/go.mod h1:lApSDY9c9SRjLgLAnwMhyuENQRHR/o1yBtH6RG8GScw= github.com/openshift/cluster-api-provider-ovirt v0.1.1-0.20220323121149-e3f2850dd519 h1:foU7/s6DQczTFdZ/8H++pUC2Pzygqdz5ZgqUakksR5w= @@ -1102,6 +1100,8 @@ github.com/openshift/library-go v0.0.0-20191003152030-97c62d8a2901/go.mod h1:NBt github.com/openshift/library-go v0.0.0-20200831114015-2ab0c61c15de/go.mod h1:6vwp+YhYOIlj8MpkQKkebTTSn2TuYyvgiAFQ206jIEQ= github.com/openshift/library-go v0.0.0-20220920133651-093893cf326b h1:LWwB7uN91G/JsMnZFd0+q6ZzAXlB4/oUOfpZWA585gw= github.com/openshift/library-go v0.0.0-20220920133651-093893cf326b/go.mod h1:KPBAXGaq7pPmA+1wUVtKr5Axg3R68IomWDkzaOxIhxM= +github.com/openshift/machine-api-provider-ibmcloud v0.0.0-20230124105206-50aa171a52e1 h1:winAA43R7imUj8uzAF7NVs3QWIxheF+rhpRF+O+0/R8= +github.com/openshift/machine-api-provider-ibmcloud v0.0.0-20230124105206-50aa171a52e1/go.mod h1:UDA+gKaUSWbZsKbUbzybyaIqdksOQF5iKc+OsYnHL9k= github.com/openshift/machine-config-operator v0.0.1-0.20201009041932-4fe8559913b8 h1:C4gCipkWTDp0B9jb0wZdLgB+HWC7EzVVwQOeNaKnTRA= github.com/openshift/machine-config-operator v0.0.1-0.20201009041932-4fe8559913b8/go.mod h1:fjKreLaKEeUKsyIkT4wlzIQwUVJ2ZKDUh3CI73ckYIY= github.com/openshift/runtime-utils v0.0.0-20200415173359-c45d4ff3f912/go.mod h1:0OXNy7VoqFexkxKqyQbHJLPwn1MFp1/CxRJAgKHM+/o= diff --git a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/LICENSE b/vendor/github.com/openshift/machine-api-provider-ibmcloud/LICENSE similarity index 100% rename from vendor/github.com/openshift/cluster-api-provider-ibmcloud/LICENSE rename to vendor/github.com/openshift/machine-api-provider-ibmcloud/LICENSE diff --git a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/addtoschema_ibmcloudprovider_v1.go b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/addtoschema_ibmcloudprovider_v1.go similarity index 92% rename from vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/addtoschema_ibmcloudprovider_v1.go rename to vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/addtoschema_ibmcloudprovider_v1.go index 1b1ce0145a..07d357f923 100644 --- a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/addtoschema_ibmcloudprovider_v1.go +++ b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/addtoschema_ibmcloudprovider_v1.go @@ -17,7 +17,7 @@ limitations under the License. package apis import ( - v1 "github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1" + v1 "github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1" ) func init() { diff --git a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/apis.go b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/apis.go similarity index 100% rename from vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/apis.go rename to vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/apis.go diff --git a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/doc.go b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/doc.go similarity index 92% rename from vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/doc.go rename to vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/doc.go index 6d1eebee74..a8bc8b9064 100644 --- a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/doc.go +++ b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/doc.go @@ -17,7 +17,7 @@ limitations under the License. // Package v1 contains API Schema definitions for the ibmcloudprovider v1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider +// +k8s:conversion-gen=github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider // +k8s:defaulter-gen=TypeMeta // +groupName=ibmcloudproviderconfig.openshift.io package v1 diff --git a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderconfig_types.go b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderconfig_types.go similarity index 83% rename from vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderconfig_types.go rename to vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderconfig_types.go index e4173858cf..666412852e 100644 --- a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderconfig_types.go +++ b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderconfig_types.go @@ -61,9 +61,18 @@ type IBMCloudMachineProviderSpec struct { // Zone where the virtual server instance will be created Zone string `json:"zone"` - // ResourceGroup of VPC + // ResourceGroup of the machines. This may be the same as NetworkResourceGroup if the machines are + // created in the same Resource Group as the network resources. ResourceGroup string `json:"resourceGroup"` + // NetworkResourceGroup is the Resource Group for network resources like the VPC and Subnets used by the cluster, + // where ResourceGroupName will contain the remaining resources (e.g., machines). This may be the same as + // ResourceGroup, if the machines are created in the same Resource Group as the network resources. + // If empty, the NetworkResourceGroup is considered to be the same value as ResourceGroup, which will contain + // the network and remaining resources of the cluster. + // (optional) + NetworkResourceGroup string `json:"networkResourceGroup,omitempty"` + // PrimaryNetworkInterface is required to specify subnet PrimaryNetworkInterface NetworkInterface `json:"primaryNetworkInterface"` diff --git a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderstatus_types.go b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderstatus_types.go similarity index 79% rename from vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderstatus_types.go rename to vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderstatus_types.go index ecd80bfa31..df6f5f1570 100644 --- a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderstatus_types.go +++ b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/ibmcloudproviderstatus_types.go @@ -50,6 +50,8 @@ const ( // MachineCreated indicates whether the machine has been created or not. If not, // it should include a reason and message for the failure. MachineCreated IBMCloudMachineProviderConditionType = "MachineCreated" + // MachineReplacement indicates whether the machine is or has been replaced. + MachineReplacement IBMCloudMachineProviderConditionType = "MachineReplacement" ) // IBMCloudMachineProviderConditionReason is reason for the condition's last transition. @@ -60,6 +62,14 @@ const ( MachineCreationSucceeded IBMCloudMachineProviderConditionReason = "MachineCreationSucceeded" // MachineCreationFailed indicates machine creation failure. MachineCreationFailed IBMCloudMachineProviderConditionReason = "MachineCreationFailed" + // MachineReplacementRequested indicates machine replacement was requested. + MachineReplacementRequested IBMCloudMachineProviderConditionReason = "MachineReplacementRequested" + // MachineReplacementInProgress indicates the machine replacement is in progress + MachineReplacementInProgress IBMCloudMachineProviderConditionReason = "MachineReplacementInProgress" + // MachineReplacementCompleted indicates the machine replacement completed + MachineReplacementCompleted IBMCloudMachineProviderConditionReason = "MachineReplacementCompleted" + // MachineReplacementFailed indicates the machine replacement failed + MachineReplacementFailed IBMCloudMachineProviderConditionReason = "MachineReplacementFailed" ) // IBMCloudMachineProviderCondition is a condition in a IBMCloudMachineProviderStatus. diff --git a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/register.go b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/register.go similarity index 98% rename from vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/register.go rename to vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/register.go index 15121b7e6e..16a486d286 100644 --- a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/register.go +++ b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/register.go @@ -17,7 +17,7 @@ limitations under the License. // Package v1 contains API Schema definitions for the ibmcloudproviderconfig v1 API group // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package,register -// +k8s:conversion-gen=github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider +// +k8s:conversion-gen=github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider // +k8s:defaulter-gen=TypeMeta // +groupName=ibmcloudproviderconfig.openshift.io package v1 diff --git a/vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/zz_generated.deepcopy.go b/vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/zz_generated.deepcopy.go similarity index 100% rename from vendor/github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/zz_generated.deepcopy.go rename to vendor/github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1/zz_generated.deepcopy.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 574b4a9941..907f4ba06d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -8734,10 +8734,6 @@ github.com/openshift/cloud-credential-operator/version ## explicit; go 1.17 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.1-0.20220201105455-8014e5e894b0 -## explicit; go 1.17 -github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis -github.com/openshift/cluster-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1 # github.com/openshift/cluster-api-provider-libvirt v0.2.1-0.20230203123120-e55e92c14b2c ## explicit; go 1.17 github.com/openshift/cluster-api-provider-libvirt/pkg/apis @@ -8766,6 +8762,10 @@ github.com/openshift/hive/apis/scheme ## explicit; go 1.18 github.com/openshift/library-go/pkg/config/clusteroperator/v1helpers github.com/openshift/library-go/pkg/route/routeapihelpers +# github.com/openshift/machine-api-provider-ibmcloud v0.0.0-20230124105206-50aa171a52e1 +## explicit; go 1.19 +github.com/openshift/machine-api-provider-ibmcloud/pkg/apis +github.com/openshift/machine-api-provider-ibmcloud/pkg/apis/ibmcloudprovider/v1 # github.com/openshift/machine-config-operator v0.0.0 => github.com/openshift/machine-config-operator v0.0.1-0.20201009041932-4fe8559913b8 ## explicit; go 1.13 github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1 @@ -9565,7 +9565,7 @@ sigs.k8s.io/controller-runtime/pkg/webhook sigs.k8s.io/controller-runtime/pkg/webhook/admission sigs.k8s.io/controller-runtime/pkg/webhook/conversion sigs.k8s.io/controller-runtime/pkg/webhook/internal/metrics -# sigs.k8s.io/controller-tools v0.9.2 => sigs.k8s.io/controller-tools v0.3.1-0.20200617211605-651903477185 +# sigs.k8s.io/controller-tools v0.10.0 => sigs.k8s.io/controller-tools v0.3.1-0.20200617211605-651903477185 ## explicit; go 1.13 sigs.k8s.io/controller-tools/cmd/controller-gen sigs.k8s.io/controller-tools/pkg/crd