Skip to content

Bug 1874746: Fixed ClusterLogging CR status #691

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 1 commit into from
Sep 9, 2020
Merged

Bug 1874746: Fixed ClusterLogging CR status #691

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
2 changes: 1 addition & 1 deletion hack/generate-crd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ mv "deploy/crds/${CLF_CRD_FILE}" "${MANIFESTS_DIR}"
mv "deploy/crds/${CLO_CRD_FILE}" "${MANIFESTS_DIR}"

echo "---------------------------------------------------------------"
echo "Kustomize: Patch CRDs for singeltons and backward-compatibility"
echo "Kustomize: Patch CRDs for singeltons"
echo "---------------------------------------------------------------"
oc kustomize "${MANIFESTS_DIR}" | \
awk -v clf="${MANIFESTS_DIR}/${CLF_CRD_FILE}" \
Expand Down
4 changes: 0 additions & 4 deletions manifests/4.6/crd-v1-clusterloggings-patches.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,3 @@
type: string
enum:
- "instance"
- op: replace
path: /spec/versions/0/schema/openAPIV3Schema/properties/status
value:
type: object
367 changes: 367 additions & 0 deletions manifests/4.6/logging.openshift.io_clusterloggings_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,6 +644,373 @@ spec:
type: object
type: object
status:
description: ClusterLoggingStatus defines the observed state of ClusterLogging
properties:
clusterConditions:
description: Conditions is a set of Condition instances.
items:
description: "Condition represents an observation of an object's
state. Conditions are an extension mechanism intended to be used
when the details of an observation are not a priori known or would
not apply to all instances of a given Kind. \n Conditions should
be added to explicitly convey properties that users and components
care about rather than requiring those properties to be inferred
from other observations. Once defined, the meaning of a Condition
can not be changed arbitrarily - it becomes part of the API, and
has the same backwards- and forwards-compatibility concerns of
any other part of the API."
properties:
lastTransitionTime:
format: date-time
type: string
message:
type: string
reason:
description: ConditionReason is intended to be a one-word, CamelCase
representation of the category of cause of the current status.
It is intended to be used in concise output, such as one-line
kubectl get output, and in summarizing occurrences of causes.
type: string
status:
type: string
type:
description: "ConditionType is the type of the condition and
is typically a CamelCased word or short phrase. \n Condition
types should indicate state in the \"abnormal-true\" polarity.
For example, if the condition indicates when a policy is invalid,
the \"is valid\" case is probably the norm, so the condition
should be called \"Invalid\"."
type: string
required:
- status
- type
type: object
type: array
collection:
properties:
logs:
properties:
fluentdStatus:
properties:
clusterCondition:
additionalProperties:
description: '`operator-sdk generate crds` does not
allow map-of-slice, must use a named type.'
items:
description: "Condition represents an observation
of an object's state. Conditions are an extension
mechanism intended to be used when the details of
an observation are not a priori known or would not
apply to all instances of a given Kind. \n Conditions
should be added to explicitly convey properties
that users and components care about rather than
requiring those properties to be inferred from other
observations. Once defined, the meaning of a Condition
can not be changed arbitrarily - it becomes part
of the API, and has the same backwards- and forwards-compatibility
concerns of any other part of the API."
properties:
lastTransitionTime:
format: date-time
type: string
message:
type: string
reason:
description: ConditionReason is intended to be
a one-word, CamelCase representation of the
category of cause of the current status. It
is intended to be used in concise output, such
as one-line kubectl get output, and in summarizing
occurrences of causes.
type: string
status:
type: string
type:
description: "ConditionType is the type of the
condition and is typically a CamelCased word
or short phrase. \n Condition types should indicate
state in the \"abnormal-true\" polarity. For
example, if the condition indicates when a policy
is invalid, the \"is valid\" case is probably
the norm, so the condition should be called
\"Invalid\"."
type: string
required:
- status
- type
type: object
type: array
type: object
daemonSet:
type: string
nodes:
additionalProperties:
type: string
type: object
pods:
additionalProperties:
items:
type: string
type: array
type: object
type: object
type: object
type: object
curation:
properties:
curatorStatus:
items:
properties:
clusterCondition:
additionalProperties:
description: '`operator-sdk generate crds` does not allow
map-of-slice, must use a named type.'
items:
description: "Condition represents an observation of
an object's state. Conditions are an extension mechanism
intended to be used when the details of an observation
are not a priori known or would not apply to all instances
of a given Kind. \n Conditions should be added to
explicitly convey properties that users and components
care about rather than requiring those properties
to be inferred from other observations. Once defined,
the meaning of a Condition can not be changed arbitrarily
- it becomes part of the API, and has the same backwards-
and forwards-compatibility concerns of any other part
of the API."
properties:
lastTransitionTime:
format: date-time
type: string
message:
type: string
reason:
description: ConditionReason is intended to be a
one-word, CamelCase representation of the category
of cause of the current status. It is intended
to be used in concise output, such as one-line
kubectl get output, and in summarizing occurrences
of causes.
type: string
status:
type: string
type:
description: "ConditionType is the type of the condition
and is typically a CamelCased word or short phrase.
\n Condition types should indicate state in the
\"abnormal-true\" polarity. For example, if the
condition indicates when a policy is invalid,
the \"is valid\" case is probably the norm, so
the condition should be called \"Invalid\"."
type: string
required:
- status
- type
type: object
type: array
type: object
cronJobs:
type: string
schedules:
type: string
suspended:
type: boolean
type: object
type: array
type: object
logStore:
properties:
elasticsearchStatus:
items:
properties:
cluster:
properties:
activePrimaryShards:
format: int32
type: integer
activeShards:
format: int32
type: integer
initializingShards:
format: int32
type: integer
numDataNodes:
format: int32
type: integer
numNodes:
format: int32
type: integer
pendingTasks:
format: int32
type: integer
relocatingShards:
format: int32
type: integer
status:
type: string
unassignedShards:
format: int32
type: integer
required:
- activePrimaryShards
- activeShards
- initializingShards
- numDataNodes
- numNodes
- pendingTasks
- relocatingShards
- status
- unassignedShards
type: object
clusterConditions:
items:
properties:
lastTransitionTime:
description: Last time the condition transitioned
from one status to another.
format: date-time
type: string
message:
description: Human-readable message indicating details
about last transition.
type: string
reason:
description: Unique, one-word, CamelCase reason for
the condition's last transition.
type: string
status:
type: string
type:
description: ClusterConditionType is a valid value
for ClusterCondition.Type
type: string
required:
- lastTransitionTime
- status
- type
type: object
type: array
clusterHealth:
type: string
clusterName:
type: string
deployments:
items:
type: string
type: array
nodeConditions:
additionalProperties:
items:
properties:
lastTransitionTime:
description: Last time the condition transitioned
from one status to another.
format: date-time
type: string
message:
description: Human-readable message indicating details
about last transition.
type: string
reason:
description: Unique, one-word, CamelCase reason
for the condition's last transition.
type: string
status:
type: string
type:
description: ClusterConditionType is a valid value
for ClusterCondition.Type
type: string
required:
- lastTransitionTime
- status
- type
type: object
type: array
type: object
nodeCount:
format: int32
type: integer
pods:
additionalProperties:
additionalProperties:
items:
type: string
type: array
type: object
type: object
replicaSets:
items:
type: string
type: array
shardAllocationEnabled:
type: string
statefulSets:
items:
type: string
type: array
type: object
type: array
type: object
visualization:
properties:
kibanaStatus:
items:
description: KibanaStatus defines the observed state of Kibana
properties:
clusterCondition:
additionalProperties:
items:
properties:
lastTransitionTime:
description: Last time the condition transitioned
from one status to another.
format: date-time
type: string
message:
description: Human-readable message indicating details
about last transition.
type: string
reason:
description: Unique, one-word, CamelCase reason
for the condition's last transition.
type: string
status:
type: string
type:
description: ClusterConditionType is a valid value
for ClusterCondition.Type
type: string
required:
- lastTransitionTime
- status
- type
type: object
type: array
type: object
deployment:
type: string
pods:
additionalProperties:
items:
type: string
type: array
type: object
replicaSets:
items:
type: string
type: array
replicas:
format: int32
type: integer
required:
- deployment
- pods
- replicaSets
- replicas
type: object
type: array
type: object
type: object
type: object
served: true
Expand Down
Loading