diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 0216f7a55d3..be0d5474d68 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -10824,6 +10824,9 @@ spec: spec: description: spec defines the desired state of the operator. properties: + clusterDomainOverride: + description: clusterDomainOverride allows to adjust Kubernetes cluster domain used by the operator as a cluster identifier. + type: string scyllaUtilsImage: description: scyllaUtilsImage is a ScyllaDB image used for running ScyllaDB utilities. type: string @@ -10843,6 +10846,53 @@ spec: bashToolsImage: description: bashToolsImage is a generic Bash image with extra tools used by the operator for auxiliary purposes. type: string + clusterDomain: + description: clusterDomain is the Kubernetes cluster domain used by the operator as a cluster identifier. + type: string + conditions: + description: conditions hold conditions describing ScyllaOperatorConfig state. + items: + description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }" + properties: + lastTransitionTime: + description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. + format: date-time + type: string + message: + description: message is a human readable message indicating details about the transition. This may be an empty string. + maxLength: 32768 + type: string + observedGeneration: + description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance. + format: int64 + minimum: 0 + type: integer + reason: + description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty. + maxLength: 1024 + minLength: 1 + pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ + type: string + status: + description: status of the condition, one of True, False, Unknown. + enum: + - "True" + - "False" + - Unknown + type: string + type: + description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + maxLength: 316 + pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ + type: string + required: + - lastTransitionTime + - message + - reason + - status + - type + type: object + type: array grafanaImage: description: grafanaImage is the image used by the operator to create a Grafana instance. type: string diff --git a/docs/source/api-reference/groups/scylla.scylladb.com/scyllaoperatorconfigs.rst b/docs/source/api-reference/groups/scylla.scylladb.com/scyllaoperatorconfigs.rst index fee8be92d66..e5a8bd5cdab 100755 --- a/docs/source/api-reference/groups/scylla.scylladb.com/scyllaoperatorconfigs.rst +++ b/docs/source/api-reference/groups/scylla.scylladb.com/scyllaoperatorconfigs.rst @@ -75,6 +75,9 @@ object * - Property - Type - Description + * - clusterDomainOverride + - string + - clusterDomainOverride allows to adjust Kubernetes cluster domain used by the operator as a cluster identifier. * - scyllaUtilsImage - string - scyllaUtilsImage is a ScyllaDB image used for running ScyllaDB utilities. @@ -112,6 +115,12 @@ object * - bashToolsImage - string - bashToolsImage is a generic Bash image with extra tools used by the operator for auxiliary purposes. + * - clusterDomain + - string + - clusterDomain is the Kubernetes cluster domain used by the operator as a cluster identifier. + * - :ref:`conditions` + - array (object) + - conditions hold conditions describing ScyllaOperatorConfig state. * - grafanaImage - string - grafanaImage is the image used by the operator to create a Grafana instance. @@ -124,3 +133,45 @@ object * - scyllaDBUtilsImage - string - scyllaDBUtilsImage is the ScyllaDB image used for running ScyllaDB utilities. + +.. _api-scylla.scylladb.com-scyllaoperatorconfigs-v1alpha1-.status.conditions[]: + +.status.conditions[] +^^^^^^^^^^^^^^^^^^^^ + +Description +""""""""""" +Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, + type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: "Available", "Progressing", and "Degraded" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"` + // other fields } + +Type +"""" +object + + +.. list-table:: + :widths: 25 10 150 + :header-rows: 1 + + * - Property + - Type + - Description + * - lastTransitionTime + - string + - lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. + * - message + - string + - message is a human readable message indicating details about the transition. This may be an empty string. + * - observedGeneration + - integer + - observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance. + * - reason + - string + - reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty. + * - status + - string + - status of the condition, one of True, False, Unknown. + * - type + - string + - type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) diff --git a/pkg/api/scylla/v1alpha1/scylla.scylladb.com_scyllaoperatorconfigs.yaml b/pkg/api/scylla/v1alpha1/scylla.scylladb.com_scyllaoperatorconfigs.yaml index 3319c8c09d7..a8f9dc9539f 100644 --- a/pkg/api/scylla/v1alpha1/scylla.scylladb.com_scyllaoperatorconfigs.yaml +++ b/pkg/api/scylla/v1alpha1/scylla.scylladb.com_scyllaoperatorconfigs.yaml @@ -35,6 +35,9 @@ spec: spec: description: spec defines the desired state of the operator. properties: + clusterDomainOverride: + description: clusterDomainOverride allows to adjust Kubernetes cluster domain used by the operator as a cluster identifier. + type: string scyllaUtilsImage: description: scyllaUtilsImage is a ScyllaDB image used for running ScyllaDB utilities. type: string @@ -54,6 +57,53 @@ spec: bashToolsImage: description: bashToolsImage is a generic Bash image with extra tools used by the operator for auxiliary purposes. type: string + clusterDomain: + description: clusterDomain is the Kubernetes cluster domain used by the operator as a cluster identifier. + type: string + conditions: + description: conditions hold conditions describing ScyllaOperatorConfig state. + items: + description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }" + properties: + lastTransitionTime: + description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. + format: date-time + type: string + message: + description: message is a human readable message indicating details about the transition. This may be an empty string. + maxLength: 32768 + type: string + observedGeneration: + description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance. + format: int64 + minimum: 0 + type: integer + reason: + description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty. + maxLength: 1024 + minLength: 1 + pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$ + type: string + status: + description: status of the condition, one of True, False, Unknown. + enum: + - "True" + - "False" + - Unknown + type: string + type: + description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + maxLength: 316 + pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ + type: string + required: + - lastTransitionTime + - message + - reason + - status + - type + type: object + type: array grafanaImage: description: grafanaImage is the image used by the operator to create a Grafana instance. type: string diff --git a/pkg/api/scylla/v1alpha1/zz_generated.deepcopy.go b/pkg/api/scylla/v1alpha1/zz_generated.deepcopy.go index a6bd3fbad81..a4a2ef86951 100644 --- a/pkg/api/scylla/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/api/scylla/v1alpha1/zz_generated.deepcopy.go @@ -1546,6 +1546,11 @@ func (in *ScyllaOperatorConfigSpec) DeepCopyInto(out *ScyllaOperatorConfigSpec) *out = new(string) **out = **in } + if in.ClusterDomainOverride != nil { + in, out := &in.ClusterDomainOverride, &out.ClusterDomainOverride + *out = new(string) + **out = **in + } return } @@ -1567,6 +1572,13 @@ func (in *ScyllaOperatorConfigStatus) DeepCopyInto(out *ScyllaOperatorConfigStat *out = new(int64) **out = **in } + if in.Conditions != nil { + in, out := &in.Conditions, &out.Conditions + *out = make([]metav1.Condition, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } if in.ScyllaDBUtilsImage != nil { in, out := &in.ScyllaDBUtilsImage, &out.ScyllaDBUtilsImage *out = new(string) @@ -1587,6 +1599,11 @@ func (in *ScyllaOperatorConfigStatus) DeepCopyInto(out *ScyllaOperatorConfigStat *out = new(string) **out = **in } + if in.ClusterDomain != nil { + in, out := &in.ClusterDomain, &out.ClusterDomain + *out = new(string) + **out = **in + } return }