Merge pull request #295 from shiftstack/misc

Misc changes

Author: mdbooth

internal/controllers/flavor/tests/flavor-import-error/01-assert.yaml

@@ -6,8 +6,6 @@ metadata:
 status:
   conditions:
     - type: Available
-      # FIXME: message is not consistent with other resources
-      # https://github.com/k-orc/openstack-resource-controller/issues/186
       message: found more than one matching OpenStack resource during import
       status: "False"
       reason: InvalidConfiguration

…/tests/image-import/01-create-image.yaml …s/image-import/01-create-trap-image.yamlinternal/controllers/image/tests/image-import/01-create-image.yaml renamed to internal/controllers/image/tests/image-import/01-create-trap-image.yaml internal/controllers/image/tests/image-import/01-create-image.yaml renamed to internal/controllers/image/tests/image-import/01-create-trap-image.yaml

@@ -1,7 +1,7 @@
 ---
-# This `image-import-external-not-this-one` image serves two purposes:
-# - ensure that we can successfully create another image which name is a substring of it (i.e. it's not being adopted)
-# - ensure that importing an image which name is a substring of it will not pick this one.
+# This `import-external-not-this-one` resource serves two purposes:
+# - ensure that we can successfully create another resource which name is a substring of it (i.e. it's not being adopted)
+# - ensure that importing a resource which name is a substring of it will not pick this one.
 apiVersion: openstack.k-orc.cloud/v1alpha1
 kind: Image
 metadata:

internal/controllers/network/tests/network-create-minimal/00-network.yaml

@@ -7,5 +7,4 @@ spec:
     cloudName: openstack
     secretName: openstack-clouds
   managementPolicy: managed
-  resource:
-    name: network-create-minimal
+  resource: {}

internal/controllers/subnet/tests/subnet-create-minimal-v4/00-subnet.yaml

@@ -7,8 +7,7 @@ spec:
     cloudName: openstack
     secretName: openstack-clouds
   managementPolicy: managed
-  resource:
-    name: subnet-create-minimal-v4
+  resource: {}
 ---
 apiVersion: openstack.k-orc.cloud/v1alpha1
 kind: Subnet

internal/controllers/subnet/tests/subnet-create-minimal-v6/00-subnet.yaml

@@ -7,8 +7,7 @@ spec:
     cloudName: openstack
     secretName: openstack-clouds
   managementPolicy: managed
-  resource:
-    name: subnet-create-minimal-v6
+  resource: {}
 ---
 apiVersion: openstack.k-orc.cloud/v1alpha1
 kind: Subnet

internal/controllers/subnet/tests/subnet-import-error/00-create-network.yaml

@@ -7,5 +7,4 @@ spec:
     cloudName: openstack
     secretName: openstack-clouds
   managementPolicy: managed
-  resource:
-    name: subnet-import-error
+  resource: {}

internal/controllers/subnet/tests/subnet-import/00-create-network.yaml

@@ -8,8 +8,7 @@ spec:
     cloudName: openstack
     secretName: openstack-clouds
   managementPolicy: managed
-  resource:
-    name: subnet-import
+  resource: {}
 ---
 apiVersion: openstack.k-orc.cloud/v1alpha1
 kind: Network
@@ -20,5 +19,4 @@ spec:
     cloudName: openstack
     secretName: openstack-clouds
   managementPolicy: managed
-  resource:
-    name: subnet-import-not-this-one
+  resource: {}