Skip to content

Commit bd6255d

Browse files
authored
don't derive explicit release version from substitutesFor/buildMetadata in CSV (#1966)
Signed-off-by: grokspawn <jordan@nimblewidget.com>
1 parent fdecf0e commit bd6255d

1 file changed

Lines changed: 0 additions & 25 deletions

File tree

pkg/registry/parse.go

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -209,13 +209,6 @@ func (b *bundleParser) derivedProperties(bundle *Bundle) ([]Property, error) {
209209
if err != nil {
210210
return nil, err
211211
}
212-
if release == "" && csv.GetSubstitutesFor() != "" {
213-
version, release, err = extractReleaseVersionFromBuildMetadata(version)
214-
if err != nil {
215-
return nil, fmt.Errorf("bundle %q error: %v", bundle.Name, err)
216-
}
217-
}
218-
219212
value, err := json.Marshal(PackageProperty{
220213
PackageName: pkg,
221214
Version: version,
@@ -266,21 +259,3 @@ func propertySet(properties []Property) []Property {
266259

267260
return set
268261
}
269-
270-
func extractReleaseVersionFromBuildMetadata(substitutesFor string) (string, string, error) {
271-
var version, release string
272-
// if the bundle expresses no release version, but
273-
// includes the substitutesFor annotation, then we
274-
// interpret any build metadata in the version as
275-
// the release version.
276-
// failure to parse build metadata under these conditions is fatal,
277-
// though validation is later
278-
parts := strings.SplitN(substitutesFor, "+", 2)
279-
if len(parts) == 2 {
280-
version = parts[0]
281-
release = parts[1]
282-
} else {
283-
return "", "", fmt.Errorf("no release version expressed as build metadata: %q", substitutesFor)
284-
}
285-
return version, release, nil
286-
}

0 commit comments

Comments
 (0)