Add resourceStatuses back into stack config policy status for backwar…

…ds compatability (elastic#7500)
kvalliyurnatt · Jan 26, 2024 · 76c6265 · 76c6265
1 parent 38388d3
commit 76c6265
Show file tree

Hide file tree

Showing 5 changed files with 107 additions and 7 deletions.
diff --git a/config/crds/v1/all-crds.yaml b/config/crds/v1/all-crds.yaml
@@ -10405,8 +10405,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

diff --git a/config/crds/v1/bases/stackconfigpolicy.k8s.elastic.co_stackconfigpolicies.yaml b/config/crds/v1/bases/stackconfigpolicy.k8s.elastic.co_stackconfigpolicies.yaml
@@ -344,8 +344,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

diff --git a/deploy/eck-operator/charts/eck-operator-crds/templates/all-crds.yaml b/deploy/eck-operator/charts/eck-operator-crds/templates/all-crds.yaml
@@ -10465,8 +10465,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

diff --git a/pkg/apis/stackconfigpolicy/v1alpha1/stackconfigpolicy_types.go b/pkg/apis/stackconfigpolicy/v1alpha1/stackconfigpolicy_types.go
@@ -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.

diff --git a/pkg/apis/stackconfigpolicy/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/stackconfigpolicy/v1alpha1/zz_generated.deepcopy.go