Skip to content

Drop deprecated namespace from tests #207

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 1 commit into from
Feb 13, 2019
Merged

Drop deprecated namespace from tests #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pkg/controller/machinehealthcheck/machinehealthcheck_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
)

const (
namespace = "openshift-cluster-api"
namespace = "openshift-machine-api"
)

var (
Expand Down
3 changes: 1 addition & 2 deletions test/e2e/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ import (
)

const (
deprecatedNamespace = "openshift-cluster-api"
namespace = "openshift-machine-api"
namespace = "openshift-machine-api"
)

func init() {
Expand Down
24 changes: 12 additions & 12 deletions test/e2e/operator_expectations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (tc *testConfig) ExpectOperatorAvailable() error {

func (tc *testConfig) ExpectNoClusterObject() error {
listOptions := client.ListOptions{
Namespace: deprecatedNamespace,
Namespace: namespace,
}
clusterList := mapiv1beta1.ClusterList{}

Expand Down Expand Up @@ -96,7 +96,7 @@ func (tc *testConfig) ExpectClusterOperatorStatusAvailable() error {
func (tc *testConfig) ExpectAllMachinesLinkedToANode() error {
machineAnnotationKey := "machine.openshift.io/machine"
listOptions := client.ListOptions{
Namespace: deprecatedNamespace,
Namespace: namespace,
}
machineList := mapiv1beta1.MachineList{}
nodeList := corev1.NodeList{}
Expand Down Expand Up @@ -128,7 +128,7 @@ func (tc *testConfig) ExpectAllMachinesLinkedToANode() error {
return false, nil
}
nodeName := machine.Status.NodeRef.Name
if nodeNameToMachineAnnotation[nodeName] != fmt.Sprintf("%s/%s", deprecatedNamespace, machine.Name) {
if nodeNameToMachineAnnotation[nodeName] != fmt.Sprintf("%s/%s", namespace, machine.Name) {
glog.Errorf("node name %s does not match expected machine name %s, retrying...", nodeName, machine.Name)
return false, nil
}
Expand Down Expand Up @@ -185,7 +185,7 @@ func (tc *testConfig) ExpectReconcileControllersDeployment() error {
func (tc *testConfig) ExpectAdditiveReconcileMachineTaints() error {
glog.Info("Verify machine taints are getting applied to node")
listOptions := client.ListOptions{
Namespace: deprecatedNamespace,
Namespace: namespace,
}
machineList := mapiv1beta1.MachineList{}

Expand All @@ -201,7 +201,7 @@ func (tc *testConfig) ExpectAdditiveReconcileMachineTaints() error {
glog.Infof("Got the machine, %s", machine.Name)
nodeName := machine.Status.NodeRef.Name
nodeKey := types.NamespacedName{
Namespace: deprecatedNamespace,
Namespace: namespace,
Name: nodeName,
}
node := &corev1.Node{}
Expand Down Expand Up @@ -253,7 +253,7 @@ func (tc *testConfig) ExpectAdditiveReconcileMachineTaints() error {

func (tc *testConfig) ExpectNewNodeWhenDeletingMachine() error {
listOptions := client.ListOptions{
Namespace: deprecatedNamespace,
Namespace: namespace,
}
machineList := mapiv1beta1.MachineList{}
nodeList := corev1.NodeList{}
Expand Down Expand Up @@ -358,7 +358,7 @@ MachineLoop:
// Ensure initial number of replicas and nodes
func (tc *testConfig) ExpectAutoscalerScalesOut() error {
listOptions := client.ListOptions{
Namespace: deprecatedNamespace,
Namespace: namespace,
}
glog.Info("Get one machineSet")
machineSetList := mapiv1beta1.MachineSetList{}
Expand Down Expand Up @@ -386,7 +386,7 @@ func (tc *testConfig) ExpectAutoscalerScalesOut() error {
clusterAutoscaler := caov1alpha1.ClusterAutoscaler{
ObjectMeta: metav1.ObjectMeta{
Name: "default",
Namespace: deprecatedNamespace,
Namespace: namespace,
},
TypeMeta: metav1.TypeMeta{
Kind: "ClusterAutoscaler",
Expand All @@ -396,7 +396,7 @@ func (tc *testConfig) ExpectAutoscalerScalesOut() error {
machineAutoscaler := caov1alpha1.MachineAutoscaler{
ObjectMeta: metav1.ObjectMeta{
GenerateName: fmt.Sprintf("autoscale-%s", targetMachineSet.Name),
Namespace: deprecatedNamespace,
Namespace: namespace,
},
TypeMeta: metav1.TypeMeta{
Kind: "MachineAutoscaler",
Expand Down Expand Up @@ -462,7 +462,7 @@ func (tc *testConfig) ExpectAutoscalerScalesOut() error {
workLoad := batchv1.Job{
ObjectMeta: metav1.ObjectMeta{
Name: "workload",
Namespace: deprecatedNamespace,
Namespace: namespace,
},
TypeMeta: metav1.TypeMeta{
Kind: "Job",
Expand Down Expand Up @@ -510,7 +510,7 @@ func (tc *testConfig) ExpectAutoscalerScalesOut() error {
glog.Info("Wait for cluster to scale out number of replicas")
err = wait.PollImmediate(1*time.Second, waitLong, func() (bool, error) {
msKey := types.NamespacedName{
Namespace: deprecatedNamespace,
Namespace: namespace,
Name: targetMachineSet.Name,
}
ms := &mapiv1beta1.MachineSet{}
Expand Down Expand Up @@ -578,7 +578,7 @@ func (tc *testConfig) ExpectAutoscalerScalesOut() error {
glog.Infof("Ensure initial number of replicas: %d", initialNumberOfReplicas)
err = wait.PollImmediate(1*time.Second, waitShort, func() (bool, error) {
msKey := types.NamespacedName{
Namespace: deprecatedNamespace,
Namespace: namespace,
Name: targetMachineSet.Name,
}
ms := &mapiv1beta1.MachineSet{}
Expand Down