Skip to content

Migrate to opeshift/api #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 2 commits into from
Nov 4, 2021
Merged

Migrate to opeshift/api #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
823481d
UPSTREAM: <carry>: openshift: Update dependecies
alexander-demicev Nov 3, 2021
f6404ae
UPSTREAM: <carry>: openshift: Migrate to opeshift/api
alexander-demicev Nov 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,11 @@ import (
"time"

configv1 "github.com/openshift/api/config/v1"
"github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
machinev1 "github.com/openshift/api/machine/v1beta1"
"github.com/openshift/machine-api-operator/pkg/controller/machine"
"github.com/openshift/machine-api-operator/pkg/metrics"
"k8s.io/klog/v2"
"k8s.io/klog/v2/klogr"
"sigs.k8s.io/cluster-api-provider-azure/pkg/apis"
actuator "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators/machine"
machinesetcontroller "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators/machineset"
"sigs.k8s.io/cluster-api-provider-azure/pkg/record"
Expand Down Expand Up @@ -123,11 +122,7 @@ func main() {
EventRecorder: mgr.GetEventRecorderFor("azure-controller"),
})

if err := apis.AddToScheme(mgr.GetScheme()); err != nil {
klog.Fatal(err)
}

if err := v1beta1.AddToScheme(mgr.GetScheme()); err != nil {
if err := machinev1.AddToScheme(mgr.GetScheme()); err != nil {
klog.Fatal(err)
}

Expand Down
10 changes: 3 additions & 7 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ require (
github.com/mitchellh/mapstructure v1.4.1
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.14.0
github.com/openshift/api v0.0.0-20210913115639-4809c1ef6b8e
github.com/openshift/machine-api-operator v0.2.1-0.20211020064610-6be21815b1a1
github.com/openshift/api v0.0.0-20211028135425-c4970133b5ba
github.com/openshift/machine-api-operator v0.2.1-0.20211029132328-128c5c90918c
github.com/spf13/cobra v1.2.1
golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a

Expand All @@ -31,8 +31,4 @@ require (
sigs.k8s.io/yaml v1.2.0
)

replace (
github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
sigs.k8s.io/cluster-api-provider-aws => github.com/openshift/cluster-api-provider-aws v0.2.1-0.20210622023641-c69a3acaee27
sigs.k8s.io/cluster-api-provider-azure => github.com/openshift/cluster-api-provider-azure v0.1.0-alpha.3.0.20210816141152-a7c40345b994
)
replace github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
319 changes: 9 additions & 310 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 0 additions & 26 deletions pkg/apis/addtoscheme_azureprovider_v1beta1.go
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions pkg/apis/apis.go
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions pkg/apis/azureprovider/azureprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
package azureprovider
17 changes: 0 additions & 17 deletions pkg/apis/azureprovider/group.go
View file
Open in desktop

This file was deleted.

121 changes: 0 additions & 121 deletions pkg/apis/azureprovider/v1beta1/azuremachineproviderconfig_types.go
View file
Open in desktop

This file was deleted.

72 changes: 0 additions & 72 deletions pkg/apis/azureprovider/v1beta1/azuremachineproviderstatus_types.go
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions pkg/apis/azureprovider/v1beta1/conversion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package v1beta1

import "sigs.k8s.io/cluster-api-provider-azure/pkg/cloud/azure/actuators"

var (
// MachineStatusFromProviderStatus unmarshals a raw extension into an AzureMachineProviderStatus type.
// Deprecated: Use machine.ProviderStatusFromRawExtension instead.
MachineStatusFromProviderStatus = actuators.ProviderStatusFromRawExtension
// EncodeMachineStatus marshals AzureMachineProviderStatus into a raw extension type.
// Deprecated: Use machine.RawExtensionFromProviderStatus instead.
EncodeMachineStatus = actuators.RawExtensionFromProviderStatus
// EncodeMachineSpec marshals AWSMachineProviderConfig into a raw extension type.
// Deprecated: Use machine.RawExtensionFromProviderSpec instead.
EncodeMachineSpec = actuators.RawExtensionFromProviderSpec
)
23 changes: 0 additions & 23 deletions pkg/apis/azureprovider/v1beta1/doc.go
View file
Open in desktop

This file was deleted.

Loading