Skip to content

Commit 52b9884

Browse files
committed
revert: remove guessing of provider URL since it's potentially dangerous
Signed-off-by: Chris Laprun <[email protected]>
1 parent e6bc310 commit 52b9884

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

bundle-generator/deployment/src/main/java/io/quarkiverse/operatorsdk/bundle/deployment/BundleProcessor.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,7 @@ CSVMetadataBuildItem gatherCSVMetadata(KubernetesConfig kubernetesConfig,
8686

8787
final var defaultReplaces = bundleConfiguration.replaces.orElse(null);
8888

89-
final var defaultProviderURL = getDefaultProviderURLFromSCMInfo(appConfiguration, jarBuildItem);
90-
final var sharedMetadataHolders = getSharedMetadataHolders(defaultName, defaultVersion, defaultReplaces, index,
91-
defaultProviderURL);
89+
final var sharedMetadataHolders = getSharedMetadataHolders(defaultName, defaultVersion, defaultReplaces, index);
9290
final var csvGroups = new HashMap<CSVMetadataHolder, List<ReconcilerAugmentedClassInfo>>();
9391

9492
ClassUtils.getKnownReconcilers(index, log)
@@ -121,7 +119,7 @@ CSVMetadataBuildItem gatherCSVMetadata(KubernetesConfig kubernetesConfig,
121119
}
122120
csvMetadata = createMetadataHolder(csvMetadataAnnotation,
123121
new CSVMetadataHolder(sharedMetadataName, defaultVersion, defaultReplaces,
124-
DEFAULT_PROVIDER_NAME, defaultProviderURL, origin));
122+
DEFAULT_PROVIDER_NAME, origin));
125123
if (DEFAULT_PROVIDER_NAME.equals(csvMetadata.providerName)) {
126124
log.warnv(
127125
"It is recommended that you provide a provider name provided for {0}: ''{1}'' was used as default value.",
@@ -298,8 +296,8 @@ void generateBundle(ApplicationInfoBuildItem configuration,
298296
}
299297

300298
private Map<String, CSVMetadataHolder> getSharedMetadataHolders(String name, String version, String defaultReplaces,
301-
IndexView index, String vcsUrl) {
302-
CSVMetadataHolder csvMetadata = new CSVMetadataHolder(name, version, defaultReplaces, vcsUrl, DEFAULT_PROVIDER_NAME,
299+
IndexView index) {
300+
CSVMetadataHolder csvMetadata = new CSVMetadataHolder(name, version, defaultReplaces, DEFAULT_PROVIDER_NAME,
303301
"default");
304302
final var sharedMetadataImpls = index.getAllKnownImplementors(SHARED_CSV_METADATA);
305303
final var result = new HashMap<String, CSVMetadataHolder>(sharedMetadataImpls.size() + 1);

bundle-generator/deployment/src/test/java/io/quarkiverse/operatorsdk/bundle/DefaultBundleWhenNoCsvMetadataTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public void shouldWriteBundleEvenWhenCsvMetadataIsNotUsed() throws IOException {
3838
// by default, we shouldn't output the version label in the selector match labels as the default controlling this should be overridden by KubernetesLabelConfigOverrider
3939
assertNull(deployment.getSpec().getSelector().getMatchLabels().get("app.kubernetes.io/version"));
4040
assertEquals(System.getProperty("user.name"), csv.getSpec().getProvider().getName());
41-
assertNotNull(csv.getSpec().getProvider().getUrl());
4241
}
4342

4443
}

bundle-generator/runtime/src/main/java/io/quarkiverse/operatorsdk/bundle/runtime/CSVMetadataHolder.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,8 @@ public RequiredCRD(String kind, String name, String version) {
118118

119119
}
120120

121-
public CSVMetadataHolder(String bundleName, String version, String replaces, String providerName, String providerURL,
122-
String origin) {
123-
this(bundleName, null, null, null, null, null, providerName, providerURL, replaces, null, version, null, null, null,
121+
public CSVMetadataHolder(String bundleName, String version, String replaces, String providerName, String origin) {
122+
this(bundleName, null, null, null, null, null, providerName, null, replaces, null, version, null, null, null,
124123
null, null,
125124
null, null,
126125
null,

0 commit comments

Comments
 (0)