Skip to content

Commit

Permalink
chore: synced file(s) with aiven/aiven-operator (#52)
Browse files Browse the repository at this point in the history 
Co-authored-by: rriski <null>
  • Loading branch information
@rriski
rriski authored Jul 16, 2024
1 parent 62059ef commit 737cb46
Show file tree
Hide file tree
Showing 6 changed files with 165 additions and 16 deletions.
4 changes: 2 additions & 2 deletions charts/aiven-operator-crds/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: aiven-operator-crds
description: A Helm chart to deploy the aiven operator custom resource definitions
type: application
version: v0.23.0
appVersion: v0.23.0
version: v0.24.0
appVersion: v0.24.0
maintainers:
- name: byashimov
url: https://www.aiven.io
Expand Down
15 changes: 15 additions & 0 deletions charts/aiven-operator-crds/templates/aiven.io_cassandras.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,21 @@ spec:
service belong. Can be set only when creating the service.
maxLength: 128
type: string
read_request_timeout_in_ms:
description:
How long the coordinator waits for read operations
to complete before timing it out. 5 seconds by default.
maximum: 10000
minimum: 1000
type: integer
write_request_timeout_in_ms:
description:
How long the coordinator waits for write requests
to complete with at least one node in the local datacenter.
2 seconds by default.
maximum: 10000
minimum: 1000
type: integer
type: object
cassandra_version:
description: Cassandra version
Expand Down
144 changes: 132 additions & 12 deletions charts/aiven-operator-crds/templates/aiven.io_clickhousegrants.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ spec:
openAPIV3Schema:
description: |-
ClickhouseGrant is the Schema for the ClickhouseGrants API
Warning "Ambiguity in the `GRANT` syntax": Due to [an ambiguity](https://github.com/aiven/ospo-tracker/issues/350) in the `GRANT` syntax in Clickhouse, you should not have users and roles with the same name. It is not clear if a grant refers to the user or the role.
Warning: Due to the way ClickHouse operates, updating this resource first revokes the existing privileges.
properties:
apiVersion:
description: |-
Expand Down Expand Up @@ -69,7 +69,7 @@ spec:
items:
description: |-
PrivilegeGrant represents the privileges to be granted to users or roles.
See https://clickhouse.com/docs/en/sql-reference/statements/grant#granting-privilege-syntax.
[See](https://clickhouse.com/docs/en/sql-reference/statements/grant#granting-privilege-syntax).
properties:
columns:
description: The column that the grant refers to.
Expand All @@ -84,9 +84,12 @@ spec:
List of grantees (users or roles) to grant the
privilege to.
items:
description:
Grantee represents a user or a role to which
privileges or roles are granted.
description: |-
Grantee represents a user or a role to which privileges or roles are granted.
Warning "Ambiguity in the `GRANT` syntax":
Due to [an ambiguity](https://github.com/aiven/ospo-tracker/issues/350) in the GRANT syntax in ClickHouse,
users and roles should not share the same name.
It is unclear whether a grant applies to the user or the role.
properties:
role:
type: string
Expand All @@ -98,7 +101,7 @@ spec:
privileges:
description: |-
The privileges to grant, i.e. `INSERT`, `SELECT`.
See https://clickhouse.com/docs/en/sql-reference/statements/grant#assigning-role-syntax.
[See](https://clickhouse.com/docs/en/sql-reference/statements/grant#assigning-role-syntax).
items:
type: string
type: array
Expand All @@ -112,7 +115,7 @@ spec:
description: |-
If true, then the grantee (user or role) get the permission to execute the `GRANT` query.
Users can grant privileges of the same scope they have and less.
See https://clickhouse.com/docs/en/sql-reference/statements/grant#granting-privilege-syntax
[See](https://clickhouse.com/docs/en/sql-reference/statements/grant#granting-privilege-syntax)
type: boolean
required:
- database
Expand All @@ -139,16 +142,19 @@ spec:
items:
description: |-
RoleGrant represents the roles to be assigned to users or roles.
See https://clickhouse.com/docs/en/sql-reference/statements/grant#assigning-role-syntax.
[See](https://clickhouse.com/docs/en/sql-reference/statements/grant#assigning-role-syntax)
properties:
grantees:
description:
List of grantees (users or roles) to grant the
privilege to.
items:
description:
Grantee represents a user or a role to which
privileges or roles are granted.
description: |-
Grantee represents a user or a role to which privileges or roles are granted.
Warning "Ambiguity in the `GRANT` syntax":
Due to [an ambiguity](https://github.com/aiven/ospo-tracker/issues/350) in the GRANT syntax in ClickHouse,
users and roles should not share the same name.
It is unclear whether a grant applies to the user or the role.
properties:
role:
type: string
Expand All @@ -166,7 +172,7 @@ spec:
withAdminOption:
description: |-
If true, the grant is executed with `ADMIN OPTION` privilege.
See https://clickhouse.com/docs/en/sql-reference/statements/grant#admin-option.
[See](https://clickhouse.com/docs/en/sql-reference/statements/grant#admin-option)
type: boolean
required:
- grantees
Expand Down Expand Up @@ -260,6 +266,120 @@ spec:
- type
type: object
type: array
state:
description: The previous applied grants to revoke. Do not edit
properties:
privilegeGrants:
description:
Configuration to grant a privilege. Privileges not
in the manifest are revoked. Existing privileges are retained;
new ones are granted.
items:
description: |-
PrivilegeGrant represents the privileges to be granted to users or roles.
[See](https://clickhouse.com/docs/en/sql-reference/statements/grant#granting-privilege-syntax).
properties:
columns:
description: The column that the grant refers to.
items:
type: string
type: array
database:
description: The database that the grant refers to.
type: string
grantees:
description:
List of grantees (users or roles) to grant
the privilege to.
items:
description: |-
Grantee represents a user or a role to which privileges or roles are granted.
Warning "Ambiguity in the `GRANT` syntax":
Due to [an ambiguity](https://github.com/aiven/ospo-tracker/issues/350) in the GRANT syntax in ClickHouse,
users and roles should not share the same name.
It is unclear whether a grant applies to the user or the role.
properties:
role:
type: string
user:
type: string
type: object
minItems: 1
type: array
privileges:
description: |-
The privileges to grant, i.e. `INSERT`, `SELECT`.
[See](https://clickhouse.com/docs/en/sql-reference/statements/grant#assigning-role-syntax).
items:
type: string
type: array
table:
description:
'The tables that the grant refers to. To grant
a privilege on all tables in a database, omit this field
instead of writing `table: "*"`.'
type: string
withGrantOption:
description: |-
If true, then the grantee (user or role) get the permission to execute the `GRANT` query.
Users can grant privileges of the same scope they have and less.
[See](https://clickhouse.com/docs/en/sql-reference/statements/grant#granting-privilege-syntax)
type: boolean
required:
- database
- grantees
- privileges
type: object
x-kubernetes-validations:
- message: "`table` must be set if `columns` are set"
rule: "!has(self.columns) || (has(self.columns) && has(self.table))"
type: array
roleGrants:
description:
Configuration to grant a role. Role grants not in
the manifest are revoked. Existing role grants are retained;
new ones are granted.
items:
description: |-
RoleGrant represents the roles to be assigned to users or roles.
[See](https://clickhouse.com/docs/en/sql-reference/statements/grant#assigning-role-syntax)
properties:
grantees:
description:
List of grantees (users or roles) to grant
the privilege to.
items:
description: |-
Grantee represents a user or a role to which privileges or roles are granted.
Warning "Ambiguity in the `GRANT` syntax":
Due to [an ambiguity](https://github.com/aiven/ospo-tracker/issues/350) in the GRANT syntax in ClickHouse,
users and roles should not share the same name.
It is unclear whether a grant applies to the user or the role.
properties:
role:
type: string
user:
type: string
type: object
minItems: 1
type: array
roles:
description: List of roles to grant to the grantees.
items:
type: string
minItems: 1
type: array
withAdminOption:
description: |-
If true, the grant is executed with `ADMIN OPTION` privilege.
[See](https://clickhouse.com/docs/en/sql-reference/statements/grant#admin-option)
type: boolean
required:
- grantees
- roles
type: object
type: array
type: object
required:
- conditions
type: object
Expand Down
12 changes: 12 additions & 0 deletions charts/aiven-operator-crds/templates/aiven.io_opensearches.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,18 @@ spec:
maximum: 2147483647
minimum: 1
type: integer
knn_memory_circuit_breaker_enabled:
description:
Enable or disable KNN memory circuit breaker.
Defaults to true.
type: boolean
knn_memory_circuit_breaker_limit:
description:
Maximum amount of memory that can be used for
KNN index. Defaults to 50% of the JVM heap size.
maximum: 100
minimum: 3
type: integer
override_main_response_version:
description:
Compatibility mode sets OpenSearch to report
Expand Down
2 changes: 2 additions & 0 deletions charts/aiven-operator-crds/templates/aiven.io_postgresqls.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,8 @@ spec:
- "'pid=%p,user=%u,db=%d,app=%a,client=%h '"
- "'%t [%p]: [%l-1] user=%u,db=%d,app=%a,client=%h '"
- "'%m [%p] %q[user=%u,db=%d,app=%a] '"
- "'pid=%p,user=%u,db=%d,app=%a,client=%h,txid=%x,qid=%Q
'"
type: string
log_min_duration_statement:
description:
Expand Down
4 changes: 2 additions & 2 deletions charts/aiven-operator/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: aiven-operator
description: A Helm chart to deploy the aiven operator
type: application
version: v0.23.0
appVersion: v0.23.0
version: v0.24.0
appVersion: v0.24.0
maintainers:
- name: byashimov
url: https://www.aiven.io
Expand Down

0 comments on commit 737cb46

Please sign in to comment.