Skip to content
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.

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

vendor: update openshift/cluster-api #23

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 7 additions & 6 deletions pkg/cloud/baremetal/actuators/machine/actuator.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"time"

bmh "github.com/metalkube/baremetal-operator/pkg/apis/metalkube/v1alpha1"
clusterv1 "github.com/openshift/cluster-api/pkg/apis/cluster/v1alpha1"
machinev1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
clustererror "github.com/openshift/cluster-api/pkg/controller/error"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -68,7 +69,7 @@ func NewActuator(params ActuatorParams) (*Actuator, error) {
}

// Create creates a machine and is invoked by the Machine Controller
func (a *Actuator) Create(ctx context.Context, cluster *machinev1.Cluster, machine *machinev1.Machine) error {
func (a *Actuator) Create(ctx context.Context, cluster *clusterv1.Cluster, machine *machinev1.Machine) error {
log.Printf("Creating machine %v .", machine.Name)
// look for associated BMH
host, err := a.getHost(ctx, machine)
Expand Down Expand Up @@ -101,7 +102,7 @@ func (a *Actuator) Create(ctx context.Context, cluster *machinev1.Cluster, machi
}

// Delete deletes a machine and is invoked by the Machine Controller
func (a *Actuator) Delete(ctx context.Context, cluster *machinev1.Cluster, machine *machinev1.Machine) error {
func (a *Actuator) Delete(ctx context.Context, cluster *clusterv1.Cluster, machine *machinev1.Machine) error {
log.Printf("Deleting machine %v .", machine.Name)
host, err := a.getHost(ctx, machine)
if err != nil {
Expand All @@ -125,7 +126,7 @@ func (a *Actuator) Delete(ctx context.Context, cluster *machinev1.Cluster, machi
}

// Update updates a machine and is invoked by the Machine Controller
func (a *Actuator) Update(ctx context.Context, cluster *machinev1.Cluster, machine *machinev1.Machine) error {
func (a *Actuator) Update(ctx context.Context, cluster *clusterv1.Cluster, machine *machinev1.Machine) error {
log.Printf("Updating machine %v .", machine.Name)
host, err := a.getHost(ctx, machine)
if err != nil {
Expand All @@ -144,7 +145,7 @@ func (a *Actuator) Update(ctx context.Context, cluster *machinev1.Cluster, machi
}

// Exists tests for the existence of a machine and is invoked by the Machine Controller
func (a *Actuator) Exists(ctx context.Context, cluster *machinev1.Cluster, machine *machinev1.Machine) (bool, error) {
func (a *Actuator) Exists(ctx context.Context, cluster *clusterv1.Cluster, machine *machinev1.Machine) (bool, error) {
log.Printf("Checking if machine %v exists.", machine.Name)
host, err := a.getHost(ctx, machine)
if err != nil {
Expand All @@ -163,13 +164,13 @@ func (a *Actuator) Exists(ctx context.Context, cluster *machinev1.Cluster, machi
// (https://github.com/kubernetes-sigs/cluster-api/issues/160).

// GetIP returns IP address of the machine in the cluster.
func (a *Actuator) GetIP(cluster *machinev1.Cluster, machine *machinev1.Machine) (string, error) {
func (a *Actuator) GetIP(cluster *clusterv1.Cluster, machine *machinev1.Machine) (string, error) {
log.Printf("Getting IP of machine %v .", machine.Name)
return "", fmt.Errorf("TODO: Not yet implemented")
}

// GetKubeConfig gets a kubeconfig from the running control plane.
func (a *Actuator) GetKubeConfig(cluster *machinev1.Cluster, controlPlaneMachine *machinev1.Machine) (string, error) {
func (a *Actuator) GetKubeConfig(cluster *clusterv1.Cluster, controlPlaneMachine *machinev1.Machine) (string, error) {
log.Printf("Getting IP of machine %v .", controlPlaneMachine.Name)
return "", fmt.Errorf("TODO: Not yet implemented")
}
Expand Down
78 changes: 11 additions & 67 deletions vendor/github.com/openshift/cluster-api/README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.