@@ -135,15 +135,15 @@ func NewCommandStartCozyServer(ctx context.Context, defaults *CozyServerOptions)
135135 "same cadence." )
136136 flags .StringVar (& o .HelmReleaseInstallTimeout , "helmrelease-install-timeout" , o .HelmReleaseInstallTimeout ,
137137 "Default timeout for the Helm install action of HelmReleases generated from Application " +
138- "resources (Spec.Install.Timeout). Overridden per- Application by the " +
139- "release.cozystack.io/helm-install-timeout annotation on the ApplicationDefinition; the " +
138+ "resources (Spec.Install.Timeout). Overridden for an Application kind by the " +
139+ "release.cozystack.io/helm-install-timeout annotation on its ApplicationDefinition; the " +
140140 "same annotation also overrides --helmrelease-upgrade-timeout." )
141141 flags .StringVar (& o .HelmReleaseUpgradeTimeout , "helmrelease-upgrade-timeout" , o .HelmReleaseUpgradeTimeout ,
142142 "Default timeout for the Helm upgrade action of HelmReleases generated from Application " +
143- "resources (Spec.Upgrade.Timeout). Overridden per- Application by the " +
144- "release.cozystack.io/helm-install-timeout annotation (which sets both install and " +
145- "upgrade), or by release.cozystack.io/helm-upgrade-timeout to override only the upgrade " +
146- "side for a kind that needs an asymmetric budget ." )
143+ "resources (Spec.Upgrade.Timeout). Overridden for an Application kind by the " +
144+ "release.cozystack.io/helm-install-timeout annotation on its ApplicationDefinition (which " +
145+ "sets both install and upgrade), or with higher precedence by " +
146+ "release.cozystack.io/helm-upgrade-timeout to override only the upgrade side ." )
147147 flags .IntVar (& o .HelmReleaseMaxHistory , "helmrelease-max-history" , o .HelmReleaseMaxHistory ,
148148 "Number of release revisions Helm keeps for HelmReleases generated from Application " +
149149 "resources (Spec.MaxHistory). 0 means unlimited; 5 matches Helm's default." )
@@ -307,11 +307,11 @@ func buildResourceFromCRD(crd v1alpha1.ApplicationDefinition, hrFlags helmReleas
307307 Name : crd .Spec .Release .ChartRef .Name ,
308308 Namespace : crd .Spec .Release .ChartRef .Namespace ,
309309 },
310- // Per-Application HelmRelease generation defaults from server
311- // flags. The same five values are applied to every Resource,
312- // matching cozystack-operator's PackageReconciler. The
313- // per-Application HelmInstallTimeout annotation populated below
314- // still wins over HelmReleaseInstallTimeout/UpgradeTimeout .
310+ // HelmRelease generation defaults from server flags. The same five
311+ // values are applied to every Resource, matching cozystack-operator's
312+ // PackageReconciler. The kind-wide HelmInstallTimeout and
313+ // HelmUpgradeTimeout overrides from the ApplicationDefinition
314+ // populated below still take precedence over these defaults .
315315 HelmReleaseInterval : hrFlags .interval ,
316316 HelmReleaseRetryInterval : hrFlags .retryInterval ,
317317 HelmReleaseInstallTimeout : hrFlags .installTimeout ,
@@ -324,11 +324,11 @@ func buildResourceFromCRD(crd v1alpha1.ApplicationDefinition, hrFlags helmReleas
324324 WaitStrategy : crd .Spec .Release .WaitStrategy ,
325325 HealthCheckExprs : crd .Spec .Release .HealthCheckExprs ,
326326 }
327- // Per-Application HelmRelease Install/Upgrade timeout. Applications
328- // whose parent chart contains asynchronously-provisioned resources
329- // the chart itself depends on (for example, the Kamaji-provisioned
330- // admin-kubeconfig Secret for Kubernetes tenants) need a longer
331- // wait budget than the Flux default. Consumed by the REST storage
327+ // Kind-wide HelmRelease Install/Upgrade timeout from this
328+ // ApplicationDefinition. Kinds whose parent chart contains asynchronously-
329+ // provisioned resources the chart itself depends on (for example, the
330+ // Kamaji-provisioned admin-kubeconfig Secret for Kubernetes tenants) need a
331+ // longer wait budget than the Flux default. Consumed by the REST storage
332332 // layer when building the HelmRelease Spec. The parser rejects
333333 // units Flux would reject at webhook time, so a bad annotation
334334 // surfaces as a loud startup failure instead of a silent drop to
0 commit comments