@@ -157,15 +157,15 @@ func NewCommandStartCozyServer(ctx context.Context, defaults *CozyServerOptions)
157157 "same cadence." )
158158 flags .StringVar (& o .HelmReleaseInstallTimeout , "helmrelease-install-timeout" , o .HelmReleaseInstallTimeout ,
159159 "Default timeout for the Helm install action of HelmReleases generated from Application " +
160- "resources (Spec.Install.Timeout). Overridden per- Application by the " +
161- "release.cozystack.io/helm-install-timeout annotation on the ApplicationDefinition; the " +
160+ "resources (Spec.Install.Timeout). Overridden for an Application kind by the " +
161+ "release.cozystack.io/helm-install-timeout annotation on its ApplicationDefinition; the " +
162162 "same annotation also overrides --helmrelease-upgrade-timeout." )
163163 flags .StringVar (& o .HelmReleaseUpgradeTimeout , "helmrelease-upgrade-timeout" , o .HelmReleaseUpgradeTimeout ,
164164 "Default timeout for the Helm upgrade action of HelmReleases generated from Application " +
165- "resources (Spec.Upgrade.Timeout). Overridden per- Application by the " +
166- "release.cozystack.io/helm-install-timeout annotation (which sets both install and " +
167- "upgrade), or by release.cozystack.io/helm-upgrade-timeout to override only the upgrade " +
168- "side for a kind that needs an asymmetric budget ." )
165+ "resources (Spec.Upgrade.Timeout). Overridden for an Application kind by the " +
166+ "release.cozystack.io/helm-install-timeout annotation on its ApplicationDefinition (which " +
167+ "sets both install and upgrade), or with higher precedence by " +
168+ "release.cozystack.io/helm-upgrade-timeout to override only the upgrade side ." )
169169 flags .IntVar (& o .HelmReleaseMaxHistory , "helmrelease-max-history" , o .HelmReleaseMaxHistory ,
170170 "Number of release revisions Helm keeps for HelmReleases generated from Application " +
171171 "resources (Spec.MaxHistory). 0 means unlimited; 5 matches Helm's default." )
@@ -331,11 +331,11 @@ func buildResourceFromCRD(crd v1alpha1.ApplicationDefinition, hrFlags helmReleas
331331 Name : crd .Spec .Release .ChartRef .Name ,
332332 Namespace : crd .Spec .Release .ChartRef .Namespace ,
333333 },
334- // Per-Application HelmRelease generation defaults from server
335- // flags. The same five values are applied to every Resource,
336- // matching cozystack-operator's PackageReconciler. The
337- // per-Application HelmInstallTimeout annotation populated below
338- // still wins over HelmReleaseInstallTimeout/UpgradeTimeout .
334+ // HelmRelease generation defaults from server flags. The same five
335+ // values are applied to every Resource, matching cozystack-operator's
336+ // PackageReconciler. The kind-wide HelmInstallTimeout and
337+ // HelmUpgradeTimeout overrides from the ApplicationDefinition
338+ // populated below still take precedence over these defaults .
339339 HelmReleaseInterval : hrFlags .interval ,
340340 HelmReleaseRetryInterval : hrFlags .retryInterval ,
341341 HelmReleaseInstallTimeout : hrFlags .installTimeout ,
@@ -348,11 +348,11 @@ func buildResourceFromCRD(crd v1alpha1.ApplicationDefinition, hrFlags helmReleas
348348 WaitStrategy : crd .Spec .Release .WaitStrategy ,
349349 HealthCheckExprs : crd .Spec .Release .HealthCheckExprs ,
350350 }
351- // Per-Application HelmRelease Install/Upgrade timeout. Applications
352- // whose parent chart contains asynchronously-provisioned resources
353- // the chart itself depends on (for example, the Kamaji-provisioned
354- // admin-kubeconfig Secret for Kubernetes tenants) need a longer
355- // wait budget than the Flux default. Consumed by the REST storage
351+ // Kind-wide HelmRelease Install/Upgrade timeout from this
352+ // ApplicationDefinition. Kinds whose parent chart contains asynchronously-
353+ // provisioned resources the chart itself depends on (for example, the
354+ // Kamaji-provisioned admin-kubeconfig Secret for Kubernetes tenants) need a
355+ // longer wait budget than the Flux default. Consumed by the REST storage
356356 // layer when building the HelmRelease Spec. The parser rejects
357357 // units Flux would reject at webhook time, so a bad annotation
358358 // surfaces as a loud startup failure instead of a silent drop to
0 commit comments