Merge pull request #432 from bf2fc6cc711aee1a0c2a/fabric8-operator-crds

pointing of crd crawler back to the main repo holding crds for kafkac…
bf2fc6cc711aee1a0c2a · Dec 15, 2022 · e7b0cd3 · e7b0cd3
2 parents 54d8c7a + fbf659a
commit e7b0cd3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
         <maven.checkstyle.version>3.2.0</maven.checkstyle.version>
         <maven.failsafe.version>3.0.0-M7</maven.failsafe.version>
         <download.maven.plugin.version>1.6.8</download.maven.plugin.version>
-        <fabric8.version>6.2.0</fabric8.version>
+        <fabric8.version>6.3.0</fabric8.version>
         <sundrio.version>0.93.1</sundrio.version>
         <!-- See 'Update the rhoas-model dependency' in the README.md on how to build and update the rhoas-model -->
         <rhoas-model.version>0.9.7</rhoas-model.version>
@@ -319,8 +319,7 @@
                             <goal>wget</goal>
                         </goals>
                         <configuration>
-                            <!-- Temporary usage og forked repo to obtain descriptive enough version of crds to build specific enough Models -->
-                            <url>https://raw.githubusercontent.com/henryZrncik/app-services-operator/kafka-connection-crd-status-metadata-explicit/olm/olm-catalog/rhoas-operator/${rhoas-model.version}/manifests/rhoas-operator.kafkaconnections.crd.yaml</url>
+                            <url>https://raw.githubusercontent.com/redhat-developer/app-services-operator/main/olm/olm-catalog/rhoas-operator/${rhoas-model.version}/manifests/rhoas-operator.kafkaconnections.crd.yaml</url>
                             <outputFileName>rhoas-operator.kafkaconnections.crd.yaml</outputFileName>
                             <outputDirectory>${project.build.directory}/manifests</outputDirectory>
                         </configuration>
@@ -332,8 +331,7 @@
                             <goal>wget</goal>
                         </goals>
                         <configuration>
-                            <!-- The same temporary change as in case of kafkaconnections -->
-                            <url>https://raw.githubusercontent.com/henryZrncik/app-services-operator/kafka-connection-crd-status-metadata-explicit/olm/olm-catalog/rhoas-operator/${rhoas-model.version}/manifests/rhoas-operator.serviceregistryconnections.crd.yaml</url>
+                            <url>https://raw.githubusercontent.com/redhat-developer/app-services-operator/main/olm/olm-catalog/rhoas-operator/${rhoas-model.version}/manifests/rhoas-operator.serviceregistryconnections.crd.yaml</url>
                             <outputFileName>rhoas-operator.serviceregistryconnections.crd.yaml</outputFileName>
                             <outputDirectory>${project.build.directory}/manifests</outputDirectory>
                         </configuration>

diff --git a/src/test/java/io/managed/services/test/devexp/ServiceRegistryOperatorTest.java b/src/test/java/io/managed/services/test/devexp/ServiceRegistryOperatorTest.java
@@ -5,6 +5,7 @@
 import com.redhat.rhoas.v1alpha1.CloudServiceAccountRequestSpec;
 import com.redhat.rhoas.v1alpha1.CloudServicesRequest;
 import com.redhat.rhoas.v1alpha1.CloudServicesRequestSpec;
+import com.redhat.rhoas.v1alpha1.ServiceRegistryConnection;
 import com.redhat.rhoas.v1alpha1.ServiceRegistryConnectionBuilder;
 import com.redhat.rhoas.v1alpha1.serviceregistryconnectionspec.CredentialsBuilder;
 import io.fabric8.kubernetes.api.model.Secret;
@@ -146,7 +147,7 @@ private void cleanCloudServicesRequest() {
     }
 
     private void cleanServiceRegistryConnection() {
-        var c = OperatorUtils.serviceRegistryConnection(oc).withName(SERVICE_REGISTRY_CONNECTION_NAME).get();
+        ServiceRegistryConnection c = OperatorUtils.serviceRegistryConnection(oc).withName(SERVICE_REGISTRY_CONNECTION_NAME).get();
         if (c != null) {
             LOGGER.info("clean ServiceRegistryConnection: {}", c.getMetadata().getName());
             OperatorUtils.serviceRegistryConnection(oc).delete(c);