Skip to content
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

Jump to bottom

pointing of crd crawler back to the main repo holding crds for kafkac… #432

Merged
merged 2 commits into from
Dec 15, 2022
Merged

pointing of crd crawler back to the main repo holding crds for kafkac… #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0d779a
pointing of crd crawler back to the main repo holding crds for kafkac…
henryZrncik Dec 15, 2022
fbf659a
removal of abundant comments in pom.xml file after rewerting workarou…
henryZrncik Dec 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 3 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
henryZrncik marked this conversation as resolved.
Show resolved Hide resolved
<outputFileName>rhoas-operator.kafkaconnections.crd.yaml</outputFileName>
<outputDirectory>${project.build.directory}/manifests</outputDirectory>
</configuration>
Expand All @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/io/managed/services/test/devexp/ServiceRegistryOperatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down