Skip to content

Commit 3331b27

Browse files
Address comments
1 parent 2bd6232 commit 3331b27

File tree

3 files changed

+5
-14
lines changed

3 files changed

+5
-14
lines changed

config/crd/bases/runtime.cluster.x-k8s.io_extensionconfigs.yaml

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

exp/runtime/api/v1alpha1/extensionconfig_types.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ type ExtensionConfigStatus struct {
122122
// See https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20240916-improve-status-in-CAPI-resources.md for more context.
123123
type ExtensionConfigV1Beta2Status struct {
124124
// conditions represents the observations of a ExtensionConfig's current state.
125-
// Known condition types are Available, Ready, UpToDate, BootstrapConfigReady, InfrastructureReady, NodeReady,
126-
// NodeHealthy, Deleting, Paused.
125+
// Known condition types are Discovered, Paused.
127126
// +optional
128127
// +listType=map
129128
// +listMapKey=type
@@ -238,7 +237,7 @@ const (
238237
// ExtensionConfigDiscoveredV1Beta2Condition is true if the runtime extension has been successfully discovered.
239238
ExtensionConfigDiscoveredV1Beta2Condition = "Discovered"
240239

241-
// ExtensionConfigNotDiscoveredV1Beta2Reason surfaces that the runtime extension has been successfully discovered.
240+
// ExtensionConfigDiscoveredV1Beta2Reason surfaces that the runtime extension has been successfully discovered.
242241
ExtensionConfigDiscoveredV1Beta2Reason = "Discovered"
243242

244243
// ExtensionConfigNotDiscoveredV1Beta2Reason surfaces that the runtime extension has not been successfully discovered.

exp/runtime/internal/controllers/extensionconfig_controller.go

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ import (
3939
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
4040
runtimev1 "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1"
4141
runtimeclient "sigs.k8s.io/cluster-api/exp/runtime/client"
42-
"sigs.k8s.io/cluster-api/util/annotations"
4342
"sigs.k8s.io/cluster-api/util/conditions"
4443
v1beta2conditions "sigs.k8s.io/cluster-api/util/conditions/v1beta2"
4544
"sigs.k8s.io/cluster-api/util/patch"
@@ -137,12 +136,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
137136
return ctrl.Result{}, err
138137
}
139138

140-
// Return early if the ExtensionConfig is paused.
141-
if annotations.HasPaused(extensionConfig) {
142-
log.Info("Reconciliation is paused for this object")
143-
return ctrl.Result{}, nil
144-
}
145-
146139
// Handle deletion reconciliation loop.
147140
if !extensionConfig.ObjectMeta.DeletionTimestamp.IsZero() {
148141
return r.reconcileDelete(ctx, extensionConfig)
@@ -237,12 +230,12 @@ func discoverExtensionConfig(ctx context.Context, runtimeClient runtimeclient.Cl
237230
discoveredExtension, err := runtimeClient.Discover(ctx, extensionConfig.DeepCopy())
238231
if err != nil {
239232
modifiedExtensionConfig := extensionConfig.DeepCopy()
240-
conditions.MarkFalse(modifiedExtensionConfig, runtimev1.RuntimeExtensionDiscoveredCondition, runtimev1.DiscoveryFailedReason, clusterv1.ConditionSeverityError, "error in discovery: %v", err)
233+
conditions.MarkFalse(modifiedExtensionConfig, runtimev1.RuntimeExtensionDiscoveredCondition, runtimev1.DiscoveryFailedReason, clusterv1.ConditionSeverityError, "Error in discovery: %v", err)
241234
v1beta2conditions.Set(modifiedExtensionConfig, metav1.Condition{
242235
Type: runtimev1.ExtensionConfigDiscoveredV1Beta2Condition,
243236
Status: metav1.ConditionFalse,
244237
Reason: runtimev1.ExtensionConfigNotDiscoveredV1Beta2Reason,
245-
Message: fmt.Sprintf("error in discovery: %v", err),
238+
Message: fmt.Sprintf("Error in discovery: %v", err),
246239
})
247240
return modifiedExtensionConfig, errors.Wrapf(err, "failed to discover ExtensionConfig %s", klog.KObj(extensionConfig))
248241
}

0 commit comments

Comments
 (0)