Merge branch 'main' into bundle-docs

Signed-off-by: Michal Vavrinec <[email protected]>

Author: Ruclo

.github/workflows/release-bumper.yml

@@ -28,7 +28,7 @@ jobs:
           if [[ ${{ github.event_name }} == "workflow_dispatch" && ${{ github.ref }} != "refs/heads/main" ]]; then
             matrix="[{\"branch\": \"${GITHUB_REF#refs/heads/}\"}]"
           else
-            matrix=$(git for-each-ref --format='%(refname:short)' refs/remotes/origin | grep -e "origin/main" -e "origin/release-1.[0-9]\+$" | grep -v "release-1\.[0,1,2,3]$" | sed -r 's/origin\/(.*)/{"branch": "\1"}/g' | jq -s)
+            matrix=$(git for-each-ref --format='%(refname:short)' refs/remotes/origin  | grep -e "origin/release-1.[0-9]\+$" | sort -V -r | head -3 | sed -r 's/origin\/(.*)/{"branch": "\1"}/g' | jq -s '. += [{"branch": "main"}] | sort')
           fi
           echo "matrix={\"branches\":$(echo $matrix)}" >> $GITHUB_OUTPUT
 

automation/hco-nightly-reporter/go.mod

@@ -2,11 +2,9 @@ module github.com/hyperconverged-cluster-operator/automation/hco-nightly-reporte
 
 go 1.24
 
-require github.com/slack-go/slack v0.15.0
+require github.com/slack-go/slack v0.17.3
 
 require (
-	github.com/go-test/deep v1.1.1 // indirect
-	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
-	github.com/stretchr/testify v1.10.0 // indirect
+	github.com/stretchr/testify v1.11.1 // indirect
 )

automation/hco-nightly-reporter/go.sum

@@ -1,21 +1,14 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-test/deep v1.0.4/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/go-test/deep v1.1.1 h1:0r/53hagsehfO4bzD2Pgr/+RgHqhmf+k1Bpse2cTu1U=
 github.com/go-test/deep v1.1.1/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/slack-go/slack v0.15.0 h1:LE2lj2y9vqqiOf+qIIy0GvEoxgF1N5yLGZffmEZykt0=
-github.com/slack-go/slack v0.15.0/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+github.com/slack-go/slack v0.17.3 h1:zV5qO3Q+WJAQ/XwbGfNFrRMaJ5T/naqaonyPV/1TP4g=
+github.com/slack-go/slack v0.17.3/go.mod h1:X+UqOufi3LYQHDnMG1vxf0J8asC6+WllXrVrhl8/Prk=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

cluster/kubevirtci_tag.txt

@@ -1 +1 @@
-2510161106-883f7295
+2510241540-9fd40b1c

config/crd/bases/hco.kubevirt.io_hyperconvergeds.yaml

@@ -545,15 +545,13 @@ spec:
                                         volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
                                         If specified, the CSI driver will create or update the volume with the attributes defined
                                         in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
-                                        it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass
-                                        will be applied to the claim but it's not allowed to reset this field to empty string once it is set.
-                                        If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass
-                                        will be set by the persistentvolume controller if it exists.
+                                        it can be changed after the claim is created. An empty string or nil value indicates that no
+                                        VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
+                                        this field can be reset to its previous value (including nil) to cancel the modification.
                                         If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
                                         set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
                                         exists.
                                         More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
-                                        (Beta) Using this field requires the VolumeAttributesClass feature gate to be enabled (off by default).
                                       type: string
                                     volumeMode:
                                       description: |-
@@ -1823,8 +1821,8 @@ spec:
                                   most preferred is the one with the greatest sum of weights, i.e.
                                   for each node that meets all of the scheduling requirements (resource
                                   request, requiredDuringScheduling anti-affinity expressions, etc.),
-                                  compute a sum by iterating through the elements of this field and adding
-                                  "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                                  compute a sum by iterating through the elements of this field and subtracting
+                                  "weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
                                   node(s) with the highest sum are the most preferred.
                                 items:
                                   description: The weights of all of the matched WeightedPodAffinityTerm
@@ -2768,7 +2766,7 @@ spec:
                           Claims lists the names of resources, defined in spec.resourceClaims,
                           that are used by this container.
 
-                          This is an alpha field and requires enabling the
+                          This field depends on the
                           DynamicResourceAllocation feature gate.
 
                           This field is immutable. It can only be set for containers.
@@ -3756,8 +3754,8 @@ spec:
                                   most preferred is the one with the greatest sum of weights, i.e.
                                   for each node that meets all of the scheduling requirements (resource
                                   request, requiredDuringScheduling anti-affinity expressions, etc.),
