Skip to content

Commit

Permalink
replace machine-api-operator with openshift/api/machine
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Shitrit <mshitrit@redhat.com>
  • Loading branch information
mshitrit committed Jul 5, 2023
1 parent 1eba107 commit 2c22eb7
Show file tree
Hide file tree
Showing 130 changed files with 4,905 additions and 24,688 deletions.
4 changes: 2 additions & 2 deletions controllers/selfnoderemediation_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

machinev1beta1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
"github.com/openshift/api/machine/v1beta1"

"github.com/medik8s/self-node-remediation/api/v1alpha1"
"github.com/medik8s/self-node-remediation/pkg/reboot"
Expand Down Expand Up @@ -678,7 +678,7 @@ func (r *SelfNodeRemediationReconciler) getNodeFromSnr(snr *v1alpha1.SelfNodeRem
}

func (r *SelfNodeRemediationReconciler) getNodeFromMachine(ref metav1.OwnerReference, ns string) (*v1.Node, error) {
machine := &machinev1beta1.Machine{}
machine := &v1beta1.Machine{}
machineKey := client.ObjectKey{
Name: ref.Name,
Namespace: ns,
Expand Down
8 changes: 1 addition & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ require (
github.com/medik8s/common v1.2.0
github.com/onsi/ginkgo/v2 v2.9.1
github.com/onsi/gomega v1.27.4
github.com/openshift/machine-api-operator v0.2.1-0.20210104142355-8e6ae0acdfcf
github.com/openshift/machine-config-operator v0.0.1-0.20201023110058-6c8bd9b2915c
github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 // release-4.13
github.com/pkg/errors v0.9.1
go.uber.org/zap v1.24.0
golang.org/x/sys v0.6.0
Expand Down Expand Up @@ -57,9 +56,6 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/openshift/api v0.0.0-20201216151826-78a19e96f9eb // indirect
github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49 // indirect
github.com/openshift/cluster-api-provider-gcp v0.0.1-0.20201201000827-1117a4fc438c // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
Expand All @@ -84,8 +80,6 @@ require (
k8s.io/component-base v0.26.1 // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
sigs.k8s.io/cluster-api-provider-aws v0.0.0-00010101000000-000000000000 // indirect
sigs.k8s.io/cluster-api-provider-azure v0.0.0-00010101000000-000000000000 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
Expand Down
848 changes: 2 additions & 846 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/log/zap"
"sigs.k8s.io/controller-runtime/pkg/manager"

machinev1beta1 "github.com/openshift/machine-api-operator/pkg/apis/machine/v1beta1"
machinev1beta1 "github.com/openshift/api/machine/v1beta1"

selfnoderemediationv1alpha1 "github.com/medik8s/self-node-remediation/api/v1alpha1"
"github.com/medik8s/self-node-remediation/controllers"
Expand Down
3 changes: 0 additions & 3 deletions pkg/render/render.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import (

"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/util/yaml"

mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
)

type Data struct {
Expand All @@ -24,7 +22,6 @@ type Data struct {
}

type Config struct {
*mcfgv1.ControllerConfigSpec
PullSecret string
}

Expand Down

This file was deleted.

Loading

0 comments on commit 2c22eb7

Please sign in to comment.