From 7d4331a2f054936092829aabc8bfc1ca15af153d Mon Sep 17 00:00:00 2001 From: Artur Shad Nik Date: Thu, 31 Jul 2025 08:57:57 -0700 Subject: [PATCH 1/2] fix: only set addonconfigured condition when num addons > 0 Signed-off-by: Artur Shad Nik --- fleetconfig-controller/internal/controller/hub.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fleetconfig-controller/internal/controller/hub.go b/fleetconfig-controller/internal/controller/hub.go index fe06d99c..c9c4d0e5 100644 --- a/fleetconfig-controller/internal/controller/hub.go +++ b/fleetconfig-controller/internal/controller/hub.go @@ -94,9 +94,11 @@ func handleHub(ctx context.Context, kClient client.Client, fc *v1alpha1.FleetCon return err } - fc.SetConditions(true, v1alpha1.NewCondition( - v1alpha1.FleetConfigAddonsConfigured, v1alpha1.FleetConfigAddonsConfigured, metav1.ConditionTrue, metav1.ConditionTrue, - )) + if len(fc.Spec.AddOnConfigs) > 0 { + fc.SetConditions(true, v1alpha1.NewCondition( + v1alpha1.FleetConfigAddonsConfigured, v1alpha1.FleetConfigAddonsConfigured, metav1.ConditionTrue, metav1.ConditionTrue, + )) + } // attempt an upgrade whenever the clustermanager's bundleVersion changes upgrade, err := hubNeedsUpgrade(ctx, fc, operatorC) if err != nil { From cd731833832cdbd4a8795e5813eaaa5390b42528 Mon Sep 17 00:00:00 2001 From: Artur Shad Nik Date: Thu, 31 Jul 2025 09:14:18 -0700 Subject: [PATCH 2/2] chore: bump version Signed-off-by: Artur Shad Nik --- fleetconfig-controller/charts/fleetconfig-controller/README.md | 2 +- .../charts/fleetconfig-controller/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fleetconfig-controller/charts/fleetconfig-controller/README.md b/fleetconfig-controller/charts/fleetconfig-controller/README.md index d9823068..c08e2a00 100644 --- a/fleetconfig-controller/charts/fleetconfig-controller/README.md +++ b/fleetconfig-controller/charts/fleetconfig-controller/README.md @@ -115,7 +115,7 @@ Refer to the [Multicluster Controlplane configuration](https://github.com/open-c | `replicas` | fleetconfig-controller replica count | `1` | | `imageRegistry` | Image registry | `""` | | `image.repository` | Image repository | `quay.io/open-cluster-management/fleetconfig-controller` | -| `image.tag` | Image tag | `v0.0.8` | +| `image.tag` | Image tag | `v0.0.9` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `imagePullSecrets` | Image pull secrets | `[]` | | `serviceAccount.annotations` | Annotations to add to the service account | `{}` | diff --git a/fleetconfig-controller/charts/fleetconfig-controller/values.yaml b/fleetconfig-controller/charts/fleetconfig-controller/values.yaml index 1001bf2c..5516d715 100644 --- a/fleetconfig-controller/charts/fleetconfig-controller/values.yaml +++ b/fleetconfig-controller/charts/fleetconfig-controller/values.yaml @@ -277,7 +277,7 @@ imageRegistry: "" ## @param image.pullPolicy Image pull policy image: repository: quay.io/open-cluster-management/fleetconfig-controller - tag: v0.0.8 + tag: v0.0.9 pullPolicy: IfNotPresent ## @param imagePullSecrets Image pull secrets