Revert "Merge pull request openshift#570 from openshift-bot/synchronize-upstream"

This reverts commit 93bf7ab, reversing
changes made to 496965e.

Author: neisw

api/v1/clusterextensionrevision_types.go

@@ -24,15 +24,11 @@ import (
 const (
 	ClusterExtensionRevisionKind = "ClusterExtensionRevision"
 
-	// ClusterExtensionRevisionTypeAvailable is the condition type that represents whether the
-	// ClusterExtensionRevision is available and has been successfully rolled out.
+	// Condition Types
 	ClusterExtensionRevisionTypeAvailable = "Available"
-
-	// ClusterExtensionRevisionTypeSucceeded is the condition type that represents whether the
-	// ClusterExtensionRevision rollout has succeeded.
 	ClusterExtensionRevisionTypeSucceeded = "Succeeded"
 
-	// Condition reasons
+	// Condition Reasons
 	ClusterExtensionRevisionReasonAvailable                 = "Available"
 	ClusterExtensionRevisionReasonReconcileFailure          = "ReconcileFailure"
 	ClusterExtensionRevisionReasonRevisionValidationFailure = "RevisionValidationFailure"
@@ -48,47 +44,22 @@ const (
 
 // ClusterExtensionRevisionSpec defines the desired state of ClusterExtensionRevision.
 type ClusterExtensionRevisionSpec struct {
-	// lifecycleState specifies the lifecycle state of the ClusterExtensionRevision.
-	//
-	// When set to "Active" (the default), the revision is actively managed and reconciled.
-	// When set to "Archived", the revision is inactive and any resources not managed by a subsequent revision are deleted.
-	// The revision is removed from the owner list of all objects previously under management.
-	// All objects that did not transition to a succeeding revision are deleted.
-	//
-	// Once a revision is set to "Archived", it cannot be un-archived.
+	// Specifies the lifecycle state of the ClusterExtensionRevision.
 	//
 	// +kubebuilder:default="Active"
-	// +kubebuilder:validation:Enum=Active;Archived
-	// +kubebuilder:validation:XValidation:rule="oldSelf == 'Active' || oldSelf == 'Archived' && oldSelf == self", message="cannot un-archive"
+	// +kubebuilder:validation:Enum=Active;Paused;Archived
+	// +kubebuilder:validation:XValidation:rule="oldSelf == 'Active' || oldSelf == 'Paused' || oldSelf == 'Archived' && oldSelf == self", message="can not un-archive"
 	LifecycleState ClusterExtensionRevisionLifecycleState `json:"lifecycleState,omitempty"`
-
-	// revision is a required, immutable sequence number representing a specific revision
-	// of the parent ClusterExtension.
-	//
-	// The revision field must be a positive integer.
-	// Each ClusterExtensionRevision belonging to the same parent ClusterExtension must have a unique revision number.
-	// The revision number must always be the previous revision number plus one, or 1 for the first revision.
+	// Revision is a sequence number representing a specific revision of the ClusterExtension instance.
+	// Must be positive. Each ClusterExtensionRevision of the same parent ClusterExtension needs to have
+	// a unique value assigned. It is immutable after creation. The new revision number must always be previous revision +1.
 	//
 	// +kubebuilder:validation:Required
 	// +kubebuilder:validation:Minimum:=1
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf", message="revision is immutable"
 	Revision int64 `json:"revision"`
-
-	// phases is an optional, immutable list of phases that group objects to be applied together.
-	//
-	// Objects are organized into phases based on their Group-Kind. Common phases include:
-	//   - namespaces: Namespace objects
-	//   - policies: ResourceQuota, LimitRange, NetworkPolicy objects
-	//   - rbac: ServiceAccount, Role, RoleBinding, ClusterRole, ClusterRoleBinding objects
-	//   - crds: CustomResourceDefinition objects
-	//   - storage: PersistentVolume, PersistentVolumeClaim, StorageClass objects
-	//   - deploy: Deployment, StatefulSet, DaemonSet, Service, ConfigMap, Secret objects
-	//   - publish: Ingress, APIService, Route, Webhook objects
-	//
-	// All objects in a phase are applied in no particular order.
-	// The revision progresses to the next phase only after all objects in the current phase pass their readiness probes.
-	//
-	// Once set, even if empty, the phases field is immutable.
+	// Phases are groups of objects that will be applied at the same time.
+	// All objects in the phase will have to pass their probes in order to progress to the next phase.
 	//
 	// +kubebuilder:validation:XValidation:rule="self == oldSelf || oldSelf.size() == 0", message="phases is immutable"
 	// +listType=map
@@ -104,62 +75,33 @@ const (
 	// ClusterExtensionRevisionLifecycleStateActive / "Active" is the default lifecycle state.
 	ClusterExtensionRevisionLifecycleStateActive ClusterExtensionRevisionLifecycleState = "Active"
 	// ClusterExtensionRevisionLifecycleStatePaused / "Paused" disables reconciliation of the ClusterExtensionRevision.
-	// Object changes will not be reconciled. However, status updates will be propagated.
+	// Only Status updates will still propagated, but object changes will not be reconciled.
 	ClusterExtensionRevisionLifecycleStatePaused ClusterExtensionRevisionLifecycleState = "Paused"
-	// ClusterExtensionRevisionLifecycleStateArchived / "Archived" archives the revision for historical or auditing purposes.
-	// The revision is removed from the owner list of all other objects previously under management and all objects
-	// that did not transition to a succeeding revision are deleted.
+	// ClusterExtensionRevisionLifecycleStateArchived / "Archived" disables reconciliation while also "scaling to zero",
+	// which deletes all objects that are not excluded via the pausedFor property and
+	// removes itself from the owner list of all other objects previously under management.
 	ClusterExtensionRevisionLifecycleStateArchived ClusterExtensionRevisionLifecycleState = "Archived"
 )
 
-// ClusterExtensionRevisionPhase represents a group of objects that are applied together. The phase is considered
-// complete only after all objects pass their status probes.
+// ClusterExtensionRevisionPhase are groups of objects that will be applied at the same time.
+// All objects in the a phase will have to pass their probes in order to progress to the next phase.
 type ClusterExtensionRevisionPhase struct {
-	// name is a required identifier for this phase.
-	//
-	// phase names must follow the DNS label standard as defined in [RFC 1123].
-	// They must contain only lowercase alphanumeric characters or hyphens (-),
-	// start and end with an alphanumeric character, and be no longer than 63 characters.
-	//
-	// Common phase names include: namespaces, policies, rbac, crds, storage, deploy, publish.
-	//
-	// [RFC 1123]: https://tools.ietf.org/html/rfc1123
+	// Name identifies this phase.
 	//
 	// +kubebuilder:validation:MaxLength=63
 	// +kubebuilder:validation:Pattern=`^[a-z]([-a-z0-9]*[a-z0-9])?$`
 	Name string `json:"name"`
-
-	// objects is a required list of all Kubernetes objects that belong to this phase.
-	//
-	// All objects in this list are applied to the cluster in no particular order.
+	// Objects are a list of all the objects within this phase.
 	Objects []ClusterExtensionRevisionObject `json:"objects"`
 }
 
-// ClusterExtensionRevisionObject represents a Kubernetes object to be applied as part
-// of a phase, along with its collision protection settings.
+// ClusterExtensionRevisionObject contains an object and settings for it.
 type ClusterExtensionRevisionObject struct {
-	// object is a required embedded Kubernetes object to be applied.
-	//
-	// This object must be a valid Kubernetes resource with apiVersion, kind, and metadata fields.
-	//
 	// +kubebuilder:validation:EmbeddedResource
 	// +kubebuilder:pruning:PreserveUnknownFields
 	Object unstructured.Unstructured `json:"object"`
-
-	// collisionProtection controls whether the operator can adopt and modify objects
-	// that already exist on the cluster.
-	//
-	// When set to "Prevent" (the default), the operator only manages objects it created itself.
-	// This prevents ownership collisions.
-	//
-	// When set to "IfNoController", the operator can adopt and modify pre-existing objects
-	// that are not owned by another controller.
-	// This is useful for taking over management of manually-created resources.
-	//
-	// When set to "None", the operator can adopt and modify any pre-existing object, even if
-	// owned by another controller.
-	// Use this setting with extreme caution as it may cause multiple controllers to fight over
-	// the same resource, resulting in increased load on the API server and etcd.
+	// CollisionProtection controls whether OLM can adopt and modify objects
+	// already existing on the cluster or even owned by another controller.
 	//
 	// +kubebuilder:default="Prevent"
 	// +kubebuilder:validation:Enum=Prevent;IfNoController;None
@@ -186,27 +128,6 @@ const (
 
 // ClusterExtensionRevisionStatus defines the observed state of a ClusterExtensionRevision.
 type ClusterExtensionRevisionStatus struct {
-	// conditions is an optional list of status conditions describing the state of the
-	// ClusterExtensionRevision.
-	//
-	// The Progressing condition represents whether the revision is actively rolling out:
-	//   - When status is True and reason is Progressing, the revision rollout is actively making progress and is in transition.
-	//   - When Progressing is not present, the revision is not currently in transition.
-	//
-	// The Available condition represents whether the revision has been successfully rolled out and is available:
-	//   - When status is True and reason is Available, the revision has been successfully rolled out and all objects pass their readiness probes.
-	//   - When status is False and reason is Incomplete, the revision rollout has not yet completed but no specific failures have been detected.
-	//   - When status is False and reason is ProbeFailure, one or more objects are failing their readiness probes during rollout.
-	//   - When status is False and reason is ReconcileFailure, the revision has encountered a general reconciliation failure.
-	//   - When status is False and reason is RevisionValidationFailure, the revision failed preflight validation checks.
-	//   - When status is False and reason is PhaseValidationError, a phase within the revision failed preflight validation checks.
-	//   - When status is False and reason is ObjectCollisions, objects in the revision collide with existing cluster objects that cannot be adopted.
-	//   - When status is Unknown and reason is Archived, the revision has been archived and its objects have been torn down.
-	//   - When status is Unknown and reason is Migrated, the revision was migrated from an existing release and object status probe results have not yet been observed.
-	//
-	// The Succeeded condition represents whether the revision has successfully completed its rollout:
-	//   - When status is True and reason is RolloutSuccess, the revision has successfully completed its rollout. This condition is set once and persists even if the revision later becomes unavailable.
-	//
 	// +listType=map
 	// +listMapKey=type
 	// +optional
@@ -216,24 +137,19 @@ type ClusterExtensionRevisionStatus struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:scope=Cluster
 // +kubebuilder:subresource:status
+
+// ClusterExtensionRevision is the Schema for the clusterextensionrevisions API
 // +kubebuilder:printcolumn:name="Available",type=string,JSONPath=`.status.conditions[?(@.type=='Available')].status`
 // +kubebuilder:printcolumn:name=Age,type=date,JSONPath=`.metadata.creationTimestamp`
-
-// ClusterExtensionRevision represents an immutable snapshot of Kubernetes objects
-// for a specific version of a ClusterExtension. Each revision contains objects
-// organized into phases that roll out sequentially. The same object can only be managed by a single revision
-// at a time. Ownership of objects is transitioned from one revision to the next as the extension is upgraded
-// or reconfigured. Once the latest revision has rolled out successfully, previous active revisions are archived for
-// posterity.
 type ClusterExtensionRevision struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	// spec defines the desired state of the ClusterExtensionRevision.
+	// spec is an optional field that defines the desired state of the ClusterExtension.
 	// +optional
 	Spec ClusterExtensionRevisionSpec `json:"spec,omitempty"`
 
-	// status is optional and defines the observed state of the ClusterExtensionRevision.
+	// status is an optional field that defines the observed state of the ClusterExtension.
 	// +optional
 	Status ClusterExtensionRevisionStatus `json:"status,omitempty"`
 }

commitchecker.yaml

@@ -1,4 +1,4 @@
-expectedMergeBase: 34394ce0a7067e1f1622dc2c381a9a12439b10d2
+expectedMergeBase: 045989d84a7570b1cfddeee47eae64d47245aff2
 upstreamBranch: main
 upstreamOrg: operator-framework
 upstreamRepo: operator-controller

hack/test/install-prometheus.sh

@@ -38,11 +38,8 @@ echo "Patching namespace to ${PROMETHEUS_NAMESPACE}..."
 echo "Applying Prometheus base..."
 kubectl apply -k "$TMPDIR" --server-side
 
-echo "Waiting for Prometheus Operator deployment to become available..."
-kubectl wait --for=condition=Available deployment/prometheus-operator -n "$PROMETHEUS_NAMESPACE" --timeout=180s
-
 echo "Waiting for Prometheus Operator pod to become ready..."
-kubectl wait --for=condition=Ready pod -n "$PROMETHEUS_NAMESPACE" -l app.kubernetes.io/name=prometheus-operator --timeout=120s
+kubectl wait --for=condition=Ready pod -n "$PROMETHEUS_NAMESPACE" -l app.kubernetes.io/name=prometheus-operator
 
 echo "Applying prometheus Helm chart..."
 ${HELM} template prometheus helm/prometheus ${PROMETHEUS_VALUES} | sed "s/cert-git-version/cert-${VERSION}/g" | kubectl apply -f -

hack/tools/crd-generator/README.md

@@ -33,14 +33,6 @@ A semi-colon separated list of enumerations, similar to the `+kubebuilder:valida
 
 An XValidation scheme, similar to the `+kubebuilder:validation:XValidation` scheme, but more limited.
 
-* `Optional`
-
-Indicating that this field should not be listed as required in its parent.
-
-* `Required`
-
-Indicating that this field should be listed as required in its parent.
-
 ## Experimental Description
 
 * Start Tag: `<opcon:experimental:description>`
@@ -52,18 +44,6 @@ All text between the tags is included in the experimental CRD, but removed from
 This is only useful if the field is included in the standard CRD, but there's additional meaning in
 the experimental CRD when feature gates are enabled.
 
-## Standard Description
-
-* Start Tag: `<opcon:standard:description>`
-* End Tag: `</opcon:standard:description>`
-
-Descriptive text that is only included as part of the field description within the standard CRD.
-All text between the tags is included in the standard CRD, but removed from the experimental CRD.
-
-This is useful if the field is included in the standard CRD and has differing meaning than when the
-field is used in the experimental CRD when feature gates are enabled.
-
-
 ## Exclude from CRD Description
 
 * Start Tag: `<opcon:util:excludeFromCRD>`