address review comment about type validation

Signed-off-by: Rashmi Gottipati <rgottipa@redhat.com>

Author: rashmigottipati

api/v1/clusterextension_types.go

@@ -486,6 +486,7 @@ type BundleMetadata struct {
 	//
 	// +optional
 	// <opcon:experimental>
+	// +kubebuilder:validation:MaxLength=20
 	// +kubebuilder:validation:XValidation:rule="self.matches(\"^$|^(0|[1-9][0-9]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*)(\\\\.(0|[1-9][0-9]*|[0-9]*[A-Za-z-][0-9A-Za-z-]*))*$\")",message="release must be empty or consist of dot-separated identifiers (numeric without leading zeros, or alphanumeric)"
 	Release *string `json:"release,omitempty"`
 }

docs/api-reference/olmv1-api-reference.md

@@ -67,7 +67,7 @@ _Appears in:_
 | --- | --- | --- | --- |
 | `name` _string_ | name is required and follows the DNS subdomain standard as defined in [RFC 1123].<br />It must contain only lowercase alphanumeric characters, hyphens (-) or periods (.),<br />start and end with an alphanumeric character, and be no longer than 253 characters. |  | Required: \{\} <br /> |
 | `version` _string_ | version is required and references the version that this bundle represents.<br />It follows the semantic versioning standard as defined in https://semver.org/. |  | Required: \{\} <br /> |
-| `release` _string_ | release is an optional field that identifies a specific release of this bundle's version.<br />A release represents a re-publication of the same version, typically used to deliver<br />packaging or metadata changes without changing the version number. When multiple<br />releases exist for the same version, higher releases are preferred. An unset release<br />is less preferred than all other release values.<br />The value consists of dot-separated identifiers, where each identifier is either a<br />numeric value (without leading zeros) or an alphanumeric string (e.g., "2", "1.el9",<br />"3.alpha.1"). Releases are compared identifier by identifier: numeric identifiers are<br />compared as integers, alphanumeric identifiers are compared lexically, and numeric<br />identifiers always sort before alphanumeric identifiers.<br />For bundles with explicit pkg.Release metadata, this field contains that release value.<br />For registry+v1 bundles lacking an explicit release value, this field contains the release<br />extracted from version's build metadata (e.g., '2' from '1.0.0+2').<br />This field is omitted when the bundle's release value is unset.<br /><opcon:experimental> |  | Optional: \{\} <br /> |
+| `release` _string_ | release is an optional field that identifies a specific release of this bundle's version.<br />A release represents a re-publication of the same version, typically used to deliver<br />packaging or metadata changes without changing the version number. When multiple<br />releases exist for the same version, higher releases are preferred. An unset release<br />is less preferred than all other release values.<br />The value consists of dot-separated identifiers, where each identifier is either a<br />numeric value (without leading zeros) or an alphanumeric string (e.g., "2", "1.el9",<br />"3.alpha.1"). Releases are compared identifier by identifier: numeric identifiers are<br />compared as integers, alphanumeric identifiers are compared lexically, and numeric<br />identifiers always sort before alphanumeric identifiers.<br />For bundles with explicit pkg.Release metadata, this field contains that release value.<br />For registry+v1 bundles lacking an explicit release value, this field contains the release<br />extracted from version's build metadata (e.g., '2' from '1.0.0+2').<br />This field is omitted when the bundle's release value is unset.<br /><opcon:experimental> |  | MaxLength: 20 <br />Optional: \{\} <br /> |
 
 
 #### CRDUpgradeSafetyEnforcement

helm/olmv1/base/operator-controller/crd/experimental/olm.operatorframework.io_clusterextensions.yaml

@@ -706,6 +706,7 @@ spec:
                           For registry+v1 bundles lacking an explicit release value, this field contains the release
                           extracted from version's build metadata (e.g., '2' from '1.0.0+2').
                           This field is omitted when the bundle's release value is unset.
+                        maxLength: 20
                         type: string
                         x-kubernetes-validations:
                         - message: release must be empty or consist of dot-separated

internal/operator-controller/applier/boxcutter.go

@@ -85,6 +85,9 @@ func (r *SimpleRevisionGenerator) GenerateRevisionFromHelmRelease(
 		if v := helmRelease.Labels[labels.BundleVersionKey]; v != "" {
 			annotationUpdates[labels.BundleVersionKey] = v
 		}
+		if v := helmRelease.Labels[labels.BundleReleaseKey]; v != "" {
+			annotationUpdates[labels.BundleReleaseKey] = v
+		}
 		if v := helmRelease.Labels[labels.PackageNameKey]; v != "" {
 			annotationUpdates[labels.PackageNameKey] = v
 		}
@@ -100,6 +103,7 @@ func (r *SimpleRevisionGenerator) GenerateRevisionFromHelmRelease(
 		labels.BundleNameKey:      helmRelease.Labels[labels.BundleNameKey],
 		labels.PackageNameKey:     helmRelease.Labels[labels.PackageNameKey],
 		labels.BundleVersionKey:   helmRelease.Labels[labels.BundleVersionKey],
+		labels.BundleReleaseKey:   helmRelease.Labels[labels.BundleReleaseKey],
 		labels.BundleReferenceKey: helmRelease.Labels[labels.BundleReferenceKey],
 	})
 	rev.WithName(fmt.Sprintf("%s-1", ext.Name))

internal/operator-controller/labels/labels.go

@@ -32,7 +32,8 @@ const (
 	// across supported metadata backends, including Helm release labels and
 	// ClusterObjectSet annotations. For bundles with explicit pkg.Release metadata,
 	// this field contains that release value. For registry+v1 bundles, this field contains
-	// the release extracted from version's build metadata (e.g., '2' from '1.0.0+2').
+	// a release derived from the version's build metadata only when that metadata is
+	// parseable as a release value (e.g., '2' from '1.0.0+2').
 	BundleReleaseKey = "olm.operatorframework.io/bundle-release"
 
 	// BundleReferenceKey is the label key used to record an external reference

manifests/experimental-e2e.yaml

@@ -1318,6 +1318,7 @@ spec:
                           For registry+v1 bundles lacking an explicit release value, this field contains the release
                           extracted from version's build metadata (e.g., '2' from '1.0.0+2').
                           This field is omitted when the bundle's release value is unset.
+                        maxLength: 20
                         type: string
                         x-kubernetes-validations:
                         - message: release must be empty or consist of dot-separated

manifests/experimental.yaml

@@ -1279,6 +1279,7 @@ spec:
                           For registry+v1 bundles lacking an explicit release value, this field contains the release
                           extracted from version's build metadata (e.g., '2' from '1.0.0+2').
                           This field is omitted when the bundle's release value is unset.
+                        maxLength: 20
                         type: string
                         x-kubernetes-validations:
                         - message: release must be empty or consist of dot-separated