-                                  compute a sum by iterating through the elements of this field and adding
-                                  "weight" to the sum if the node has pods which matches the corresponding podAffinityTerm; the
+                                  compute a sum by iterating through the elements of this field and subtracting
+                                  "weight" from the sum if the node has pods which matches the corresponding podAffinityTerm; the
                                   node(s) with the highest sum are the most preferred.
                                 items:
                                   description: The weights of all of the matched WeightedPodAffinityTerm
@@ -4538,15 +4536,13 @@ spec:
                                         volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim.
                                         If specified, the CSI driver will create or update the volume with the attributes defined
                                         in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName,
-                                        it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass
-                                        will be applied to the claim but it's not allowed to reset this field to empty string once it is set.
-                                        If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass
-                                        will be set by the persistentvolume controller if it exists.
+                                        it can be changed after the claim is created. An empty string or nil value indicates that no
+                                        VolumeAttributesClass will be applied to the claim. If the claim enters an Infeasible error state,
+                                        this field can be reset to its previous value (including nil) to cancel the modification.
                                         If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be
                                         set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource
                                         exists.
                                         More info: https://kubernetes.io/docs/concepts/storage/volume-attributes-classes/
-                                        (Beta) Using this field requires the VolumeAttributesClass feature gate to be enabled (off by default).
                                       type: string
                                     volumeMode:
                                       description: |-

controllers/alerts/secret.go

