Skip to content

Commit

Permalink
Merge pull request #97 from cynepco3hahue/rename_repository
Browse files Browse the repository at this point in the history
Rename repository
  • Loading branch information
Artyom Lukianov authored Oct 29, 2019
2 parents 3af2623 + 8375f28 commit 7cda726
Show file tree
Hide file tree
Showing 465 changed files with 555 additions and 555 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# Ignore bazel directories
bazel-bin/
bazel-genfiles/
bazel-machine-remediation-operator/
bazel-machine-remediation/
bazel-out/
bazel-testlogs/

Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sudo: required
dist: trusty
services:
- docker
before_install: docker pull docker.io/alukiano/mro-builder
before_install: docker pull docker.io/alukiano/mr-builder
install:
- git reset --hard
script:
Expand Down Expand Up @@ -48,7 +48,7 @@ deploy:
overwrite: true
name: "$TRAVIS_TAG"
on:
repo: kubevirt/machine-remediation-operator
repo: kubevirt/machine-remediation
tags: true
env:
global:
Expand Down
6 changes: 3 additions & 3 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ goimports(
name = "goimports",
display_diffs = True,
local = ["github.com"],
prefix = "kubevirt.io/machine-remediation-operator",
prefix = "kubevirt.io/machine-remediation",
write = True,
)

