Merge remote-tracking branch 'origin/retry_and_improved_status_support' into retry_and_improved_status_support

Author: csviri

operator-framework/src/test/java/com/github/containersolutions/operator/ConcurrencyIT.java

@@ -63,7 +63,10 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() {
             log.info("Updating {} resources", NUMBER_OF_RESOURCES_UPDATED);
             // update some resources
             for (int i = 0; i < NUMBER_OF_RESOURCES_UPDATED; i++) {
-                TestCustomResource tcr = integrationTest.createTestCustomResource(String.valueOf(i));
+                TestCustomResource tcr = (TestCustomResource) integrationTest.getCrOperations()
+                        .inNamespace(TEST_NAMESPACE)
+                        .withName(IntegrationTestSupport.TEST_CUSTOM_RESOURCE_PREFIX + i)
+                        .get();
                 tcr.getSpec().setValue(i + UPDATED_SUFFIX);
                 integrationTest.getCrOperations().inNamespace(TEST_NAMESPACE).createOrReplace(tcr);
             }