diff --git a/install/0000_50_machine-api-operator_00_namespace.yaml b/install/0000_30_machine-api-operator_00_namespace.yaml similarity index 100% rename from install/0000_50_machine-api-operator_00_namespace.yaml rename to install/0000_30_machine-api-operator_00_namespace.yaml diff --git a/install/0000_50_machine-api-operator_01_images.configmap.yaml b/install/0000_30_machine-api-operator_01_images.configmap.yaml similarity index 100% rename from install/0000_50_machine-api-operator_01_images.configmap.yaml rename to install/0000_30_machine-api-operator_01_images.configmap.yaml diff --git a/install/0000_50_machine-api-operator_02_machine.crd.yaml b/install/0000_30_machine-api-operator_02_machine.crd.yaml similarity index 100% rename from install/0000_50_machine-api-operator_02_machine.crd.yaml rename to install/0000_30_machine-api-operator_02_machine.crd.yaml diff --git a/install/0000_50_machine-api-operator_03_machineset.crd.yaml b/install/0000_30_machine-api-operator_03_machineset.crd.yaml similarity index 100% rename from install/0000_50_machine-api-operator_03_machineset.crd.yaml rename to install/0000_30_machine-api-operator_03_machineset.crd.yaml diff --git a/install/0000_50_machine-api-operator_04_machinedeployment.crd.yaml b/install/0000_30_machine-api-operator_04_machinedeployment.crd.yaml similarity index 100% rename from install/0000_50_machine-api-operator_04_machinedeployment.crd.yaml rename to install/0000_30_machine-api-operator_04_machinedeployment.crd.yaml diff --git a/install/0000_50_machine-api-operator_05_cluster.crd.yaml b/install/0000_30_machine-api-operator_05_cluster.crd.yaml similarity index 100% rename from install/0000_50_machine-api-operator_05_cluster.crd.yaml rename to install/0000_30_machine-api-operator_05_cluster.crd.yaml diff --git a/install/0000_50_machine-api-operator_06_machineclass.crd.yaml b/install/0000_30_machine-api-operator_06_machineclass.crd.yaml similarity index 100% rename from install/0000_50_machine-api-operator_06_machineclass.crd.yaml rename to install/0000_30_machine-api-operator_06_machineclass.crd.yaml diff --git a/install/0000_50_machine-api-operator_07_machinehealthcheck.crd.yaml b/install/0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml similarity index 100% rename from install/0000_50_machine-api-operator_07_machinehealthcheck.crd.yaml rename to install/0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml diff --git a/install/0000_50_machine-api-operator_08_machine.crd.yaml b/install/0000_30_machine-api-operator_08_machine.crd.yaml similarity index 100% rename from install/0000_50_machine-api-operator_08_machine.crd.yaml rename to install/0000_30_machine-api-operator_08_machine.crd.yaml diff --git a/install/0000_50_machine-api-operator_09_machineset.crd.yaml b/install/0000_30_machine-api-operator_09_machineset.crd.yaml similarity index 100% rename from install/0000_50_machine-api-operator_09_machineset.crd.yaml rename to install/0000_30_machine-api-operator_09_machineset.crd.yaml diff --git a/install/0000_50_machine-api-operator_10_machinedeployment.crd.yaml b/install/0000_30_machine-api-operator_10_machinedeployment.crd.yaml similarity index 100% rename from install/0000_50_machine-api-operator_10_machinedeployment.crd.yaml rename to install/0000_30_machine-api-operator_10_machinedeployment.crd.yaml diff --git a/install/0000_50_machine-api-operator_11_cluster.crd.yaml b/install/0000_30_machine-api-operator_11_cluster.crd.yaml similarity index 100% rename from install/0000_50_machine-api-operator_11_cluster.crd.yaml rename to install/0000_30_machine-api-operator_11_cluster.crd.yaml diff --git a/install/0000_50_machine-api-operator_12_machineclass.crd.yaml b/install/0000_30_machine-api-operator_12_machineclass.crd.yaml similarity index 100% rename from install/0000_50_machine-api-operator_12_machineclass.crd.yaml rename to install/0000_30_machine-api-operator_12_machineclass.crd.yaml diff --git a/install/0000_50_machine-api-operator_13_rbac.yaml b/install/0000_30_machine-api-operator_13_rbac.yaml similarity index 100% rename from install/0000_50_machine-api-operator_13_rbac.yaml rename to install/0000_30_machine-api-operator_13_rbac.yaml diff --git a/install/0000_50_machine-api-operator_14_deployment.yaml b/install/0000_30_machine-api-operator_14_deployment.yaml similarity index 100% rename from install/0000_50_machine-api-operator_14_deployment.yaml rename to install/0000_30_machine-api-operator_14_deployment.yaml diff --git a/test/integration/main.go b/test/integration/main.go index 834d42e9f..6e0bd53b5 100644 --- a/test/integration/main.go +++ b/test/integration/main.go @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) diff --git a/test/integration/manifests/0000_30_machine-api-operator_02_machine.crd.yaml b/test/integration/manifests/0000_30_machine-api-operator_02_machine.crd.yaml new file mode 120000 index 000000000..0a8d210cc --- /dev/null +++ b/test/integration/manifests/0000_30_machine-api-operator_02_machine.crd.yaml @@ -0,0 +1 @@ +../../../install/0000_30_machine-api-operator_02_machine.crd.yaml \ No newline at end of file diff --git a/test/integration/manifests/0000_30_machine-api-operator_03_machineset.crd.yaml b/test/integration/manifests/0000_30_machine-api-operator_03_machineset.crd.yaml new file mode 120000 index 000000000..46cf84479 --- /dev/null +++ b/test/integration/manifests/0000_30_machine-api-operator_03_machineset.crd.yaml @@ -0,0 +1 @@ +../../../install/0000_30_machine-api-operator_03_machineset.crd.yaml \ No newline at end of file diff --git a/test/integration/manifests/0000_30_machine-api-operator_04_machinedeployment.crd.yaml b/test/integration/manifests/0000_30_machine-api-operator_04_machinedeployment.crd.yaml new file mode 120000 index 000000000..cb7f3a0b6 --- /dev/null +++ b/test/integration/manifests/0000_30_machine-api-operator_04_machinedeployment.crd.yaml @@ -0,0 +1 @@ +../../../install/0000_30_machine-api-operator_04_machinedeployment.crd.yaml \ No newline at end of file diff --git a/test/integration/manifests/0000_30_machine-api-operator_05_cluster.crd.yaml b/test/integration/manifests/0000_30_machine-api-operator_05_cluster.crd.yaml new file mode 120000 index 000000000..5e8528a7d --- /dev/null +++ b/test/integration/manifests/0000_30_machine-api-operator_05_cluster.crd.yaml @@ -0,0 +1 @@ +../../../install/0000_30_machine-api-operator_05_cluster.crd.yaml \ No newline at end of file diff --git a/test/integration/manifests/0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml b/test/integration/manifests/0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml new file mode 120000 index 000000000..9a0963fe0 --- /dev/null +++ b/test/integration/manifests/0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml @@ -0,0 +1 @@ +../../../install/0000_30_machine-api-operator_07_machinehealthcheck.crd.yaml \ No newline at end of file diff --git a/test/integration/manifests/0000_50_machine-api-operator_02_machine.crd.yaml b/test/integration/manifests/0000_50_machine-api-operator_02_machine.crd.yaml deleted file mode 120000 index afcf0830a..000000000 --- a/test/integration/manifests/0000_50_machine-api-operator_02_machine.crd.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../install/0000_50_machine-api-operator_02_machine.crd.yaml \ No newline at end of file diff --git a/test/integration/manifests/0000_50_machine-api-operator_03_machineset.crd.yaml b/test/integration/manifests/0000_50_machine-api-operator_03_machineset.crd.yaml deleted file mode 120000 index 476f3cf91..000000000 --- a/test/integration/manifests/0000_50_machine-api-operator_03_machineset.crd.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../install/0000_50_machine-api-operator_03_machineset.crd.yaml \ No newline at end of file diff --git a/test/integration/manifests/0000_50_machine-api-operator_04_machinedeployment.crd.yaml b/test/integration/manifests/0000_50_machine-api-operator_04_machinedeployment.crd.yaml deleted file mode 120000 index 22e7a2960..000000000 --- a/test/integration/manifests/0000_50_machine-api-operator_04_machinedeployment.crd.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../install/0000_50_machine-api-operator_04_machinedeployment.crd.yaml \ No newline at end of file diff --git a/test/integration/manifests/0000_50_machine-api-operator_05_cluster.crd.yaml b/test/integration/manifests/0000_50_machine-api-operator_05_cluster.crd.yaml deleted file mode 120000 index 7e5095ee8..000000000 --- a/test/integration/manifests/0000_50_machine-api-operator_05_cluster.crd.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../install/0000_50_machine-api-operator_05_cluster.crd.yaml \ No newline at end of file diff --git a/test/integration/manifests/0000_50_machine-api-operator_07_machinehealthcheck.crd.yaml b/test/integration/manifests/0000_50_machine-api-operator_07_machinehealthcheck.crd.yaml deleted file mode 120000 index ffca8f1e6..000000000 --- a/test/integration/manifests/0000_50_machine-api-operator_07_machinehealthcheck.crd.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../install/0000_50_machine-api-operator_07_machinehealthcheck.crd.yaml \ No newline at end of file