Expand Down Expand Up @@ -71,7 +71,7 @@ nogo(

load("@bazel_gazelle//:def.bzl", "gazelle")

# gazelle:prefix kubevirt.io/machine-remediation-operator
# gazelle:prefix kubevirt.io/machine-remediation
gazelle(name = "gazelle")

load("@com_github_bazelbuild_buildtools//buildifier:def.bzl", "buildifier")
Expand Down Expand Up @@ -156,6 +156,6 @@ docker_push(
go_library(
name = "go_default_library",
srcs = ["doc.go"],
importpath = "kubevirt.io/machine-remediation-operator",
importpath = "kubevirt.io/machine-remediation",
visibility = ["//visibility:public"],
)
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ It should deploy three controllers:

## How to deploy

You can check the [GitHub releases](https://github.com/kubevirt/machine-remediation-operator/releases) to get latest `yaml` file, that includes CRD's, RBAC rules and operator deployment and apply it to your cluster.
You can check the [GitHub releases](https://github.com/kubevirt/machine-remediation/releases) to get latest `yaml` file, that includes CRD's, RBAC rules and operator deployment and apply it to your cluster.

```bash
kubectl apply -f https://github.com/kubevirt/machine-remediation-operator/releases/download/v0.3.3/machine-remediation-operator.yaml
kubectl apply -f https://github.com/kubevirt/machine-remediation-operator/releases/download/v0.3.3/machine-remediation-operator-cr.yaml
kubectl apply -f https://github.com/kubevirt/machine-remediation/releases/download/v0.3.3/machine-remediation.yaml
kubectl apply -f https://github.com/kubevirt/machine-remediation/releases/download/v0.3.3/machine-remediation-cr.yaml
```

After just wait until the operator will deploy all components.
Expand Down
2 changes: 1 addition & 1 deletion cmd/machine-remediation/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
go_library(
name = "go_default_library",
srcs = ["main.go"],
importpath = "kubevirt.io/machine-remediation-operator/cmd/machine-remediation",
importpath = "kubevirt.io/machine-remediation/cmd/machine-remediation",
visibility = ["//visibility:private"],
deps = [
"//pkg/apis/machineremediation/v1alpha1:go_default_library",
Expand Down
12 changes: 6 additions & 6 deletions cmd/machine-remediation/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"github.com/golang/glog"
bmov1 "github.com/metal3-io/baremetal-operator/pkg/apis/metal3/v1alpha1"

mrv1 "kubevirt.io/machine-remediation-operator/pkg/apis/machineremediation/v1alpha1"
"kubevirt.io/machine-remediation-operator/pkg/baremetal/remediator"
"kubevirt.io/machine-remediation-operator/pkg/controllers"
"kubevirt.io/machine-remediation-operator/pkg/controllers/machineremediation"
"kubevirt.io/machine-remediation-operator/pkg/controllers/nodereboot"
"kubevirt.io/machine-remediation-operator/pkg/version"
mrv1 "kubevirt.io/machine-remediation/pkg/apis/machineremediation/v1alpha1"
"kubevirt.io/machine-remediation/pkg/baremetal/remediator"
"kubevirt.io/machine-remediation/pkg/controllers"
"kubevirt.io/machine-remediation/pkg/controllers/machineremediation"
"kubevirt.io/machine-remediation/pkg/controllers/nodereboot"
"kubevirt.io/machine-remediation/pkg/version"

mapiv1 "sigs.k8s.io/cluster-api/pkg/apis/machine/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/client/config"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module kubevirt.io/machine-remediation-operator
module kubevirt.io/machine-remediation

require (
github.com/emicklei/go-restful v2.9.6+incompatible // indirect
Expand Down
2 changes: 1 addition & 1 deletion hack/builder/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ SCRIPT_DIR="$(
pwd
)"

docker build -t alukiano/mro-builder -f ${SCRIPT_DIR}/Dockerfile ${SCRIPT_DIR}
docker build -t alukiano/mr-builder -f ${SCRIPT_DIR}/Dockerfile ${SCRIPT_DIR}
4 changes: 2 additions & 2 deletions hack/builder/publish.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ SCRIPT_DIR="$(
pwd
)"

docker tag alukiano/mro-builder docker.io/alukiano/mro-builder
docker push docker.io/alukiano/mro-builder
docker tag alukiano/mr-builder docker.io/alukiano/mr-builder
docker push docker.io/alukiano/mr-builder
6 changes: 3 additions & 3 deletions hack/builder/rsyncd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ reverse lookup = no
[build]
hosts allow = *
read only = false
path = /root/go/src/kubevirt.io/machine-remediation-operator
path = /root/go/src/kubevirt.io/machine-remediation
comment = input sources
[out]
hosts allow = *
read only = false
path = /root/go/src/kubevirt.io/machine-remediation-operator/_out
path = /root/go/src/kubevirt.io/machine-remediation/_out
comment = build output
[vendor]
hosts allow = *
read only = false
path = /root/go/src/kubevirt.io/machine-remediation-operator/vendor
path = /root/go/src/kubevirt.io/machine-remediation/vendor
comment = vendor directory
6 changes: 3 additions & 3 deletions hack/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ BIN_OUT_DIR=${OUT_DIR}/bin
MANIFESTS_OUT_DIR=${OUT_DIR}/manifests
TESTS_OUT_DIR=${OUT_DIR}/tests

BUILDER_IMAGE="docker.io/alukiano/mro-builder@sha256:56a4ebcbc5c43e64c5a65b4889dcfd1f3cb6e88739973feecc68e2ac0d321b83"
BUILDER_REPO_DIR=/root/go/src/kubevirt.io/machine-remediation-operator
BUILDER_IMAGE="docker.io/alukiano/mr-builder@sha256:2da4dffd5622caea5f904d88ad0b403f07f54acecedffe42891573f7c01be94f"
BUILDER_REPO_DIR=/root/go/src/kubevirt.io/machine-remediation
BUILDER_OUT_DIR=$BUILDER_REPO_DIR/_out

OUTPUT_CLIENT_PKG="kubevirt.io/machine-remediation-operator/pkg/client"
OUTPUT_CLIENT_PKG="kubevirt.io/machine-remediation/pkg/client"

function version() {
if [ -n "${REPO_VERSION}" ]; then
Expand Down
6 changes: 3 additions & 3 deletions hack/dockerized
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e
source $(dirname "$0")/common.sh

BUILDER_DIR=${REPO_DIR}/hack/builder
BUILDER=${JOB_NAME:-mro-builder}${EXECUTOR_NUMBER}
BUILDER=${JOB_NAME:-mr-builder}${EXECUTOR_NUMBER}

SYNC_OUT=${SYNC_OUT:-true}
SYNC_VENDOR=${SYNC_VENDOR:-false}
Expand Down Expand Up @@ -71,7 +71,7 @@ _rsync \
--delete \
--exclude 'bazel-bin' \
--exclude 'bazel-genfiles' \
--exclude 'bazel-machine-remediation-operator' \
--exclude 'bazel-machine-remediation' \
--exclude 'bazel-out' \
--exclude 'bazel-testlogs' \
--exclude 'cluster-up/cluster/**/.kubectl' \
Expand Down Expand Up @@ -102,7 +102,7 @@ _rsync \
--delete \
--exclude 'bazel-bin' \
--exclude 'bazel-genfiles' \
--exclude 'bazel-machine-remediation-operator' \
--exclude 'bazel-machine-remediation' \
--exclude 'bazel-out' \
--exclude 'bazel-testlogs' \
--exclude 'cluster-up/cluster/**/.kubectl' \
Expand Down
2 changes: 1 addition & 1 deletion hack/generate/client.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e

source $(dirname "$0")/../common.sh

APIS_PKG="kubevirt.io/machine-remediation-operator/pkg/apis"
APIS_PKG="kubevirt.io/machine-remediation/pkg/apis"
APIS_VERSIONS="${APIS_PKG}/machineremediation/v1alpha1"
CODE_GENERATORS_CMD_DIR=${VENDOR_DIR}/k8s.io/code-generator/cmd

Expand Down
2 changes: 1 addition & 1 deletion hack/kubevirtci/sha.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d8ede0eb3658205a05886fbe69c6ca36bfedfb09717a0b02d31d74209d4242bd
452f99705cfa5be4aa22aca30bc84781d627858a55cb033a2276f93c844fa932
2 changes: 1 addition & 1 deletion hack/version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ function version::ldflag() {
local key=${1}
local val=${2}

echo "-X kubevirt.io/machine-remediation-operator/pkg/version.${key}=${val}"
echo "-X kubevirt.io/machine-remediation/pkg/version.${key}=${val}"
}

# Prints the value that needs to be passed to the -ldflags parameter of go build
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/machineremediation/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["register.go"],
importpath = "kubevirt.io/machine-remediation-operator/pkg/apis/machineremediation",
importpath = "kubevirt.io/machine-remediation/pkg/apis/machineremediation",
visibility = ["//visibility:public"],
)
2 changes: 1 addition & 1 deletion pkg/apis/machineremediation/v1alpha1/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ go_library(
"register.go",
"zz_generated.deepcopy.go",
],
importpath = "kubevirt.io/machine-remediation-operator/pkg/apis/machineremediation/v1alpha1",
importpath = "kubevirt.io/machine-remediation/pkg/apis/machineremediation/v1alpha1",
visibility = ["//visibility:public"],
deps = [
"//pkg/apis/machineremediation:go_default_library",
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/machineremediation/v1alpha1/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"

"kubevirt.io/machine-remediation-operator/pkg/apis/machineremediation"
"kubevirt.io/machine-remediation/pkg/apis/machineremediation"
)

// SchemeGroupVersion is group version used to register these objects
Expand Down
2 changes: 1 addition & 1 deletion pkg/baremetal/remediator/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_library(
name = "go_default_library",
srcs = ["remediator.go"],
importpath = "kubevirt.io/machine-remediation-operator/pkg/baremetal/remediator",
importpath = "kubevirt.io/machine-remediation/pkg/baremetal/remediator",
visibility = ["//visibility:public"],
deps = [
"//pkg/apis/machineremediation/v1alpha1:go_default_library",
Expand Down
6 changes: 3 additions & 3 deletions pkg/baremetal/remediator/remediator.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"
"time"

mrv1 "kubevirt.io/machine-remediation-operator/pkg/apis/machineremediation/v1alpha1"
"kubevirt.io/machine-remediation-operator/pkg/consts"
"kubevirt.io/machine-remediation-operator/pkg/utils/conditions"
mrv1 "kubevirt.io/machine-remediation/pkg/apis/machineremediation/v1alpha1"
"kubevirt.io/machine-remediation/pkg/consts"
"kubevirt.io/machine-remediation/pkg/utils/conditions"

"github.com/golang/glog"
bmov1 "github.com/metal3-io/baremetal-operator/pkg/apis/metal3/v1alpha1"
Expand Down
60 changes: 30 additions & 30 deletions pkg/baremetal/remediator/remediator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import (
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/tools/record"

mrv1 "kubevirt.io/machine-remediation-operator/pkg/apis/machineremediation/v1alpha1"
"kubevirt.io/machine-remediation-operator/pkg/consts"
mrotesting "kubevirt.io/machine-remediation-operator/pkg/utils/testing"
mrv1 "kubevirt.io/machine-remediation/pkg/apis/machineremediation/v1alpha1"
"kubevirt.io/machine-remediation/pkg/consts"
mrtesting "kubevirt.io/machine-remediation/pkg/utils/testing"

mapiv1 "sigs.k8s.io/cluster-api/pkg/apis/machine/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
Expand Down Expand Up @@ -49,57 +49,57 @@ type expectedRemediationResult struct {
}

func TestRemediationReboot(t *testing.T) {
nodeOnline := mrotesting.NewNode("nodeOnline", true, "machineOnline")
nodeOnline := mrtesting.NewNode("nodeOnline", true, "machineOnline")
nodeOnline.Annotations = map[string]string{
consts.AnnotationNodeMachineReboot: "",
}

bareMetalHostOnline := mrotesting.NewBareMetalHost("bareMetalHostOnline", true, true)
bareMetalHostOnline := mrtesting.NewBareMetalHost("bareMetalHostOnline", true, true)
bareMetalHostOnline.Annotations[consts.AnnotationRebootInProgress] = "true"
machineOnline := mrotesting.NewMachine("machineOnline", nodeOnline.Name, bareMetalHostOnline.Name)
machineOnline := mrtesting.NewMachine("machineOnline", nodeOnline.Name, bareMetalHostOnline.Name)

bareMetalHostOnlineWithoutRebootAnnotation := mrotesting.NewBareMetalHost("bareMetalHostOnlineWithoutRebootAnnotation", true, true)
machineOnlineWithoutRebootAnnotation := mrotesting.NewMachine("machineOnlineWithoutRebootAnnotation", nodeOnline.Name, bareMetalHostOnlineWithoutRebootAnnotation.Name)
bareMetalHostOnlineWithoutRebootAnnotation := mrtesting.NewBareMetalHost("bareMetalHostOnlineWithoutRebootAnnotation", true, true)
machineOnlineWithoutRebootAnnotation := mrtesting.NewMachine("machineOnlineWithoutRebootAnnotation", nodeOnline.Name, bareMetalHostOnlineWithoutRebootAnnotation.Name)

nodeOffline := mrotesting.NewNode("nodeOffline", false, "machineOffline")
nodeOffline := mrtesting.NewNode("nodeOffline", false, "machineOffline")
nodeOffline.Annotations = map[string]string{
consts.AnnotationNodeMachineReboot: "",
}

bareMetalHostOffline := mrotesting.NewBareMetalHost("bareMetalHostOffline", false, false)
machineOffline := mrotesting.NewMachine("machineOffline", nodeOffline.Name, bareMetalHostOffline.Name)
bareMetalHostOffline := mrtesting.NewBareMetalHost("bareMetalHostOffline", false, false)
machineOffline := mrtesting.NewMachine("machineOffline", nodeOffline.Name, bareMetalHostOffline.Name)

bareMetalHostOfflineWithRebootAnnotation := mrotesting.NewBareMetalHost("bareMetalHostOfflineWithRebootAnnotation", false, false)
bareMetalHostOfflineWithRebootAnnotation := mrtesting.NewBareMetalHost("bareMetalHostOfflineWithRebootAnnotation", false, false)
bareMetalHostOfflineWithRebootAnnotation.Annotations[consts.AnnotationRebootInProgress] = "true"
machineOfflineWithRebootAnnotation := mrotesting.NewMachine("machineOfflineWithRebootAnnotation", nodeOffline.Name, bareMetalHostOfflineWithRebootAnnotation.Name)
machineOfflineWithRebootAnnotation := mrtesting.NewMachine("machineOfflineWithRebootAnnotation", nodeOffline.Name, bareMetalHostOfflineWithRebootAnnotation.Name)

nodeNotReady := mrotesting.NewNode("nodeNotReady", false, "machineNotReady")
nodeNotReady := mrtesting.NewNode("nodeNotReady", false, "machineNotReady")
nodeNotReady.Annotations = map[string]string{
consts.AnnotationNodeMachineReboot: "",
}

bareMetalHostNotReady := mrotesting.NewBareMetalHost("bareMetalHostNotReady", true, true)
machineNotReady := mrotesting.NewMachine("machineNotReady", nodeNotReady.Name, bareMetalHostNotReady.Name)
bareMetalHostNotReady := mrtesting.NewBareMetalHost("bareMetalHostNotReady", true, true)
machineNotReady := mrtesting.NewMachine("machineNotReady", nodeNotReady.Name, bareMetalHostNotReady.Name)

machineRemediationStartedOnline := mrotesting.NewMachineRemediation("machineRemediationStartedOnline", machineOnline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStateStarted)
machineRemediationStartedOffline := mrotesting.NewMachineRemediation("machineRemediationStartedOffline", machineOffline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStateStarted)
machineRemediationPoweroffOnline := mrotesting.NewMachineRemediation("machineRemediationPoweroffOnline", machineOnline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStatePowerOff)
machineRemediationPoweroffOffline := mrotesting.NewMachineRemediation("machineRemediationPoweroffOffline", machineOffline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStatePowerOff)
machineRemediationPoweroffTimeout := mrotesting.NewMachineRemediation("machineRemediationPoweroffTimeout", machineOffline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStatePowerOff)
machineRemediationStartedOnline := mrtesting.NewMachineRemediation("machineRemediationStartedOnline", machineOnline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStateStarted)
machineRemediationStartedOffline := mrtesting.NewMachineRemediation("machineRemediationStartedOffline", machineOffline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStateStarted)
machineRemediationPoweroffOnline := mrtesting.NewMachineRemediation("machineRemediationPoweroffOnline", machineOnline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStatePowerOff)
machineRemediationPoweroffOffline := mrtesting.NewMachineRemediation("machineRemediationPoweroffOffline", machineOffline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStatePowerOff)
machineRemediationPoweroffTimeout := mrtesting.NewMachineRemediation("machineRemediationPoweroffTimeout", machineOffline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStatePowerOff)
machineRemediationPoweroffTimeout.Status.StartTime = &metav1.Time{
Time: machineRemediationPoweroffTimeout.Status.StartTime.Time.Add(-time.Minute * 6),
}
machineRemediationPoweron := mrotesting.NewMachineRemediation("machineRemediationPoweron", machineOnline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStatePowerOn)
machineRemediationPoweronTimeout := mrotesting.NewMachineRemediation("machineRemediationPoweronTimeout", machineOnline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStatePowerOn)
machineRemediationPoweron := mrtesting.NewMachineRemediation("machineRemediationPoweron", machineOnline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStatePowerOn)
machineRemediationPoweronTimeout := mrtesting.NewMachineRemediation("machineRemediationPoweronTimeout", machineOnline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStatePowerOn)
machineRemediationPoweronTimeout.Status.StartTime = &metav1.Time{
Time: machineRemediationPoweroffTimeout.Status.StartTime.Time.Add(-time.Minute * 6),
}
machineRemediationPoweronNotReady := mrotesting.NewMachineRemediation("machineRemediationPoweronNotReady", machineNotReady.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStatePowerOn)
machineRemediationSucceeded := mrotesting.NewMachineRemediation("machineRemediationSucceeded", machineOnline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStateSucceeded)
machineRemediationFailed := mrotesting.NewMachineRemediation("machineRemediationFailed", machineOnline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStateFailed)
machineRemediationStartedOfflineWithRebootInProgressAnnotation := mrotesting.NewMachineRemediation("machineRemediationStartedOfflineWithRebootInProgressAnnotation", machineOfflineWithRebootAnnotation.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStateStarted)
machineRemediationStartedOnlineWithoutRebootInProgressAnnotation := mrotesting.NewMachineRemediation("machineRemediationStartedOnlineWithoutRebootInProgressAnnotation", machineOnlineWithoutRebootAnnotation.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStateStarted)
machineRemediationPoweroffOnlineWithRebootInProgressAnnotation := mrotesting.NewMachineRemediation("machineRemediationPoweroffOnlineWithRebootInProgressAnnotation", machineOfflineWithRebootAnnotation.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStatePowerOff)
machineRemediationPoweronNotReady := mrtesting.NewMachineRemediation("machineRemediationPoweronNotReady", machineNotReady.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStatePowerOn)
machineRemediationSucceeded := mrtesting.NewMachineRemediation("machineRemediationSucceeded", machineOnline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStateSucceeded)
machineRemediationFailed := mrtesting.NewMachineRemediation("machineRemediationFailed", machineOnline.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStateFailed)
machineRemediationStartedOfflineWithRebootInProgressAnnotation := mrtesting.NewMachineRemediation("machineRemediationStartedOfflineWithRebootInProgressAnnotation", machineOfflineWithRebootAnnotation.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStateStarted)
machineRemediationStartedOnlineWithoutRebootInProgressAnnotation := mrtesting.NewMachineRemediation("machineRemediationStartedOnlineWithoutRebootInProgressAnnotation", machineOnlineWithoutRebootAnnotation.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStateStarted)
machineRemediationPoweroffOnlineWithRebootInProgressAnnotation := mrtesting.NewMachineRemediation("machineRemediationPoweroffOnlineWithRebootInProgressAnnotation", machineOfflineWithRebootAnnotation.Name, mrv1.RemediationTypeReboot, mrv1.RemediationStatePowerOff)

testCases := []struct {
name string
Expand Down Expand Up @@ -339,7 +339,7 @@ func TestRemediationReboot(t *testing.T) {
t.Errorf("%s failed, expected no error, got: %v", tc.name, err)
}

mrotesting.AssertEvents(t, tc.name, tc.expectedEvents, recorder.Events)
mrtesting.AssertEvents(t, tc.name, tc.expectedEvents, recorder.Events)

newMachineRemediation := &mrv1.MachineRemediation{}
key := types.NamespacedName{
Expand Down
2 changes: 1 addition & 1 deletion pkg/client/clientset/versioned/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ go_library(
"clientset.go",
"doc.go",
],
importpath = "kubevirt.io/machine-remediation-operator/pkg/client/clientset/versioned",
importpath = "kubevirt.io/machine-remediation/pkg/client/clientset/versioned",
visibility = ["//visibility:public"],
deps = [
"//pkg/client/clientset/versioned/typed/machineremediation/v1alpha1:go_default_library",
Expand Down
Loading

0 comments on commit 7cda726

Please sign in to comment.