@@ -92,7 +92,7 @@ func (r *SecretReconciler) UpdateExistingResource(ctx context.Context, cl client
 
 	// Check if the secret has the correct token
 	if string(found.Data["token"]) == token {
-		return nil, false, nil
+		return found, false, nil
 	}
 
 	// If the token is incorrect, delete the old secret and create a new one

controllers/descheduler/descheduler_controller.go

@@ -101,13 +101,9 @@ func (r *ReconcileDescheduler) isDeschedulerMisconfigured(ctx context.Context) (
 		return false, err
 	}
 
-	// TODO: modify this once deschedulerv1.RelieveAndMigrate will graduate, loosing
-	// the "Dev" prefix, and will be "KubeVirtRelieveAndMigrate", then we will need
-	// to change it to:
-	// misconfiguredDescheduler = slices.Contains(instance.Spec.Profiles, deschedulerv1.RelieveAndMigrate)
 	return !slices.ContainsFunc(instance.Spec.Profiles, func(profile deschedulerv1.DeschedulerProfile) bool {
 		switch profile {
-		case deschedulerv1.RelieveAndMigrate, "KubeVirtRelieveAndMigrate":
+		case deschedulerv1.KubeVirtRelieveAndMigrate, deschedulerv1.DevKubeVirtRelieveAndMigrate, deschedulerv1.LifecycleAndUtilization:
 			return true
 		}
 		return false

controllers/descheduler/descheduler_controller_test.go

@@ -91,7 +91,7 @@ var _ = Describe("DeschedulerController", func() {
 					},
 					BeTrue(),
 				),
-				Entry("should set the metric to false for the KubeDescheduler with a valid configuration",
+				Entry("should set the metric to false for the KubeDescheduler with a valid configuration - LifecycleAndUtilization",
 					[]client.Object{
 						&deschedulerv1.KubeDescheduler{
 							ObjectMeta: metav1.ObjectMeta{
@@ -100,7 +100,23 @@ var _ = Describe("DeschedulerController", func() {
 							},
 							Spec: deschedulerv1.KubeDeschedulerSpec{
 								Profiles: []deschedulerv1.DeschedulerProfile{
-									deschedulerv1.RelieveAndMigrate,
+									deschedulerv1.LifecycleAndUtilization,
+								},
+							},
+						},
+					},
+					BeFalse(),
+				),
+				Entry("should set the metric to false for the KubeDescheduler with a valid configuration - DevKubeVirtRelieveAndMigrate",
+					[]client.Object{
+						&deschedulerv1.KubeDescheduler{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      hcoutil.DeschedulerCRName,
+								Namespace: hcoutil.DeschedulerNamespace,
+							},
+							Spec: deschedulerv1.KubeDeschedulerSpec{
+								Profiles: []deschedulerv1.DeschedulerProfile{
+									deschedulerv1.DevKubeVirtRelieveAndMigrate,
 								},
 								ProfileCustomizations: &deschedulerv1.ProfileCustomizations{
 									DevDeviationThresholds:      &deschedulerv1.AsymmetricLowDeviationThreshold,
@@ -112,6 +128,22 @@ var _ = Describe("DeschedulerController", func() {
 					},
 					BeFalse(),
 				),
+				Entry("should set the metric to false for the KubeDescheduler with a valid configuration - KubeVirtRelieveAndMigrate",
+					[]client.Object{
+						&deschedulerv1.KubeDescheduler{
+							ObjectMeta: metav1.ObjectMeta{
+								Name:      hcoutil.DeschedulerCRName,
+								Namespace: hcoutil.DeschedulerNamespace,
+							},
+							Spec: deschedulerv1.KubeDeschedulerSpec{
+								Profiles: []deschedulerv1.DeschedulerProfile{
+									deschedulerv1.KubeVirtRelieveAndMigrate,
+								},
+							},
+						},
+					},
+					BeFalse(),
+				),
 			)
 		})
 	})

controllers/hyperconverged/hyperconverged_controller.go

@@ -968,7 +968,7 @@ func (r *ReconcileHyperConverged) updateConditions(req *common.HcoRequest) {
 		req.StatusDirty = true
 	}
 
-	systemHealthStatus := r.getSystemHealthStatus(req.Conditions)
+	systemHealthStatus := r.getSystemHealthStatus(req)
 
 	if systemHealthStatus != req.Instance.Status.SystemHealthStatus {
 		req.Instance.Status.SystemHealthStatus = systemHealthStatus
@@ -1030,24 +1030,34 @@ func (r *ReconcileHyperConverged) detectTaintedConfiguration(req *common.HcoRequ
 	}
 }
 
-func (r *ReconcileHyperConverged) getSystemHealthStatus(conditions common.HcoConditions) string {
-	if isSystemHealthStatusError(conditions) {
+func (r *ReconcileHyperConverged) getSystemHealthStatus(req *common.HcoRequest) string {
+	if isSystemHealthStatusError(req) {
 		return systemHealthStatusError
 	}
 
-	if isSystemHealthStatusWarning(conditions) {
+	if isSystemHealthStatusWarning(req) {
 		return systemHealthStatusWarning
 	}
 
 	return systemHealthStatusHealthy
 }
 
-func isSystemHealthStatusError(conditions common.HcoConditions) bool {
-	return !conditions.IsStatusConditionTrue(hcov1beta1.ConditionAvailable) || conditions.IsStatusConditionTrue(hcov1beta1.ConditionDegraded)
+func isSystemHealthStatusError(req *common.HcoRequest) bool {
+	// During upgrade, only Degraded=True is an error. Temporary Available=false is expected.
+	if req.UpgradeMode {
+		return req.Conditions.IsStatusConditionTrue(hcov1beta1.ConditionDegraded)
+	}
+
+	return !req.Conditions.IsStatusConditionTrue(hcov1beta1.ConditionAvailable) || req.Conditions.IsStatusConditionTrue(hcov1beta1.ConditionDegraded)
 }
 
-func isSystemHealthStatusWarning(conditions common.HcoConditions) bool {
-	return !conditions.IsStatusConditionTrue(hcov1beta1.ConditionReconcileComplete) || conditions.IsStatusConditionTrue(hcov1beta1.ConditionProgressing)
+func isSystemHealthStatusWarning(req *common.HcoRequest) bool {
+	// During upgrade, treat health as non-warning while progressing; wait for reconcile complete.
+	if req.UpgradeMode {
+		return !req.Conditions.IsStatusConditionTrue(hcov1beta1.ConditionReconcileComplete)
+	}
+
+	return !req.Conditions.IsStatusConditionTrue(hcov1beta1.ConditionReconcileComplete) || req.Conditions.IsStatusConditionTrue(hcov1beta1.ConditionProgressing)
 }
 
 func getNumOfChangesJSONPatch(jsonPatch string) int {

controllers/hyperconverged/hyperconverged_controller_test.go

@@ -1648,6 +1648,9 @@ var _ = Describe("HyperconvergedController", func() {
 					Expect(cond.Reason).To(Equal("HCOUpgrading"))
 					Expect(cond.Message).To(Equal("HCO is now upgrading to version " + newHCOVersion))
 
+					// system health should remain healthy during upgrade progression
+					verifySystemHealthStatusHealthy(foundResource)
+
 					// check that the upgrade is not done if the not all the versions are match.
 					// Conditions are valid
 					makeComponentReady()
@@ -1667,6 +1670,9 @@ var _ = Describe("HyperconvergedController", func() {
 					Expect(cond.Reason).To(Equal("HCOUpgrading"))
 					Expect(cond.Message).To(Equal("HCO is now upgrading to version " + newHCOVersion))
 
+					// system health should remain healthy during upgrade progression
+					verifySystemHealthStatusHealthy(foundResource)
+
 					// now, complete the upgrade
 					updateComponentVersion()