Skip to content

Move operator weight to 30 #196

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 5, 2019
Merged

Move operator weight to 30 #196

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
0 ...50_machine-api-operator_00_namespace.yaml → ...30_machine-api-operator_00_namespace.yaml
View file
Open in desktop
File renamed without changes.
0 ...ine-api-operator_01_images.configmap.yaml → ...ine-api-operator_01_images.configmap.yaml
View file
Open in desktop
File renamed without changes.
0 ..._machine-api-operator_02_machine.crd.yaml → ..._machine-api-operator_02_machine.crd.yaml
View file
Open in desktop
File renamed without changes.
0 ...chine-api-operator_03_machineset.crd.yaml → ...chine-api-operator_03_machineset.crd.yaml
View file
Open in desktop
File renamed without changes.
0 ...pi-operator_04_machinedeployment.crd.yaml → ...pi-operator_04_machinedeployment.crd.yaml
View file
Open in desktop
File renamed without changes.
0 ..._machine-api-operator_05_cluster.crd.yaml → ..._machine-api-operator_05_cluster.crd.yaml
View file
Open in desktop
File renamed without changes.
0 ...ine-api-operator_06_machineclass.crd.yaml → ...ine-api-operator_06_machineclass.crd.yaml
View file
Open in desktop
File renamed without changes.
0 ...i-operator_07_machinehealthcheck.crd.yaml → ...i-operator_07_machinehealthcheck.crd.yaml
View file
Open in desktop
File renamed without changes.
0 ..._machine-api-operator_08_machine.crd.yaml → ..._machine-api-operator_08_machine.crd.yaml
View file
Open in desktop
File renamed without changes.
0 ...chine-api-operator_09_machineset.crd.yaml → ...chine-api-operator_09_machineset.crd.yaml
View file
Open in desktop
File renamed without changes.
0 ...pi-operator_10_machinedeployment.crd.yaml → ...pi-operator_10_machinedeployment.crd.yaml
View file
Open in desktop
File renamed without changes.
0 ..._machine-api-operator_11_cluster.crd.yaml → ..._machine-api-operator_11_cluster.crd.yaml
View file
Open in desktop
File renamed without changes.
0 ...ine-api-operator_12_machineclass.crd.yaml → ...ine-api-operator_12_machineclass.crd.yaml
View file
Open in desktop
File renamed without changes.
0 ...0000_50_machine-api-operator_13_rbac.yaml → ...0000_30_machine-api-operator_13_rbac.yaml
View file
Open in desktop
File renamed without changes.
0 ...0_machine-api-operator_14_deployment.yaml → ...0_machine-api-operator_14_deployment.yaml
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions test/integration/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ var rootCmd = &cobra.Command{
}

// create machine CRD
if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_50_machine-api-operator_02_machine.crd.yaml")); err != nil {
if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_30_machine-api-operator_02_machine.crd.yaml")); err != nil {
glog.Fatalf("Error reading %#v", err)
} else {
CRDObj, _, err := decode([]byte(CRDBytes), nil, nil)
Expand All @@ -271,7 +271,7 @@ var rootCmd = &cobra.Command{
}

// create machineSet CRD
if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_50_machine-api-operator_03_machineset.crd.yaml")); err != nil {
if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_30_machine-api-operator_03_machineset.crd.yaml")); err != nil {
glog.Fatalf("Error reading %#v", err)
} else {
CRDObj, _, err := decode([]byte(CRDBytes), nil, nil)
Expand All @@ -286,7 +286,7 @@ var rootCmd = &cobra.Command{
}

// create machineDeployment CRD
if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_50_machine-api-operator_04_machinedeployment.crd.yaml")); err != nil {
if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_30_machine-api-operator_04_machinedeployment.crd.yaml")); err != nil {
glog.Fatalf("Error reading %#v", err)
} else {
CRDObj, _, err := decode([]byte(CRDBytes), nil, nil)
Expand All @@ -301,7 +301,7 @@ var rootCmd = &cobra.Command{
}

// create cluster CRD
if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_50_machine-api-operator_05_cluster.crd.yaml")); err != nil {
if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_30_machine-api-operator_05_cluster.crd.yaml")); err != nil {
glog.Fatalf("Error reading %#v", err)
} else {
CRDObj, _, err := decode([]byte(CRDBytes), nil, nil)
Expand All @@ -316,7 +316,7 @@ var rootCmd = &cobra.Command{
}

// create machinehealthcheck CRD
if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_50_machine-api-operator_07_machinehealthcheck.crd.yaml")); err != nil {
if CRDBytes, err := ioutil.ReadFile(filepath.Join(assetsPath, manifestsFolder, "0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml")); err != nil {
glog.Fatalf("Error reading %#v", err)
} else {
CRDObj, _, err := decode([]byte(CRDBytes), nil, nil)
Expand Down
1 change: 1 addition & 0 deletions test/integration/manifests/0000_30_machine-api-operator_02_machine.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../install/0000_30_machine-api-operator_02_machine.crd.yaml
1 change: 1 addition & 0 deletions test/integration/manifests/0000_30_machine-api-operator_03_machineset.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../install/0000_30_machine-api-operator_03_machineset.crd.yaml
1 change: 1 addition & 0 deletions test/integration/manifests/0000_30_machine-api-operator_04_machinedeployment.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../install/0000_30_machine-api-operator_04_machinedeployment.crd.yaml
1 change: 1 addition & 0 deletions test/integration/manifests/0000_30_machine-api-operator_05_cluster.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../install/0000_30_machine-api-operator_05_cluster.crd.yaml
1 change: 1 addition & 0 deletions test/integration/manifests/0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../install/0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml
1 change: 0 additions & 1 deletion test/integration/manifests/0000_50_machine-api-operator_02_machine.crd.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/integration/manifests/0000_50_machine-api-operator_03_machineset.crd.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/integration/manifests/0000_50_machine-api-operator_04_machinedeployment.crd.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/integration/manifests/0000_50_machine-api-operator_05_cluster.crd.yaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion test/integration/manifests/0000_50_machine-api-operator_07_machinehealthcheck.crd.yaml
View file
Open in desktop

This file was deleted.