Skip to content

update cluster logging CR to latest #655

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

Closed
jcantrill wants to merge 1 commit into from
Closed

update cluster logging CR to latest #655

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
24 changes: 13 additions & 11 deletions deploy/chart/catalog_resources/rh-operators/clusterlogging.v0.0.1.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ metadata:
name: clusterlogging.v0.0.1
namespace: placeholder
annotations:
olm-examples: '[{"apiVersion": "logging.openshift.io/v1alpha1","kind": "ClusterLogging","metadata":{"name": "example","annotations":{"io.openshift.clusterlogging.alpha/allinone": ""}},"spec": {"logStore":{"type": "elasticsearch","elasticsearch":{"replicas":1,"storage":{"emptyDir": {}}}},"visualization":{"type": "kibana","kibana":{"replicas": 1}},"curation":{"type": "curator","curator": {"schedule": "30 3 * * *"}},"collection": {"logCollection":{"type": "fluentd","fluentd":{"nodeSelector":{"logging-infra-fluentd: "true"}}}}}]'
olm-examples: '[{"apiVersion": "logging.openshift.io/v1alpha1","kind": "ClusterLogging","metadata":{"name": "cluster-logging"},"spec": {"logStore":{"type": "elasticsearch","elasticsearch":{"nodeCount":3,"storage":{"size": "200Gi"}}},"visualization":{"type": "kibana","kibana":{"replicas": 1}},"curation":{"type": "curator","curator": {"schedule": "30 3 * * *"}},"collection": {"logs":{"type": "fluentd","fluentd":{}}}}}]'
test: "yes"
spec:
displayName: Cluster Logging
Expand Down Expand Up @@ -36,6 +36,8 @@ spec:
url: https://github.com/openshift/cluster-logging-operator/blob/master/README.md
- name: Cluster Logging Operator
url: https://github.com/openshift/cluster-logging-operator
- name: Elasticsearch Operator
url: https://github.com/openshift/elasticsearch-operator
installModes:
- type: OwnNamespace
supported: true
Expand Down Expand Up @@ -264,12 +266,12 @@ spec:
path: visualization.kibana.nodeSelector
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:nodeSelector'
- description: The desired number of Elasticsearch Pods for the Log Storage component
- description: The desired number of Elasticsearch Nodes for the Log Storage component
displayName: Elasticsearch Size
path: logStore.elasticsearch.replicas
path: logStore.elasticsearch.nodeCount
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:podCount'
- description: Resource requirements for the Elasticsearch pods
- description: Resource requirements for each Elasticsearch node
displayName: Elasticsearch Resource Requirements
path: logStore.elasticsearch.resources
x-descriptors:
Expand All @@ -281,22 +283,22 @@ spec:
- 'urn:alm:descriptor:com.tectonic.ui:nodeSelector'
- description: Resource requirements for the Fluentd pods
displayName: Fluentd Resource Requirements
path: collection.logCollection.fluentd.resources
path: collection.logs.fluentd.resources
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:resourceRequirements'
- description: The node selector to use for the Fluentd log collection component
displayName: Fluentd node selector
path: collection.logCollection.fluentd.nodeSelector
path: collection.logs.fluentd.nodeSelector
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:nodeSelector'
- description: Resource requirements for the Rsyslog pods
displayName: Rsyslog Resource Requirements
path: collection.logCollection.rsyslog.resources
path: collection.logs.rsyslog.resources
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:resourceRequirements'
- description: The node selector to use for the Rsyslog log collection component
displayName: Rsyslog node selector
path: collection.logCollection.rsyslog.nodeSelector
path: collection.logs.rsyslog.nodeSelector
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:nodeSelector'
- description: Resource requirements for the Curator pods
Expand Down Expand Up @@ -335,15 +337,15 @@ spec:
- 'urn:alm:descriptor:com.tectonic.ui:podStatuses'
- description: The cluster status for each of the Elasticsearch Clusters for the Log Storage component
displayName: Elasticsearch Cluster Health
path: logstore.elasticsearchStatus.clusterHealth
path: logStore.elasticsearchStatus.clusterHealth
- description: The status for each of the Fluentd pods for the Log Collection component
displayName: Fluentd status
path: collection.logCollection.fluentdStatus.pods
path: collection.logs.fluentdStatus.pods
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:podStatuses'
- description: The status for each of the Rsyslog pods for the Log Collection component
displayName: Rsyslog status
path: collection.logCollection.rsyslogStatus.pods
path: collection.logs.rsyslogStatus.pods
x-descriptors:
- 'urn:alm:descriptor:com.tectonic.ui:podStatuses'
- name: elasticsearches.logging.openshift.io
Expand Down
33 changes: 25 additions & 8 deletions deploy/chart/catalog_resources/rh-operators/clusterloggings.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ spec:
spec:
description: Specification of the desired behavior of the Logging cluster.
properties:
managementState:
description: Indicator if the resource is 'Managed' or 'Unmanaged' by the operator
type: string
enum:
- "Managed"
- "Unmanaged"
visualization:
description: Specification of the Visualization component for the cluster
properties:
Expand Down Expand Up @@ -91,22 +97,35 @@ spec:
nodeSelector:
description: Define which Nodes the Pods are scheduled on.
type: object
replicas:
nodeCount:
description: Number of nodes to deploy for Elasticsearch
format: int32
type: integer
storage:
description: 'The storage backing for Elasticsearch. More info: '
type: object
description: 'The storage specification for Elasticsearch data nodes'
properties:
size:
description: 'The capacity of storage to provision.'
type: string
storageClassName:
description: 'The class of storage to provision. More info: https://kubernetes.io/docs/concepts/storage/storage-classes/'
type: string
redundancyPolicy:
description: The policy towards data redundancy to specify the number of redundant primary shards
type: string
enum:
- "FullRedundancy"
- "MultipleRedundancy"
- "SingleRedundancy"
- "ZeroRedundancy"
required:
- replicas
- storage
- nodeCount
required:
- type
collection:
description: Specification of the Collection component for the cluster
properties:
logCollection:
logs:
description: Specification of Log Collection for the cluster
properties:
type:
Expand All @@ -133,8 +152,6 @@ spec:
type: object
required:
- type
#eventCollection:
#normalizer:
curation:
description: Specification of the Curation component for the cluster
properties:
Expand Down
117 changes: 59 additions & 58 deletions deploy/chart/catalog_resources/rh-operators/elasticsearches.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,57 +17,67 @@ spec:
spec:
description: Specification of the desired behavior of the Elasticsearch cluster
properties:
managementState:
description: Indicator if the resource is 'Managed' or 'Unmanaged' by the operator
type: string
enum:
- "Managed"
- "Unmanaged"
redundancyPolicy:
description: The policy towards data redundancy to specify the number of redundant primary shards
type: string
enum:
- "FullRedundancy"
- "MultipleRedundancy"
- "SingleRedundancy"
- "ZeroRedundancy"
nodes:
description: Specification of the different Elasticsearch nodes
properties:
roles:
description: The specific Elasticsearch cluster roles the node should perform
type: object
replicas:
description: Number of nodes to deploy
format: int32
type: integer
spec:
description: Specification of the Elasticsearch node
properties:
image:
description: The image to use for the Elasticsearch node
type: string
resources:
description: The resource requirements for the Elasticsearch node
properties:
limits:
description: 'Limits describes the maximum amount of compute
resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
requests:
description: 'Requests describes the minimum amount of compute
resources required. If Requests is omitted for a container,
it defaults to Limits if that is explicitly specified, otherwise
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
nodeSelector:
description: Define which Nodes the Pods are scheduled on.
type: object
storage:
description: The type of backing storage that should be used for the node
properties:
hostPath:
description: Use host node storage
type: object
emptyDir:
description: Use ephemeral storage
type: object
volumeClaimTemplate:
description: 'Volume claims that act similarly to the VolumeClaimTemplates
field of StatefulSets. A number of PVCs will be generated based on the number of
node replicas'
type: object
persistentVolumeClaim:
description: Use a specifically named Persistent Volume Claim
type: object
type: array
items:
type: object
properties:
roles:
description: The specific Elasticsearch cluster roles the node should perform
type: object
nodeCount:
description: Number of nodes to deploy
format: int32
type: integer
minimum: 1
nodeSpec:
description: Specification of a specific Elasticsearch node
properties:
image:
description: The image to use for the Elasticsearch node
type: string
resources:
description: The resource requirements for the Elasticsearch node
properties:
limits:
description: 'Limits describes the maximum amount of compute
resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
requests:
description: 'Requests describes the minimum amount of compute
resources required. If Requests is omitted for a container,
it defaults to Limits if that is explicitly specified, otherwise
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
nodeSelector:
description: Define which Nodes the Pods are scheduled on.
type: object
storage:
description: The type of backing storage that should be used for the node
properties:
storageClassName:
description: The name of the storage class to use with creating the node's PVC
type: string
size:
description: The max storage capacity for the node
type: string
nodeSpec:
description: Specification to be applied to all the Elasticsearch nodes
description: Default specification applied to all Elasticsearch nodes
properties:
image:
description: The image to use for the Elasticsearch nodes
Expand All @@ -84,13 +94,4 @@ spec:
resources required. If Requests is omitted for a container,
it defaults to Limits if that is explicitly specified, otherwise
to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
serviceAccountName:
description: The service account for the Elasticsearch nodes in this cluster
type: string
configMapName:
description: The configmap for the Elasticsearch nodes in this cluster
type: string
secretName:
description: The secret for the Elasticsearch nodes in this cluster
type: string
type: object
1 change: 0 additions & 1 deletion manifests/0000_30_00-namespace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ metadata:
name: openshift-operator-lifecycle-manager
labels:
openshift.io/run-level: "1"
olm.components: "global"
---
apiVersion: v1
kind: Namespace
Expand Down
Loading