Skip to content
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

Add resourceStatuses back into stack config policy status for backwards compatibility #7500

Merged
merged 1 commit into from
Jan 26, 2024
Merged

Add resourceStatuses back into stack config policy status for backwards compatibility #7500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 32 additions & 2 deletions config/crds/v1/all-crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10769,8 +10769,38 @@ spec:
resources:
description: Resources is the number of resources to be configured.
type: integer
required:
- details
resourcesStatuses:
additionalProperties:
description: ResourcePolicyStatus models the status of the policy
for one resource to be configured.
properties:
currentVersion:
description: CurrentVersion denotes the current version of filesettings
applied to the Elasticsearch cluster This field does not apply
to Kibana resources
format: int64
type: integer
error:
properties:
message:
type: string
version:
format: int64
type: integer
type: object
expectedVersion:
description: ExpectedVersion denotes the expected version of
filesettings that should be applied to the Elasticsearch cluster
This field does not apply to Kibana resources
format: int64
type: integer
phase:
type: string
type: object
description: 'ResourcesStatuses holds the status for each resource
to be configured. Deprecated: Details is used to store the status
of resources from ECK 2.11'
type: object
type: object
type: object
served: true
Expand Down
34 changes: 32 additions & 2 deletions config/crds/v1/bases/stackconfigpolicy.k8s.elastic.co_stackconfigpolicies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,38 @@ spec:
resources:
description: Resources is the number of resources to be configured.
type: integer
required:
- details
resourcesStatuses:
additionalProperties:
description: ResourcePolicyStatus models the status of the policy
for one resource to be configured.
properties:
currentVersion:
description: CurrentVersion denotes the current version of filesettings
applied to the Elasticsearch cluster This field does not apply
to Kibana resources
format: int64
type: integer
error:
properties:
message:
type: string
version:
format: int64
type: integer
type: object
expectedVersion:
description: ExpectedVersion denotes the expected version of
filesettings that should be applied to the Elasticsearch cluster
This field does not apply to Kibana resources
format: int64
type: integer
phase:
type: string
type: object
description: 'ResourcesStatuses holds the status for each resource
to be configured. Deprecated: Details is used to store the status
of resources from ECK 2.11'
type: object
type: object
type: object
served: true
Expand Down
34 changes: 32 additions & 2 deletions deploy/eck-operator/charts/eck-operator-crds/templates/all-crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10829,8 +10829,38 @@ spec:
resources:
description: Resources is the number of resources to be configured.
type: integer
required:
- details
resourcesStatuses:
additionalProperties:
description: ResourcePolicyStatus models the status of the policy
for one resource to be configured.
properties:
currentVersion:
description: CurrentVersion denotes the current version of filesettings
applied to the Elasticsearch cluster This field does not apply
to Kibana resources
format: int64
type: integer
error:
properties:
message:
type: string
version:
format: int64
type: integer
type: object
expectedVersion:
description: ExpectedVersion denotes the expected version of
filesettings that should be applied to the Elasticsearch cluster
This field does not apply to Kibana resources
format: int64
type: integer
phase:
type: string
type: object
description: 'ResourcesStatuses holds the status for each resource
to be configured. Deprecated: Details is used to store the status
of resources from ECK 2.11'
type: object
type: object
type: object
served: true
Expand Down
5 changes: 4 additions & 1 deletion pkg/apis/stackconfigpolicy/v1alpha1/stackconfigpolicy_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,11 @@ type IndexTemplates struct {
}

type StackConfigPolicyStatus struct {
// ResourcesStatuses holds the status for each resource to be configured.
// Deprecated: Details is used to store the status of resources from ECK 2.11
ResourcesStatuses map[string]ResourcePolicyStatus `json:"resourcesStatuses,omitempty"`
// Details holds the status details for each resource to be configured.
Details map[ResourceType]map[string]ResourcePolicyStatus `json:"details"`
Details map[ResourceType]map[string]ResourcePolicyStatus `json:"details,omitempty"`
// Resources is the number of resources to be configured.
Resources int `json:"resources,omitempty"`
// Ready is the number of resources successfully configured.
Expand Down
7 changes: 7 additions & 0 deletions pkg/apis/stackconfigpolicy/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.