From 607bb06773c137add233864e7c397f3beed3fee3 Mon Sep 17 00:00:00 2001 From: Saswata Mukherjee Date: Tue, 10 Dec 2024 11:05:07 +0000 Subject: [PATCH] [ACM-16286]: Update all observabilityaddon manifests Signed-off-by: Saswata Mukherjee --- ...ter-management.io_observabilityaddons.yaml | 99 ++++++++++++++++--- ...-management.io_observabilityaddon_crd.yaml | 79 ++++++++++++++- 2 files changed, 162 insertions(+), 16 deletions(-) diff --git a/operators/endpointmetrics/config/crd/bases/observability.open-cluster-management.io_observabilityaddons.yaml b/operators/endpointmetrics/config/crd/bases/observability.open-cluster-management.io_observabilityaddons.yaml index 047213f1d..cd52f4a9f 100644 --- a/operators/endpointmetrics/config/crd/bases/observability.open-cluster-management.io_observabilityaddons.yaml +++ b/operators/endpointmetrics/config/crd/bases/observability.open-cluster-management.io_observabilityaddons.yaml @@ -1,9 +1,8 @@ ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.1 + controller-gen.kubebuilder.io/version: v0.14.0 creationTimestamp: null name: observabilityaddons.observability.open-cluster-management.io spec: @@ -23,19 +22,24 @@ spec: description: ObservabilityAddon is the Schema for the observabilityaddon API properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object spec: - description: ObservabilityAddonSpec is the spec of observability addon + description: ObservabilityAddonSpec is the spec of observability addon. properties: enableMetrics: default: true @@ -43,13 +47,84 @@ spec: metrics to hub server. type: boolean interval: - default: 30 + default: 300 description: Interval for the observability addon push metrics to hub server. format: int32 maximum: 3600 minimum: 15 type: integer + resources: + description: Resource requirement for metrics-collector + properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + + This is an alpha field and requires enabling the + DynamicResourceAllocation feature gate. + + + This field is immutable. It can only be set for containers. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map + limits: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + requests: + additionalProperties: + anyOf: + - type: integer + - type: string + pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ + x-kubernetes-int-or-string: true + 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. Requests cannot exceed Limits. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ + type: object + type: object + scrapeSizeLimitBytes: + default: 1073741824 + description: |- + ScrapeSizeLimitBytes is the max size in bytes for a single metrics scrape from in-cluster Prometheus. + Default is 1 GiB. + type: integer + workers: + default: 1 + description: |- + Workers is the number of workers in metrics-collector that work in parallel to + push metrics to hub server. If set to > 1, metrics-collector will shard + /federate calls to Prometheus, based on matcher rules provided by allowlist. + Ensure that number of matchers exceeds number of workers. + format: int32 + minimum: 1 + type: integer type: object status: description: ObservabilityAddonStatus defines the observed state of ObservabilityAddon @@ -90,5 +165,5 @@ status: acceptedNames: kind: "" plural: "" - conditions: [] - storedVersions: [] + conditions: null + storedVersions: null diff --git a/operators/multiclusterobservability/manifests/endpoint-observability/observability.open-cluster-management.io_observabilityaddon_crd.yaml b/operators/multiclusterobservability/manifests/endpoint-observability/observability.open-cluster-management.io_observabilityaddon_crd.yaml index a5e99c23a..cd52f4a9f 100644 --- a/operators/multiclusterobservability/manifests/endpoint-observability/observability.open-cluster-management.io_observabilityaddon_crd.yaml +++ b/operators/multiclusterobservability/manifests/endpoint-observability/observability.open-cluster-management.io_observabilityaddon_crd.yaml @@ -1,9 +1,8 @@ ---- apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.4.1 + controller-gen.kubebuilder.io/version: v0.14.0 creationTimestamp: null name: observabilityaddons.observability.open-cluster-management.io spec: @@ -20,26 +19,71 @@ spec: - name: v1beta1 schema: openAPIV3Schema: + description: ObservabilityAddon is the Schema for the observabilityaddon API properties: apiVersion: + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object spec: + description: ObservabilityAddonSpec is the spec of observability addon. properties: enableMetrics: default: true + description: EnableMetrics indicates the observability addon push + metrics to hub server. type: boolean interval: default: 300 + description: Interval for the observability addon push metrics to + hub server. format: int32 maximum: 3600 minimum: 15 type: integer resources: + description: Resource requirement for metrics-collector properties: + claims: + description: |- + Claims lists the names of resources, defined in spec.resourceClaims, + that are used by this container. + + + This is an alpha field and requires enabling the + DynamicResourceAllocation feature gate. + + + This field is immutable. It can only be set for containers. + items: + description: ResourceClaim references one entry in PodSpec.ResourceClaims. + properties: + name: + description: |- + Name must match the name of one entry in pod.spec.resourceClaims of + the Pod where this field is used. It makes that resource available + inside a container. + type: string + required: + - name + type: object + type: array + x-kubernetes-list-map-keys: + - name + x-kubernetes-list-type: map limits: additionalProperties: anyOf: @@ -47,6 +91,9 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true + description: |- + Limits describes the maximum amount of compute resources allowed. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object requests: additionalProperties: @@ -55,13 +102,37 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true + 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. Requests cannot exceed Limits. + More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/ type: object type: object + scrapeSizeLimitBytes: + default: 1073741824 + description: |- + ScrapeSizeLimitBytes is the max size in bytes for a single metrics scrape from in-cluster Prometheus. + Default is 1 GiB. + type: integer + workers: + default: 1 + description: |- + Workers is the number of workers in metrics-collector that work in parallel to + push metrics to hub server. If set to > 1, metrics-collector will shard + /federate calls to Prometheus, based on matcher rules provided by allowlist. + Ensure that number of matchers exceeds number of workers. + format: int32 + minimum: 1 + type: integer type: object status: + description: ObservabilityAddonStatus defines the observed state of ObservabilityAddon properties: conditions: items: + description: StatusCondition contains condition information for + an observability addon properties: lastTransitionTime: format: date-time @@ -94,5 +165,5 @@ status: acceptedNames: kind: "" plural: "" - conditions: [] - storedVersions: [] + conditions: null + storedVersions: null