diff --git a/charts/dbgate/crds/http.keda.sh_httpscaledobjects.yaml b/charts/dbgate/crds/http.keda.sh_httpscaledobjects.yaml index bd1fb6d48..211a23350 100644 --- a/charts/dbgate/crds/http.keda.sh_httpscaledobjects.yaml +++ b/charts/dbgate/crds/http.keda.sh_httpscaledobjects.yaml @@ -2,7 +2,11 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.15.0 + meta.helm.sh/release-name: keda-add-ons-http + meta.helm.sh/release-namespace: keda + labels: + app.kubernetes.io/managed-by: Helm name: httpscaledobjects.http.keda.sh spec: group: http.keda.sh @@ -40,14 +44,19 @@ spec: description: HTTPScaledObject is the Schema for the httpscaledobjects 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 @@ -55,21 +64,20 @@ spec: description: HTTPScaledObjectSpec defines the desired state of HTTPScaledObject properties: hosts: - description: The hosts to route. All requests which the "Host" header - matches any .spec.hosts and the Request Target matches any .spec.pathPrefixes - will be routed to the Service and Port specified in the scaleTargetRef. - The .spec.hosts field is mutually exclusive with the .spec.host - field. + description: |- + The hosts to route. All requests which the "Host" header + matches any .spec.hosts (and the Request Target matches any + .spec.pathPrefixes) will be routed to the Service and Port specified in + the scaleTargetRef. items: type: string type: array pathPrefixes: - description: (optional) The paths to route. All requests which the - Request Target matches any .spec.pathPrefixes and the "Host" header - matches any .spec.hosts will be routed to the Service and Port specified - in the scaleTargetRef. The .spec.hosts field is mutually exclusive - with the .spec.host field. When this field is null, any path is - matched. + description: |- + The paths to route. All requests which the Request Target matches any + .spec.pathPrefixes (and the "Host" header matches any .spec.hosts) + will be routed to the Service and Port specified in + the scaleTargetRef. items: type: string type: array @@ -116,8 +124,39 @@ spec: description: (optional) Cooldown period value format: int32 type: integer + scalingMetric: + description: (optional) Configuration for the metric used for scaling + properties: + concurrency: + description: Scaling based on concurrent requests for a given + target + properties: + targetValue: + default: 100 + description: Target value for rate scaling + type: integer + type: object + requestRate: + description: Scaling based the average rate during an specific + time window for a given target + properties: + granularity: + default: 1s + description: Time granularity for rate calculation + type: string + targetValue: + default: 100 + description: Target value for rate scaling + type: integer + window: + default: 1m + description: Time window for rate calculation + type: string + type: object + type: object targetPendingRequests: - description: (optional) Target metric value + description: (optional) DEPRECATED (use SscalingMetric instead) Target + metric value format: int32 type: integer required: @@ -154,12 +193,6 @@ spec: type: description: Type of condition enum: - - Created - - Terminated - - Error - - Pending - - Terminating - - Unknown - Ready type: string required: diff --git a/charts/kafka-ui/crds/http.keda.sh_httpscaledobjects.yaml b/charts/kafka-ui/crds/http.keda.sh_httpscaledobjects.yaml index bd1fb6d48..211a23350 100644 --- a/charts/kafka-ui/crds/http.keda.sh_httpscaledobjects.yaml +++ b/charts/kafka-ui/crds/http.keda.sh_httpscaledobjects.yaml @@ -2,7 +2,11 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.15.0 + meta.helm.sh/release-name: keda-add-ons-http + meta.helm.sh/release-namespace: keda + labels: + app.kubernetes.io/managed-by: Helm name: httpscaledobjects.http.keda.sh spec: group: http.keda.sh @@ -40,14 +44,19 @@ spec: description: HTTPScaledObject is the Schema for the httpscaledobjects 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 @@ -55,21 +64,20 @@ spec: description: HTTPScaledObjectSpec defines the desired state of HTTPScaledObject properties: hosts: - description: The hosts to route. All requests which the "Host" header - matches any .spec.hosts and the Request Target matches any .spec.pathPrefixes - will be routed to the Service and Port specified in the scaleTargetRef. - The .spec.hosts field is mutually exclusive with the .spec.host - field. + description: |- + The hosts to route. All requests which the "Host" header + matches any .spec.hosts (and the Request Target matches any + .spec.pathPrefixes) will be routed to the Service and Port specified in + the scaleTargetRef. items: type: string type: array pathPrefixes: - description: (optional) The paths to route. All requests which the - Request Target matches any .spec.pathPrefixes and the "Host" header - matches any .spec.hosts will be routed to the Service and Port specified - in the scaleTargetRef. The .spec.hosts field is mutually exclusive - with the .spec.host field. When this field is null, any path is - matched. + description: |- + The paths to route. All requests which the Request Target matches any + .spec.pathPrefixes (and the "Host" header matches any .spec.hosts) + will be routed to the Service and Port specified in + the scaleTargetRef. items: type: string type: array @@ -116,8 +124,39 @@ spec: description: (optional) Cooldown period value format: int32 type: integer + scalingMetric: + description: (optional) Configuration for the metric used for scaling + properties: + concurrency: + description: Scaling based on concurrent requests for a given + target + properties: + targetValue: + default: 100 + description: Target value for rate scaling + type: integer + type: object + requestRate: + description: Scaling based the average rate during an specific + time window for a given target + properties: + granularity: + default: 1s + description: Time granularity for rate calculation + type: string + targetValue: + default: 100 + description: Target value for rate scaling + type: integer + window: + default: 1m + description: Time window for rate calculation + type: string + type: object + type: object targetPendingRequests: - description: (optional) Target metric value + description: (optional) DEPRECATED (use SscalingMetric instead) Target + metric value format: int32 type: integer required: @@ -154,12 +193,6 @@ spec: type: description: Type of condition enum: - - Created - - Terminated - - Error - - Pending - - Terminating - - Unknown - Ready type: string required: diff --git a/charts/kubedb-autoscaler/crds/node.k8s.appscode.com_nodetopologies.yaml b/charts/kubedb-autoscaler/crds/node.k8s.appscode.com_nodetopologies.yaml index 20dff1cfe..7ecf926aa 100644 --- a/charts/kubedb-autoscaler/crds/node.k8s.appscode.com_nodetopologies.yaml +++ b/charts/kubedb-autoscaler/crds/node.k8s.appscode.com_nodetopologies.yaml @@ -36,6 +36,8 @@ spec: type: object spec: properties: + description: + type: string nodeGroups: items: properties: @@ -47,24 +49,122 @@ spec: pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true description: 'Allocatable represents the total resources of - a node. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity' + a node. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity + Deprecated: Use resources instead.' + type: object + cost: + description: Cost is the cost of the running an ondeamd machine + for a month + properties: + price: + type: string + unit: + type: string + required: + - price + - unit + type: object + resources: + description: Resources represents the requested and limited + resources of a machine type. + properties: + claims: + description: "Claims lists the names of resources, defined + in spec.resourceClaims, that are used by this container. + \n This is an alpha field and requires enabling the DynamicResourceAllocation + feature gate. \n 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 topologyValue: type: string required: - - allocatable - topologyValue type: object type: array nodeSelectionPolicy: - enum: - - LabelSelector - - Taint type: string + requirements: + description: Requirements are layered with GetLabels and applied to + every node. + items: + description: A node selector requirement is a selector that contains + values, a key, and an operator that relates the key and values. + properties: + key: + description: The label key that the selector applies to. + type: string + operator: + description: Represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists, DoesNotExist. Gt, and + Lt. + type: string + values: + description: An array of string values. If the operator is In + or NotIn, the values array must be non-empty. If the operator + is Exists or DoesNotExist, the values array must be empty. + If the operator is Gt or Lt, the values array must have a + single element, which will be interpreted as an integer. This + array is replaced during a strategic merge patch. + items: + type: string + type: array + x-kubernetes-list-type: atomic + required: + - key + - operator + type: object + maxItems: 30 + type: array + x-kubernetes-validations: + - message: requirements with operator 'In' must have a value defined + rule: 'self.all(x, x.operator == ''In'' ? x.values.size() != 0 : + true)' + - message: requirements operator 'Gt' or 'Lt' must have a single positive + integer value + rule: 'self.all(x, (x.operator == ''Gt'' || x.operator == ''Lt'') + ? (x.values.size() == 1 && int(x.values[0]) >= 0) : true)' topologyKey: type: string required: - - nodeSelectionPolicy - topologyKey type: object type: object diff --git a/charts/kubedb-crds/crds/kubedb.com_druids.yaml b/charts/kubedb-crds/crds/kubedb.com_druids.yaml index d16099381..3df8898b5 100644 --- a/charts/kubedb-crds/crds/kubedb.com_druids.yaml +++ b/charts/kubedb-crds/crds/kubedb.com_druids.yaml @@ -109,6 +109,10 @@ spec: properties: createTables: type: boolean + externallyManaged: + type: boolean + linkedDB: + type: string name: type: string namespace: @@ -118,6 +122,8 @@ spec: - MySQL - PostgreSQL type: string + version: + type: string required: - name type: object @@ -19045,18 +19051,21 @@ spec: type: string zookeeperRef: properties: + externallyManaged: + type: boolean name: type: string namespace: type: string pathsBase: type: string + version: + type: string required: - name type: object required: - deepStorage - - metadataStorage - version type: object status: diff --git a/charts/kubedb-crds/crds/kubedb.com_ferretdbs.yaml b/charts/kubedb-crds/crds/kubedb.com_ferretdbs.yaml index b88dce421..48318574a 100644 --- a/charts/kubedb-crds/crds/kubedb.com_ferretdbs.yaml +++ b/charts/kubedb-crds/crds/kubedb.com_ferretdbs.yaml @@ -55,23 +55,17 @@ spec: type: boolean linkedDB: type: string - postgres: + postgresRef: properties: - service: - properties: - name: - type: string - namespace: - type: string - pgPort: - format: int32 - type: integer - type: object - url: + name: type: string - version: + namespace: type: string + required: + - name type: object + version: + type: string required: - externallyManaged type: object diff --git a/charts/kubedb-crds/crds/kubedb.com_pgbouncers.yaml b/charts/kubedb-crds/crds/kubedb.com_pgbouncers.yaml index 4ec1957fb..a6abac98b 100644 --- a/charts/kubedb-crds/crds/kubedb.com_pgbouncers.yaml +++ b/charts/kubedb-crds/crds/kubedb.com_pgbouncers.yaml @@ -74,7 +74,7 @@ spec: default: md5 enum: - md5 - - scram + - scram-sha-256 - cert type: string defaultPoolSize: diff --git a/charts/kubedb-crds/crds/ops.kubedb.com_pgpoolopsrequests.yaml b/charts/kubedb-crds/crds/ops.kubedb.com_pgpoolopsrequests.yaml index 19ce28193..9e6bbc636 100644 --- a/charts/kubedb-crds/crds/ops.kubedb.com_pgpoolopsrequests.yaml +++ b/charts/kubedb-crds/crds/ops.kubedb.com_pgpoolopsrequests.yaml @@ -70,16 +70,150 @@ spec: type: string type: object x-kubernetes-map-type: atomic + horizontalScaling: + properties: + node: + format: int32 + type: integer + type: object restart: type: object timeout: type: string + tls: + properties: + certificates: + items: + properties: + alias: + type: string + dnsNames: + items: + type: string + type: array + duration: + type: string + emailAddresses: + items: + type: string + type: array + ipAddresses: + items: + type: string + type: array + issuerRef: + properties: + apiGroup: + type: string + kind: + type: string + name: + type: string + required: + - kind + - name + type: object + x-kubernetes-map-type: atomic + privateKey: + properties: + encoding: + enum: + - PKCS1 + - PKCS8 + type: string + type: object + renewBefore: + type: string + secretName: + type: string + subject: + properties: + countries: + items: + type: string + type: array + localities: + items: + type: string + type: array + organizationalUnits: + items: + type: string + type: array + organizations: + items: + type: string + type: array + postalCodes: + items: + type: string + type: array + provinces: + items: + type: string + type: array + serialNumber: + type: string + streetAddresses: + items: + type: string + type: array + type: object + uris: + items: + type: string + type: array + required: + - alias + type: object + type: array + clientAuthMode: + enum: + - md5 + - scram + - cert + type: string + issuerRef: + properties: + apiGroup: + type: string + kind: + type: string + name: + type: string + required: + - kind + - name + type: object + x-kubernetes-map-type: atomic + remove: + type: boolean + rotateCertificates: + type: boolean + sslMode: + enum: + - disable + - allow + - prefer + - require + - verify-ca + - verify-full + type: string + type: object type: enum: + - UpdateVersion - VerticalScaling - Reconfigure - Restart + - HorizontalScaling + - ReconfigureTLS type: string + updateVersion: + properties: + targetVersion: + type: string + type: object verticalScaling: properties: node: diff --git a/charts/kubedb-ui-server/crds/kubedb.com_druids.yaml b/charts/kubedb-ui-server/crds/kubedb.com_druids.yaml index d16099381..3df8898b5 100644 --- a/charts/kubedb-ui-server/crds/kubedb.com_druids.yaml +++ b/charts/kubedb-ui-server/crds/kubedb.com_druids.yaml @@ -109,6 +109,10 @@ spec: properties: createTables: type: boolean + externallyManaged: + type: boolean + linkedDB: + type: string name: type: string namespace: @@ -118,6 +122,8 @@ spec: - MySQL - PostgreSQL type: string + version: + type: string required: - name type: object @@ -19045,18 +19051,21 @@ spec: type: string zookeeperRef: properties: + externallyManaged: + type: boolean name: type: string namespace: type: string pathsBase: type: string + version: + type: string required: - name type: object required: - deepStorage - - metadataStorage - version type: object status: diff --git a/charts/kubedb-ui-server/crds/kubedb.com_ferretdbs.yaml b/charts/kubedb-ui-server/crds/kubedb.com_ferretdbs.yaml index b88dce421..48318574a 100644 --- a/charts/kubedb-ui-server/crds/kubedb.com_ferretdbs.yaml +++ b/charts/kubedb-ui-server/crds/kubedb.com_ferretdbs.yaml @@ -55,23 +55,17 @@ spec: type: boolean linkedDB: type: string - postgres: + postgresRef: properties: - service: - properties: - name: - type: string - namespace: - type: string - pgPort: - format: int32 - type: integer - type: object - url: + name: type: string - version: + namespace: type: string + required: + - name type: object + version: + type: string required: - externallyManaged type: object diff --git a/charts/kubedb-ui-server/crds/kubedb.com_pgbouncers.yaml b/charts/kubedb-ui-server/crds/kubedb.com_pgbouncers.yaml index 4ec1957fb..a6abac98b 100644 --- a/charts/kubedb-ui-server/crds/kubedb.com_pgbouncers.yaml +++ b/charts/kubedb-ui-server/crds/kubedb.com_pgbouncers.yaml @@ -74,7 +74,7 @@ spec: default: md5 enum: - md5 - - scram + - scram-sha-256 - cert type: string defaultPoolSize: diff --git a/charts/mongo-ui/crds/http.keda.sh_httpscaledobjects.yaml b/charts/mongo-ui/crds/http.keda.sh_httpscaledobjects.yaml index bd1fb6d48..211a23350 100644 --- a/charts/mongo-ui/crds/http.keda.sh_httpscaledobjects.yaml +++ b/charts/mongo-ui/crds/http.keda.sh_httpscaledobjects.yaml @@ -2,7 +2,11 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.15.0 + meta.helm.sh/release-name: keda-add-ons-http + meta.helm.sh/release-namespace: keda + labels: + app.kubernetes.io/managed-by: Helm name: httpscaledobjects.http.keda.sh spec: group: http.keda.sh @@ -40,14 +44,19 @@ spec: description: HTTPScaledObject is the Schema for the httpscaledobjects 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 @@ -55,21 +64,20 @@ spec: description: HTTPScaledObjectSpec defines the desired state of HTTPScaledObject properties: hosts: - description: The hosts to route. All requests which the "Host" header - matches any .spec.hosts and the Request Target matches any .spec.pathPrefixes - will be routed to the Service and Port specified in the scaleTargetRef. - The .spec.hosts field is mutually exclusive with the .spec.host - field. + description: |- + The hosts to route. All requests which the "Host" header + matches any .spec.hosts (and the Request Target matches any + .spec.pathPrefixes) will be routed to the Service and Port specified in + the scaleTargetRef. items: type: string type: array pathPrefixes: - description: (optional) The paths to route. All requests which the - Request Target matches any .spec.pathPrefixes and the "Host" header - matches any .spec.hosts will be routed to the Service and Port specified - in the scaleTargetRef. The .spec.hosts field is mutually exclusive - with the .spec.host field. When this field is null, any path is - matched. + description: |- + The paths to route. All requests which the Request Target matches any + .spec.pathPrefixes (and the "Host" header matches any .spec.hosts) + will be routed to the Service and Port specified in + the scaleTargetRef. items: type: string type: array @@ -116,8 +124,39 @@ spec: description: (optional) Cooldown period value format: int32 type: integer + scalingMetric: + description: (optional) Configuration for the metric used for scaling + properties: + concurrency: + description: Scaling based on concurrent requests for a given + target + properties: + targetValue: + default: 100 + description: Target value for rate scaling + type: integer + type: object + requestRate: + description: Scaling based the average rate during an specific + time window for a given target + properties: + granularity: + default: 1s + description: Time granularity for rate calculation + type: string + targetValue: + default: 100 + description: Target value for rate scaling + type: integer + window: + default: 1m + description: Time window for rate calculation + type: string + type: object + type: object targetPendingRequests: - description: (optional) Target metric value + description: (optional) DEPRECATED (use SscalingMetric instead) Target + metric value format: int32 type: integer required: @@ -154,12 +193,6 @@ spec: type: description: Type of condition enum: - - Created - - Terminated - - Error - - Pending - - Terminating - - Unknown - Ready type: string required: diff --git a/charts/pgadmin/crds/http.keda.sh_httpscaledobjects.yaml b/charts/pgadmin/crds/http.keda.sh_httpscaledobjects.yaml index bd1fb6d48..211a23350 100644 --- a/charts/pgadmin/crds/http.keda.sh_httpscaledobjects.yaml +++ b/charts/pgadmin/crds/http.keda.sh_httpscaledobjects.yaml @@ -2,7 +2,11 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.15.0 + meta.helm.sh/release-name: keda-add-ons-http + meta.helm.sh/release-namespace: keda + labels: + app.kubernetes.io/managed-by: Helm name: httpscaledobjects.http.keda.sh spec: group: http.keda.sh @@ -40,14 +44,19 @@ spec: description: HTTPScaledObject is the Schema for the httpscaledobjects 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 @@ -55,21 +64,20 @@ spec: description: HTTPScaledObjectSpec defines the desired state of HTTPScaledObject properties: hosts: - description: The hosts to route. All requests which the "Host" header - matches any .spec.hosts and the Request Target matches any .spec.pathPrefixes - will be routed to the Service and Port specified in the scaleTargetRef. - The .spec.hosts field is mutually exclusive with the .spec.host - field. + description: |- + The hosts to route. All requests which the "Host" header + matches any .spec.hosts (and the Request Target matches any + .spec.pathPrefixes) will be routed to the Service and Port specified in + the scaleTargetRef. items: type: string type: array pathPrefixes: - description: (optional) The paths to route. All requests which the - Request Target matches any .spec.pathPrefixes and the "Host" header - matches any .spec.hosts will be routed to the Service and Port specified - in the scaleTargetRef. The .spec.hosts field is mutually exclusive - with the .spec.host field. When this field is null, any path is - matched. + description: |- + The paths to route. All requests which the Request Target matches any + .spec.pathPrefixes (and the "Host" header matches any .spec.hosts) + will be routed to the Service and Port specified in + the scaleTargetRef. items: type: string type: array @@ -116,8 +124,39 @@ spec: description: (optional) Cooldown period value format: int32 type: integer + scalingMetric: + description: (optional) Configuration for the metric used for scaling + properties: + concurrency: + description: Scaling based on concurrent requests for a given + target + properties: + targetValue: + default: 100 + description: Target value for rate scaling + type: integer + type: object + requestRate: + description: Scaling based the average rate during an specific + time window for a given target + properties: + granularity: + default: 1s + description: Time granularity for rate calculation + type: string + targetValue: + default: 100 + description: Target value for rate scaling + type: integer + window: + default: 1m + description: Time window for rate calculation + type: string + type: object + type: object targetPendingRequests: - description: (optional) Target metric value + description: (optional) DEPRECATED (use SscalingMetric instead) Target + metric value format: int32 type: integer required: @@ -154,12 +193,6 @@ spec: type: description: Type of condition enum: - - Created - - Terminated - - Error - - Pending - - Terminating - - Unknown - Ready type: string required: diff --git a/charts/phpmyadmin/crds/http.keda.sh_httpscaledobjects.yaml b/charts/phpmyadmin/crds/http.keda.sh_httpscaledobjects.yaml index bd1fb6d48..211a23350 100644 --- a/charts/phpmyadmin/crds/http.keda.sh_httpscaledobjects.yaml +++ b/charts/phpmyadmin/crds/http.keda.sh_httpscaledobjects.yaml @@ -2,7 +2,11 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.12.0 + controller-gen.kubebuilder.io/version: v0.15.0 + meta.helm.sh/release-name: keda-add-ons-http + meta.helm.sh/release-namespace: keda + labels: + app.kubernetes.io/managed-by: Helm name: httpscaledobjects.http.keda.sh spec: group: http.keda.sh @@ -40,14 +44,19 @@ spec: description: HTTPScaledObject is the Schema for the httpscaledobjects 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 @@ -55,21 +64,20 @@ spec: description: HTTPScaledObjectSpec defines the desired state of HTTPScaledObject properties: hosts: - description: The hosts to route. All requests which the "Host" header - matches any .spec.hosts and the Request Target matches any .spec.pathPrefixes - will be routed to the Service and Port specified in the scaleTargetRef. - The .spec.hosts field is mutually exclusive with the .spec.host - field. + description: |- + The hosts to route. All requests which the "Host" header + matches any .spec.hosts (and the Request Target matches any + .spec.pathPrefixes) will be routed to the Service and Port specified in + the scaleTargetRef. items: type: string type: array pathPrefixes: - description: (optional) The paths to route. All requests which the - Request Target matches any .spec.pathPrefixes and the "Host" header - matches any .spec.hosts will be routed to the Service and Port specified - in the scaleTargetRef. The .spec.hosts field is mutually exclusive - with the .spec.host field. When this field is null, any path is - matched. + description: |- + The paths to route. All requests which the Request Target matches any + .spec.pathPrefixes (and the "Host" header matches any .spec.hosts) + will be routed to the Service and Port specified in + the scaleTargetRef. items: type: string type: array @@ -116,8 +124,39 @@ spec: description: (optional) Cooldown period value format: int32 type: integer + scalingMetric: + description: (optional) Configuration for the metric used for scaling + properties: + concurrency: + description: Scaling based on concurrent requests for a given + target + properties: + targetValue: + default: 100 + description: Target value for rate scaling + type: integer + type: object + requestRate: + description: Scaling based the average rate during an specific + time window for a given target + properties: + granularity: + default: 1s + description: Time granularity for rate calculation + type: string + targetValue: + default: 100 + description: Target value for rate scaling + type: integer + window: + default: 1m + description: Time window for rate calculation + type: string + type: object + type: object targetPendingRequests: - description: (optional) Target metric value + description: (optional) DEPRECATED (use SscalingMetric instead) Target + metric value format: int32 type: integer required: @@ -154,12 +193,6 @@ spec: type: description: Type of condition enum: - - Created - - Terminated - - Error - - Pending - - Terminating - - Unknown - Ready type: string required: diff --git a/crds/kubedb-crds.yaml b/crds/kubedb-crds.yaml index 29c990e14..1b97e140f 100644 --- a/crds/kubedb-crds.yaml +++ b/crds/kubedb-crds.yaml @@ -80114,6 +80114,10 @@ spec: properties: createTables: type: boolean + externallyManaged: + type: boolean + linkedDB: + type: string name: type: string namespace: @@ -80123,6 +80127,8 @@ spec: - MySQL - PostgreSQL type: string + version: + type: string required: - name type: object @@ -99050,18 +99056,21 @@ spec: type: string zookeeperRef: properties: + externallyManaged: + type: boolean name: type: string namespace: type: string pathsBase: type: string + version: + type: string required: - name type: object required: - deepStorage - - metadataStorage - version type: object status: @@ -109644,23 +109653,17 @@ spec: type: boolean linkedDB: type: string - postgres: + postgresRef: properties: - service: - properties: - name: - type: string - namespace: - type: string - pgPort: - format: int32 - type: integer - type: object - url: + name: type: string - version: + namespace: type: string + required: + - name type: object + version: + type: string required: - externallyManaged type: object @@ -163886,7 +163889,7 @@ spec: default: md5 enum: - md5 - - scram + - scram-sha-256 - cert type: string defaultPoolSize: @@ -223374,16 +223377,150 @@ spec: type: string type: object x-kubernetes-map-type: atomic + horizontalScaling: + properties: + node: + format: int32 + type: integer + type: object restart: type: object timeout: type: string + tls: + properties: + certificates: + items: + properties: + alias: + type: string + dnsNames: + items: + type: string + type: array + duration: + type: string + emailAddresses: + items: + type: string + type: array + ipAddresses: + items: + type: string + type: array + issuerRef: + properties: + apiGroup: + type: string + kind: + type: string + name: + type: string + required: + - kind + - name + type: object + x-kubernetes-map-type: atomic + privateKey: + properties: + encoding: + enum: + - PKCS1 + - PKCS8 + type: string + type: object + renewBefore: + type: string + secretName: + type: string + subject: + properties: + countries: + items: + type: string + type: array + localities: + items: + type: string + type: array + organizationalUnits: + items: + type: string + type: array + organizations: + items: + type: string + type: array + postalCodes: + items: + type: string + type: array + provinces: + items: + type: string + type: array + serialNumber: + type: string + streetAddresses: + items: + type: string + type: array + type: object + uris: + items: + type: string + type: array + required: + - alias + type: object + type: array + clientAuthMode: + enum: + - md5 + - scram + - cert + type: string + issuerRef: + properties: + apiGroup: + type: string + kind: + type: string + name: + type: string + required: + - kind + - name + type: object + x-kubernetes-map-type: atomic + remove: + type: boolean + rotateCertificates: + type: boolean + sslMode: + enum: + - disable + - allow + - prefer + - require + - verify-ca + - verify-full + type: string + type: object type: enum: + - UpdateVersion - VerticalScaling - Reconfigure - Restart + - HorizontalScaling + - ReconfigureTLS type: string + updateVersion: + properties: + targetVersion: + type: string + type: object verticalScaling: properties: node: diff --git a/hack/scripts/import-crds.sh b/hack/scripts/import-crds.sh index 2437c98d7..317cd6a3e 100755 --- a/hack/scripts/import-crds.sh +++ b/hack/scripts/import-crds.sh @@ -91,61 +91,89 @@ if [ "$update_kubedb_crds" = true ] && [ -d ${crd_dir} ]; then --group=kubedb.com fi +KEDACORE_HTTP_ADD_ON_TAG=${KEDACORE_HTTP_ADD_ON_TAG:-v0.8.0} +KMODULES_CUSTOM_RESOURCES_TAG=${KMODULES_CUSTOM_RESOURCES_TAG:-v0.30.0} +KMODULES_RESOURCE_METADATA_TAG=${KMODULES_RESOURCE_METADATA_TAG:-v0.18.9} +KUBEOPS_SUPERVISOR_TAG=${KUBEOPS_SUPERVISOR_TAG:-v0.0.5} +KUBERNETES_SIGS_GATEWAY_API_TAG=${KUBERNETES_SIGS_GATEWAY_API_TAG:-v1.0.0} +KUBESTASH_APIMACHINERY_TAG=${KUBESTASH_APIMACHINERY_TAG:-v0.10.0} +OPEN_VIZ_APIMACHINERY_TAG=${OPEN_VIZ_APIMACHINERY_TAG:-v0.0.7} + crd-importer \ - --input=https://github.com/kubestash/apimachinery/raw/master/crds/addons.kubestash.com_addons.yaml \ - --input=https://github.com/kubestash/apimachinery/raw/master/crds/addons.kubestash.com_functions.yaml \ + --input=https://github.com/kubestash/apimachinery/raw/${KUBESTASH_APIMACHINERY_TAG}/crds/addons.kubestash.com_addons.yaml \ + --input=https://github.com/kubestash/apimachinery/raw/${KUBESTASH_APIMACHINERY_TAG}/crds/addons.kubestash.com_functions.yaml \ --out=./charts/kubedb-kubestash-catalog/crds crd-importer \ - --input=https://github.com/kmodules/resource-metadata/raw/v0.18.2/crds/node.k8s.appscode.com_nodetopologies.yaml \ + --input=https://github.com/kmodules/resource-metadata/raw/${KMODULES_RESOURCE_METADATA_TAG}/crds/node.k8s.appscode.com_nodetopologies.yaml \ --out=./charts/kubedb-autoscaler/crds crd-importer \ - --input=https://github.com/kmodules/custom-resources/raw/v0.29.1/crds/metrics.appscode.com_metricsconfigurations.yaml \ + --input=https://github.com/kmodules/custom-resources/raw/${KMODULES_CUSTOM_RESOURCES_TAG}/crds/metrics.appscode.com_metricsconfigurations.yaml \ --out=./charts/kubedb-metrics/crds crd-importer \ - --input=https://github.com/open-viz/apimachinery/raw/v0.0.7/crds/openviz.dev_grafanadashboards.yaml \ + --input=https://github.com/open-viz/apimachinery/raw/${OPEN_VIZ_APIMACHINERY_TAG}/crds/openviz.dev_grafanadashboards.yaml \ --out=./charts/kubedb-grafana-dashboards/crds crd-importer \ - --input=https://github.com/kubeops/supervisor/raw/v0.0.5/crds/supervisor.appscode.com_recommendations.yaml \ + --input=https://github.com/kubeops/supervisor/raw/${KUBEOPS_SUPERVISOR_TAG}/crds/supervisor.appscode.com_recommendations.yaml \ --out=./charts/kubedb-ops-manager/crds # dashboard charts crd-importer \ - --input=https://github.com/kedacore/http-add-on/raw/v0.7.0/config/crd/bases/http.keda.sh_httpscaledobjects.yaml \ - --input=https://github.com/kubernetes-sigs/gateway-api/raw/v1.0.0/config/crd/standard/gateway.networking.k8s.io_gateways.yaml \ - --input=https://github.com/kubernetes-sigs/gateway-api/raw/v1.0.0/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml \ - --input=https://github.com/kubernetes-sigs/gateway-api/raw/v1.0.0/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml \ + --input=https://github.com/kubernetes-sigs/gateway-api/raw/${KUBERNETES_SIGS_GATEWAY_API_TAG}/config/crd/standard/gateway.networking.k8s.io_gateways.yaml \ + --input=https://github.com/kubernetes-sigs/gateway-api/raw/${KUBERNETES_SIGS_GATEWAY_API_TAG}/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml \ + --input=https://github.com/kubernetes-sigs/gateway-api/raw/${KUBERNETES_SIGS_GATEWAY_API_TAG}/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml \ + --out=./charts/dbgate/crds +crd-importer \ + --input=https://github.com/kedacore/http-add-on/raw/${KEDACORE_HTTP_ADD_ON_TAG}/config/crd/bases/http.keda.sh_httpscaledobjects.yaml \ + --labels 'app.kubernetes.io/managed-by=Helm' \ + --annotations 'meta.helm.sh/release-name=keda-add-ons-http,meta.helm.sh/release-namespace=keda' \ --out=./charts/dbgate/crds crd-importer \ - --input=https://github.com/kedacore/http-add-on/raw/v0.7.0/config/crd/bases/http.keda.sh_httpscaledobjects.yaml \ - --input=https://github.com/kubernetes-sigs/gateway-api/raw/v1.0.0/config/crd/standard/gateway.networking.k8s.io_gateways.yaml \ - --input=https://github.com/kubernetes-sigs/gateway-api/raw/v1.0.0/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml \ - --input=https://github.com/kubernetes-sigs/gateway-api/raw/v1.0.0/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml \ + --input=https://github.com/kubernetes-sigs/gateway-api/raw/${KUBERNETES_SIGS_GATEWAY_API_TAG}/config/crd/standard/gateway.networking.k8s.io_gateways.yaml \ + --input=https://github.com/kubernetes-sigs/gateway-api/raw/${KUBERNETES_SIGS_GATEWAY_API_TAG}/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml \ + --input=https://github.com/kubernetes-sigs/gateway-api/raw/${KUBERNETES_SIGS_GATEWAY_API_TAG}/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml \ + --out=./charts/kafka-ui/crds +crd-importer \ + --input=https://github.com/kedacore/http-add-on/raw/${KEDACORE_HTTP_ADD_ON_TAG}/config/crd/bases/http.keda.sh_httpscaledobjects.yaml \ + --labels 'app.kubernetes.io/managed-by=Helm' \ + --annotations 'meta.helm.sh/release-name=keda-add-ons-http,meta.helm.sh/release-namespace=keda' \ --out=./charts/kafka-ui/crds crd-importer \ - --input=https://github.com/kedacore/http-add-on/raw/v0.7.0/config/crd/bases/http.keda.sh_httpscaledobjects.yaml \ - --input=https://github.com/kubernetes-sigs/gateway-api/raw/v1.0.0/config/crd/standard/gateway.networking.k8s.io_gateways.yaml \ - --input=https://github.com/kubernetes-sigs/gateway-api/raw/v1.0.0/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml \ - --input=https://github.com/kubernetes-sigs/gateway-api/raw/v1.0.0/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml \ + --input=https://github.com/kubernetes-sigs/gateway-api/raw/${KUBERNETES_SIGS_GATEWAY_API_TAG}/config/crd/standard/gateway.networking.k8s.io_gateways.yaml \ + --input=https://github.com/kubernetes-sigs/gateway-api/raw/${KUBERNETES_SIGS_GATEWAY_API_TAG}/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml \ + --input=https://github.com/kubernetes-sigs/gateway-api/raw/${KUBERNETES_SIGS_GATEWAY_API_TAG}/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml \ + --out=./charts/mongo-ui/crds +crd-importer \ + --input=https://github.com/kedacore/http-add-on/raw/${KEDACORE_HTTP_ADD_ON_TAG}/config/crd/bases/http.keda.sh_httpscaledobjects.yaml \ + --labels 'app.kubernetes.io/managed-by=Helm' \ + --annotations 'meta.helm.sh/release-name=keda-add-ons-http,meta.helm.sh/release-namespace=keda' \ --out=./charts/mongo-ui/crds crd-importer \ - --input=https://github.com/kedacore/http-add-on/raw/v0.7.0/config/crd/bases/http.keda.sh_httpscaledobjects.yaml \ - --input=https://github.com/kubernetes-sigs/gateway-api/raw/v1.0.0/config/crd/standard/gateway.networking.k8s.io_gateways.yaml \ - --input=https://github.com/kubernetes-sigs/gateway-api/raw/v1.0.0/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml \ - --input=https://github.com/kubernetes-sigs/gateway-api/raw/v1.0.0/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml \ + --input=https://github.com/kubernetes-sigs/gateway-api/raw/${KUBERNETES_SIGS_GATEWAY_API_TAG}/config/crd/standard/gateway.networking.k8s.io_gateways.yaml \ + --input=https://github.com/kubernetes-sigs/gateway-api/raw/${KUBERNETES_SIGS_GATEWAY_API_TAG}/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml \ + --input=https://github.com/kubernetes-sigs/gateway-api/raw/${KUBERNETES_SIGS_GATEWAY_API_TAG}/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml \ + --out=./charts/pgadmin/crds +crd-importer \ + --input=https://github.com/kedacore/http-add-on/raw/${KEDACORE_HTTP_ADD_ON_TAG}/config/crd/bases/http.keda.sh_httpscaledobjects.yaml \ + --labels 'app.kubernetes.io/managed-by=Helm' \ + --annotations 'meta.helm.sh/release-name=keda-add-ons-http,meta.helm.sh/release-namespace=keda' \ --out=./charts/pgadmin/crds crd-importer \ - --input=https://github.com/kedacore/http-add-on/raw/v0.7.0/config/crd/bases/http.keda.sh_httpscaledobjects.yaml \ - --input=https://github.com/kubernetes-sigs/gateway-api/raw/v1.0.0/config/crd/standard/gateway.networking.k8s.io_gateways.yaml \ - --input=https://github.com/kubernetes-sigs/gateway-api/raw/v1.0.0/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml \ - --input=https://github.com/kubernetes-sigs/gateway-api/raw/v1.0.0/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml \ + --input=https://github.com/kubernetes-sigs/gateway-api/raw/${KUBERNETES_SIGS_GATEWAY_API_TAG}/config/crd/standard/gateway.networking.k8s.io_gateways.yaml \ + --input=https://github.com/kubernetes-sigs/gateway-api/raw/${KUBERNETES_SIGS_GATEWAY_API_TAG}/config/crd/standard/gateway.networking.k8s.io_httproutes.yaml \ + --input=https://github.com/kubernetes-sigs/gateway-api/raw/${KUBERNETES_SIGS_GATEWAY_API_TAG}/config/crd/standard/gateway.networking.k8s.io_referencegrants.yaml \ + --out=./charts/phpmyadmin/crds +crd-importer \ + --input=https://github.com/kedacore/http-add-on/raw/${KEDACORE_HTTP_ADD_ON_TAG}/config/crd/bases/http.keda.sh_httpscaledobjects.yaml \ + --labels 'app.kubernetes.io/managed-by=Helm' \ + --annotations 'meta.helm.sh/release-name=keda-add-ons-http,meta.helm.sh/release-namespace=keda' \ --out=./charts/phpmyadmin/crds {