Skip to content

chore: disable role and phase available conditions when probe is set explicitly #9684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 1, 2025
Merged

chore: disable role and phase available conditions when probe is set explicitly #9684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
485a29d
init
leon-inf Aug 29, 2025
649c4aa
update API
leon-inf Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apis/apps/v1/componentdefinition_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,6 +1253,8 @@ type ComponentAvailable struct {

// Specifies the strategies for determining whether the component is available based on the available probe.
//
// If specified, it will take precedence over the WithPhases and WithRole fields.
//
// This field is immutable once set.
//
// +optional
Expand Down
3 changes: 3 additions & 0 deletions config/crd/bases/apps.kubeblocks.io_componentdefinitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ spec:
Specifies the strategies for determining whether the component is available based on the available probe.


If specified, it will take precedence over the WithPhases and WithRole fields.


This field is immutable once set.
properties:
condition:
Expand Down
3 changes: 3 additions & 0 deletions deploy/helm/crds/apps.kubeblocks.io_componentdefinitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ spec:
Specifies the strategies for determining whether the component is available based on the available probe.


If specified, it will take precedence over the WithPhases and WithRole fields.


This field is immutable once set.
properties:
condition:
Expand Down
1 change: 1 addition & 0 deletions docs/developer_docs/api-reference/cluster.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4612,6 +4612,7 @@ ComponentAvailableWithProbe
<td>
<em>(Optional)</em>
<p>Specifies the strategies for determining whether the component is available based on the available probe.</p>
<p>If specified, it will take precedence over the WithPhases and WithRole fields.</p>
<p>This field is immutable once set.</p>
</td>
</tr>
Expand Down
8 changes: 6 additions & 2 deletions pkg/controller/component/available.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,8 +542,12 @@ func GetComponentAvailablePolicy(compDef *appsv1.ComponentDefinition) appsv1.Com
// has available policy defined
if compDef.Spec.Available != nil {
policy := *compDef.Spec.Available
if policy.WithProbe != nil && policy.WithProbe.TimeWindowSeconds == nil {
policy.WithProbe.TimeWindowSeconds = timeWindowSeconds()
if policy.WithProbe != nil {
if policy.WithProbe.TimeWindowSeconds == nil {
policy.WithProbe.TimeWindowSeconds = timeWindowSeconds()
}
policy.WithPhases = nil
policy.WithRole = nil
}
return policy
}
Expand Down