diff --git a/deploy/helm/README.md b/deploy/helm/README.md index 990c6d039..8293f4278 100644 --- a/deploy/helm/README.md +++ b/deploy/helm/README.md @@ -49,7 +49,7 @@ For upgrade please install CRDs separately: | operator.image.repository | string | `"altinity/clickhouse-operator"` | image repository | | operator.image.tag | string | `""` | image tag (chart's appVersion value will be used if not set) | | operator.resources | object | `{}` | custom resource configuration | -| podAnnotations | object | `{"prometheus.io/port":"8888","prometheus.io/scrape":"true"}` | annotations to add to the pod | +| podAnnotations | object | `{"clickhouse-operator-metrics/port":"9999","clickhouse-operator-metrics/scrape":"true","prometheus.io/port":"8888","prometheus.io/scrape":"true"}` | annotations to add to the pod | | podSecurityContext | object | `{}` | | | secret.create | bool | `true` | create a secret with operator credentials | | secret.password | string | `"clickhouse_operator_password"` | operator credentials password | diff --git a/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml b/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml index c3abc4645..f80c0f8de 100644 --- a/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml +++ b/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallations.clickhouse.altinity.com.yaml @@ -145,11 +145,13 @@ spec: taskIDsStarted: type: array description: "Started task ids" + nullable: true items: type: string taskIDsCompleted: type: array description: "Completed task ids" + nullable: true items: type: string action: @@ -158,6 +160,7 @@ spec: actions: type: array description: "Actions" + nullable: true items: type: string error: @@ -166,6 +169,7 @@ spec: errors: type: array description: "Errors" + nullable: true items: type: string hostsUpdated: @@ -191,16 +195,19 @@ spec: pods: type: array description: "Pods" + nullable: true items: type: string pod-ips: type: array description: "Pod IPs" + nullable: true items: type: string fqdns: type: array description: "Pods FQDNs" + nullable: true items: type: string endpoint: @@ -221,11 +228,13 @@ spec: hostsWithTablesCreated: type: array description: "List of hosts with tables created by the operator" + nullable: true items: type: string usedTemplates: type: array description: "List of templates used to build this CHI" + nullable: true x-kubernetes-preserve-unknown-fields: true items: type: object @@ -309,6 +318,7 @@ spec: will be auto-added into ClickHouseInstallation, selectable by `chiSelector`. Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly. enum: + - "" - "auto" - "manual" chiSelector: @@ -346,6 +356,7 @@ spec: description: "behavior policy for unknown StatefulSet, Delete by default" enum: # List ObjectsCleanupXXX constants from model + - "" - "Retain" - "Delete" pvc: @@ -594,6 +605,7 @@ spec: description: "how schema is propagated within a replica" enum: # List SchemaPolicyReplicaXXX constants from model + - "" - "None" - "All" shard: @@ -601,6 +613,7 @@ spec: description: "how schema is propagated between shards" enum: # List SchemaPolicyShardXXX constants from model + - "" - "None" - "All" - "DistributedTablesOnly" diff --git a/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml b/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml index be634b9b6..659dd9849 100644 --- a/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml +++ b/deploy/helm/crds/CustomResourceDefinition-clickhouseinstallationtemplates.clickhouse.altinity.com.yaml @@ -145,11 +145,13 @@ spec: taskIDsStarted: type: array description: "Started task ids" + nullable: true items: type: string taskIDsCompleted: type: array description: "Completed task ids" + nullable: true items: type: string action: @@ -158,6 +160,7 @@ spec: actions: type: array description: "Actions" + nullable: true items: type: string error: @@ -166,6 +169,7 @@ spec: errors: type: array description: "Errors" + nullable: true items: type: string hostsUpdated: @@ -191,16 +195,19 @@ spec: pods: type: array description: "Pods" + nullable: true items: type: string pod-ips: type: array description: "Pod IPs" + nullable: true items: type: string fqdns: type: array description: "Pods FQDNs" + nullable: true items: type: string endpoint: @@ -221,11 +228,13 @@ spec: hostsWithTablesCreated: type: array description: "List of hosts with tables created by the operator" + nullable: true items: type: string usedTemplates: type: array description: "List of templates used to build this CHI" + nullable: true x-kubernetes-preserve-unknown-fields: true items: type: object @@ -309,6 +318,7 @@ spec: will be auto-added into ClickHouseInstallation, selectable by `chiSelector`. Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly. enum: + - "" - "auto" - "manual" chiSelector: @@ -346,6 +356,7 @@ spec: description: "behavior policy for unknown StatefulSet, Delete by default" enum: # List ObjectsCleanupXXX constants from model + - "" - "Retain" - "Delete" pvc: @@ -594,6 +605,7 @@ spec: description: "how schema is propagated within a replica" enum: # List SchemaPolicyReplicaXXX constants from model + - "" - "None" - "All" shard: @@ -601,6 +613,7 @@ spec: description: "how schema is propagated between shards" enum: # List SchemaPolicyShardXXX constants from model + - "" - "None" - "All" - "DistributedTablesOnly" diff --git a/deploy/helm/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml b/deploy/helm/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml index 082362cd5..676481a41 100644 --- a/deploy/helm/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml +++ b/deploy/helm/crds/CustomResourceDefinition-clickhouseoperatorconfigurations.clickhouse.altinity.com.yaml @@ -203,6 +203,7 @@ spec: - ReadOnStart. Accept CHIT updates on the operators start only. - ApplyOnNextReconcile. Accept CHIT updates at all time. Apply news CHITs on next regular reconcile of the CHI enum: + - "" - "ReadOnStart" - "ApplyOnNextReconcile" path: diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml index bc0da389c..627181fa1 100644 --- a/deploy/helm/values.yaml +++ b/deploy/helm/values.yaml @@ -68,6 +68,8 @@ imagePullSecrets: [] podAnnotations: prometheus.io/port: '8888' prometheus.io/scrape: 'true' + clickhouse-operator-metrics/port: '9999' + clickhouse-operator-metrics/scrape: 'true' # nameOverride -- override name of the chart nameOverride: "" diff --git a/deploy/operator/clickhouse-operator-install-ansible.yaml b/deploy/operator/clickhouse-operator-install-ansible.yaml index dd95d17f5..3c40b38c2 100644 --- a/deploy/operator/clickhouse-operator-install-ansible.yaml +++ b/deploy/operator/clickhouse-operator-install-ansible.yaml @@ -156,11 +156,13 @@ spec: taskIDsStarted: type: array description: "Started task ids" + nullable: true items: type: string taskIDsCompleted: type: array description: "Completed task ids" + nullable: true items: type: string action: @@ -169,6 +171,7 @@ spec: actions: type: array description: "Actions" + nullable: true items: type: string error: @@ -177,6 +180,7 @@ spec: errors: type: array description: "Errors" + nullable: true items: type: string hostsUpdated: @@ -202,16 +206,19 @@ spec: pods: type: array description: "Pods" + nullable: true items: type: string pod-ips: type: array description: "Pod IPs" + nullable: true items: type: string fqdns: type: array description: "Pods FQDNs" + nullable: true items: type: string endpoint: @@ -232,11 +239,13 @@ spec: hostsWithTablesCreated: type: array description: "List of hosts with tables created by the operator" + nullable: true items: type: string usedTemplates: type: array description: "List of templates used to build this CHI" + nullable: true x-kubernetes-preserve-unknown-fields: true items: type: object @@ -320,6 +329,7 @@ spec: will be auto-added into ClickHouseInstallation, selectable by `chiSelector`. Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly. enum: + - "" - "auto" - "manual" chiSelector: @@ -357,6 +367,7 @@ spec: description: "behavior policy for unknown StatefulSet, Delete by default" enum: # List ObjectsCleanupXXX constants from model + - "" - "Retain" - "Delete" pvc: @@ -605,6 +616,7 @@ spec: description: "how schema is propagated within a replica" enum: # List SchemaPolicyReplicaXXX constants from model + - "" - "None" - "All" shard: @@ -612,6 +624,7 @@ spec: description: "how schema is propagated between shards" enum: # List SchemaPolicyShardXXX constants from model + - "" - "None" - "All" - "DistributedTablesOnly" @@ -1343,11 +1356,13 @@ spec: taskIDsStarted: type: array description: "Started task ids" + nullable: true items: type: string taskIDsCompleted: type: array description: "Completed task ids" + nullable: true items: type: string action: @@ -1356,6 +1371,7 @@ spec: actions: type: array description: "Actions" + nullable: true items: type: string error: @@ -1364,6 +1380,7 @@ spec: errors: type: array description: "Errors" + nullable: true items: type: string hostsUpdated: @@ -1389,16 +1406,19 @@ spec: pods: type: array description: "Pods" + nullable: true items: type: string pod-ips: type: array description: "Pod IPs" + nullable: true items: type: string fqdns: type: array description: "Pods FQDNs" + nullable: true items: type: string endpoint: @@ -1419,11 +1439,13 @@ spec: hostsWithTablesCreated: type: array description: "List of hosts with tables created by the operator" + nullable: true items: type: string usedTemplates: type: array description: "List of templates used to build this CHI" + nullable: true x-kubernetes-preserve-unknown-fields: true items: type: object @@ -1507,6 +1529,7 @@ spec: will be auto-added into ClickHouseInstallation, selectable by `chiSelector`. Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly. enum: + - "" - "auto" - "manual" chiSelector: @@ -1544,6 +1567,7 @@ spec: description: "behavior policy for unknown StatefulSet, Delete by default" enum: # List ObjectsCleanupXXX constants from model + - "" - "Retain" - "Delete" pvc: @@ -1792,6 +1816,7 @@ spec: description: "how schema is propagated within a replica" enum: # List SchemaPolicyReplicaXXX constants from model + - "" - "None" - "All" shard: @@ -1799,6 +1824,7 @@ spec: description: "how schema is propagated between shards" enum: # List SchemaPolicyShardXXX constants from model + - "" - "None" - "All" - "DistributedTablesOnly" @@ -2584,6 +2610,7 @@ spec: - ReadOnStart. Accept CHIT updates on the operators start only. - ApplyOnNextReconcile. Accept CHIT updates at all time. Apply news CHITs on next regular reconcile of the CHI enum: + - "" - "ReadOnStart" - "ApplyOnNextReconcile" path: @@ -3670,6 +3697,8 @@ spec: annotations: prometheus.io/port: '8888' prometheus.io/scrape: 'true' + clickhouse-operator-metrics/port: '9999' + clickhouse-operator-metrics/scrape: 'true' spec: serviceAccountName: clickhouse-operator volumes: diff --git a/deploy/operator/clickhouse-operator-install-bundle-v1beta1.yaml b/deploy/operator/clickhouse-operator-install-bundle-v1beta1.yaml index d241c4fac..ef45a8953 100644 --- a/deploy/operator/clickhouse-operator-install-bundle-v1beta1.yaml +++ b/deploy/operator/clickhouse-operator-install-bundle-v1beta1.yaml @@ -141,11 +141,13 @@ spec: taskIDsStarted: type: array description: "Started task ids" + nullable: true items: type: string taskIDsCompleted: type: array description: "Completed task ids" + nullable: true items: type: string action: @@ -154,6 +156,7 @@ spec: actions: type: array description: "Actions" + nullable: true items: type: string error: @@ -162,6 +165,7 @@ spec: errors: type: array description: "Errors" + nullable: true items: type: string hostsUpdated: @@ -187,16 +191,19 @@ spec: pods: type: array description: "Pods" + nullable: true items: type: string pod-ips: type: array description: "Pod IPs" + nullable: true items: type: string fqdns: type: array description: "Pods FQDNs" + nullable: true items: type: string endpoint: @@ -217,11 +224,13 @@ spec: hostsWithTablesCreated: type: array description: "List of hosts with tables created by the operator" + nullable: true items: type: string usedTemplates: type: array description: "List of templates used to build this CHI" + nullable: true x-kubernetes-preserve-unknown-fields: true items: type: object @@ -305,6 +314,7 @@ spec: will be auto-added into ClickHouseInstallation, selectable by `chiSelector`. Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly. enum: + - "" - "auto" - "manual" chiSelector: @@ -342,6 +352,7 @@ spec: description: "behavior policy for unknown StatefulSet, Delete by default" enum: # List ObjectsCleanupXXX constants from model + - "" - "Retain" - "Delete" pvc: @@ -590,6 +601,7 @@ spec: description: "how schema is propagated within a replica" enum: # List SchemaPolicyReplicaXXX constants from model + - "" - "None" - "All" shard: @@ -597,6 +609,7 @@ spec: description: "how schema is propagated between shards" enum: # List SchemaPolicyShardXXX constants from model + - "" - "None" - "All" - "DistributedTablesOnly" @@ -1316,11 +1329,13 @@ spec: taskIDsStarted: type: array description: "Started task ids" + nullable: true items: type: string taskIDsCompleted: type: array description: "Completed task ids" + nullable: true items: type: string action: @@ -1329,6 +1344,7 @@ spec: actions: type: array description: "Actions" + nullable: true items: type: string error: @@ -1337,6 +1353,7 @@ spec: errors: type: array description: "Errors" + nullable: true items: type: string hostsUpdated: @@ -1362,16 +1379,19 @@ spec: pods: type: array description: "Pods" + nullable: true items: type: string pod-ips: type: array description: "Pod IPs" + nullable: true items: type: string fqdns: type: array description: "Pods FQDNs" + nullable: true items: type: string endpoint: @@ -1392,11 +1412,13 @@ spec: hostsWithTablesCreated: type: array description: "List of hosts with tables created by the operator" + nullable: true items: type: string usedTemplates: type: array description: "List of templates used to build this CHI" + nullable: true x-kubernetes-preserve-unknown-fields: true items: type: object @@ -1480,6 +1502,7 @@ spec: will be auto-added into ClickHouseInstallation, selectable by `chiSelector`. Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly. enum: + - "" - "auto" - "manual" chiSelector: @@ -1517,6 +1540,7 @@ spec: description: "behavior policy for unknown StatefulSet, Delete by default" enum: # List ObjectsCleanupXXX constants from model + - "" - "Retain" - "Delete" pvc: @@ -1765,6 +1789,7 @@ spec: description: "how schema is propagated within a replica" enum: # List SchemaPolicyReplicaXXX constants from model + - "" - "None" - "All" shard: @@ -1772,6 +1797,7 @@ spec: description: "how schema is propagated between shards" enum: # List SchemaPolicyShardXXX constants from model + - "" - "None" - "All" - "DistributedTablesOnly" @@ -2551,6 +2577,7 @@ spec: - ReadOnStart. Accept CHIT updates on the operators start only. - ApplyOnNextReconcile. Accept CHIT updates at all time. Apply news CHITs on next regular reconcile of the CHI enum: + - "" - "ReadOnStart" - "ApplyOnNextReconcile" path: @@ -3622,6 +3649,8 @@ spec: annotations: prometheus.io/port: '8888' prometheus.io/scrape: 'true' + clickhouse-operator-metrics/port: '9999' + clickhouse-operator-metrics/scrape: 'true' spec: serviceAccountName: clickhouse-operator volumes: diff --git a/deploy/operator/clickhouse-operator-install-bundle.yaml b/deploy/operator/clickhouse-operator-install-bundle.yaml index 12a9e8191..8674aad1a 100644 --- a/deploy/operator/clickhouse-operator-install-bundle.yaml +++ b/deploy/operator/clickhouse-operator-install-bundle.yaml @@ -149,11 +149,13 @@ spec: taskIDsStarted: type: array description: "Started task ids" + nullable: true items: type: string taskIDsCompleted: type: array description: "Completed task ids" + nullable: true items: type: string action: @@ -162,6 +164,7 @@ spec: actions: type: array description: "Actions" + nullable: true items: type: string error: @@ -170,6 +173,7 @@ spec: errors: type: array description: "Errors" + nullable: true items: type: string hostsUpdated: @@ -195,16 +199,19 @@ spec: pods: type: array description: "Pods" + nullable: true items: type: string pod-ips: type: array description: "Pod IPs" + nullable: true items: type: string fqdns: type: array description: "Pods FQDNs" + nullable: true items: type: string endpoint: @@ -225,11 +232,13 @@ spec: hostsWithTablesCreated: type: array description: "List of hosts with tables created by the operator" + nullable: true items: type: string usedTemplates: type: array description: "List of templates used to build this CHI" + nullable: true x-kubernetes-preserve-unknown-fields: true items: type: object @@ -313,6 +322,7 @@ spec: will be auto-added into ClickHouseInstallation, selectable by `chiSelector`. Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly. enum: + - "" - "auto" - "manual" chiSelector: @@ -350,6 +360,7 @@ spec: description: "behavior policy for unknown StatefulSet, Delete by default" enum: # List ObjectsCleanupXXX constants from model + - "" - "Retain" - "Delete" pvc: @@ -598,6 +609,7 @@ spec: description: "how schema is propagated within a replica" enum: # List SchemaPolicyReplicaXXX constants from model + - "" - "None" - "All" shard: @@ -605,6 +617,7 @@ spec: description: "how schema is propagated between shards" enum: # List SchemaPolicyShardXXX constants from model + - "" - "None" - "All" - "DistributedTablesOnly" @@ -1336,11 +1349,13 @@ spec: taskIDsStarted: type: array description: "Started task ids" + nullable: true items: type: string taskIDsCompleted: type: array description: "Completed task ids" + nullable: true items: type: string action: @@ -1349,6 +1364,7 @@ spec: actions: type: array description: "Actions" + nullable: true items: type: string error: @@ -1357,6 +1373,7 @@ spec: errors: type: array description: "Errors" + nullable: true items: type: string hostsUpdated: @@ -1382,16 +1399,19 @@ spec: pods: type: array description: "Pods" + nullable: true items: type: string pod-ips: type: array description: "Pod IPs" + nullable: true items: type: string fqdns: type: array description: "Pods FQDNs" + nullable: true items: type: string endpoint: @@ -1412,11 +1432,13 @@ spec: hostsWithTablesCreated: type: array description: "List of hosts with tables created by the operator" + nullable: true items: type: string usedTemplates: type: array description: "List of templates used to build this CHI" + nullable: true x-kubernetes-preserve-unknown-fields: true items: type: object @@ -1500,6 +1522,7 @@ spec: will be auto-added into ClickHouseInstallation, selectable by `chiSelector`. Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly. enum: + - "" - "auto" - "manual" chiSelector: @@ -1537,6 +1560,7 @@ spec: description: "behavior policy for unknown StatefulSet, Delete by default" enum: # List ObjectsCleanupXXX constants from model + - "" - "Retain" - "Delete" pvc: @@ -1785,6 +1809,7 @@ spec: description: "how schema is propagated within a replica" enum: # List SchemaPolicyReplicaXXX constants from model + - "" - "None" - "All" shard: @@ -1792,6 +1817,7 @@ spec: description: "how schema is propagated between shards" enum: # List SchemaPolicyShardXXX constants from model + - "" - "None" - "All" - "DistributedTablesOnly" @@ -2577,6 +2603,7 @@ spec: - ReadOnStart. Accept CHIT updates on the operators start only. - ApplyOnNextReconcile. Accept CHIT updates at all time. Apply news CHITs on next regular reconcile of the CHI enum: + - "" - "ReadOnStart" - "ApplyOnNextReconcile" path: @@ -3663,6 +3690,8 @@ spec: annotations: prometheus.io/port: '8888' prometheus.io/scrape: 'true' + clickhouse-operator-metrics/port: '9999' + clickhouse-operator-metrics/scrape: 'true' spec: serviceAccountName: clickhouse-operator volumes: diff --git a/deploy/operator/clickhouse-operator-install-template-v1beta1.yaml b/deploy/operator/clickhouse-operator-install-template-v1beta1.yaml index 5f6afb645..0148d40c8 100644 --- a/deploy/operator/clickhouse-operator-install-template-v1beta1.yaml +++ b/deploy/operator/clickhouse-operator-install-template-v1beta1.yaml @@ -141,11 +141,13 @@ spec: taskIDsStarted: type: array description: "Started task ids" + nullable: true items: type: string taskIDsCompleted: type: array description: "Completed task ids" + nullable: true items: type: string action: @@ -154,6 +156,7 @@ spec: actions: type: array description: "Actions" + nullable: true items: type: string error: @@ -162,6 +165,7 @@ spec: errors: type: array description: "Errors" + nullable: true items: type: string hostsUpdated: @@ -187,16 +191,19 @@ spec: pods: type: array description: "Pods" + nullable: true items: type: string pod-ips: type: array description: "Pod IPs" + nullable: true items: type: string fqdns: type: array description: "Pods FQDNs" + nullable: true items: type: string endpoint: @@ -217,11 +224,13 @@ spec: hostsWithTablesCreated: type: array description: "List of hosts with tables created by the operator" + nullable: true items: type: string usedTemplates: type: array description: "List of templates used to build this CHI" + nullable: true x-kubernetes-preserve-unknown-fields: true items: type: object @@ -305,6 +314,7 @@ spec: will be auto-added into ClickHouseInstallation, selectable by `chiSelector`. Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly. enum: + - "" - "auto" - "manual" chiSelector: @@ -342,6 +352,7 @@ spec: description: "behavior policy for unknown StatefulSet, Delete by default" enum: # List ObjectsCleanupXXX constants from model + - "" - "Retain" - "Delete" pvc: @@ -590,6 +601,7 @@ spec: description: "how schema is propagated within a replica" enum: # List SchemaPolicyReplicaXXX constants from model + - "" - "None" - "All" shard: @@ -597,6 +609,7 @@ spec: description: "how schema is propagated between shards" enum: # List SchemaPolicyShardXXX constants from model + - "" - "None" - "All" - "DistributedTablesOnly" @@ -1316,11 +1329,13 @@ spec: taskIDsStarted: type: array description: "Started task ids" + nullable: true items: type: string taskIDsCompleted: type: array description: "Completed task ids" + nullable: true items: type: string action: @@ -1329,6 +1344,7 @@ spec: actions: type: array description: "Actions" + nullable: true items: type: string error: @@ -1337,6 +1353,7 @@ spec: errors: type: array description: "Errors" + nullable: true items: type: string hostsUpdated: @@ -1362,16 +1379,19 @@ spec: pods: type: array description: "Pods" + nullable: true items: type: string pod-ips: type: array description: "Pod IPs" + nullable: true items: type: string fqdns: type: array description: "Pods FQDNs" + nullable: true items: type: string endpoint: @@ -1392,11 +1412,13 @@ spec: hostsWithTablesCreated: type: array description: "List of hosts with tables created by the operator" + nullable: true items: type: string usedTemplates: type: array description: "List of templates used to build this CHI" + nullable: true x-kubernetes-preserve-unknown-fields: true items: type: object @@ -1480,6 +1502,7 @@ spec: will be auto-added into ClickHouseInstallation, selectable by `chiSelector`. Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly. enum: + - "" - "auto" - "manual" chiSelector: @@ -1517,6 +1540,7 @@ spec: description: "behavior policy for unknown StatefulSet, Delete by default" enum: # List ObjectsCleanupXXX constants from model + - "" - "Retain" - "Delete" pvc: @@ -1765,6 +1789,7 @@ spec: description: "how schema is propagated within a replica" enum: # List SchemaPolicyReplicaXXX constants from model + - "" - "None" - "All" shard: @@ -1772,6 +1797,7 @@ spec: description: "how schema is propagated between shards" enum: # List SchemaPolicyShardXXX constants from model + - "" - "None" - "All" - "DistributedTablesOnly" @@ -2551,6 +2577,7 @@ spec: - ReadOnStart. Accept CHIT updates on the operators start only. - ApplyOnNextReconcile. Accept CHIT updates at all time. Apply news CHITs on next regular reconcile of the CHI enum: + - "" - "ReadOnStart" - "ApplyOnNextReconcile" path: @@ -3622,6 +3649,8 @@ spec: annotations: prometheus.io/port: '8888' prometheus.io/scrape: 'true' + clickhouse-operator-metrics/port: '9999' + clickhouse-operator-metrics/scrape: 'true' spec: serviceAccountName: clickhouse-operator volumes: diff --git a/deploy/operator/clickhouse-operator-install-template.yaml b/deploy/operator/clickhouse-operator-install-template.yaml index 8d5760c22..5c7035540 100644 --- a/deploy/operator/clickhouse-operator-install-template.yaml +++ b/deploy/operator/clickhouse-operator-install-template.yaml @@ -149,11 +149,13 @@ spec: taskIDsStarted: type: array description: "Started task ids" + nullable: true items: type: string taskIDsCompleted: type: array description: "Completed task ids" + nullable: true items: type: string action: @@ -162,6 +164,7 @@ spec: actions: type: array description: "Actions" + nullable: true items: type: string error: @@ -170,6 +173,7 @@ spec: errors: type: array description: "Errors" + nullable: true items: type: string hostsUpdated: @@ -195,16 +199,19 @@ spec: pods: type: array description: "Pods" + nullable: true items: type: string pod-ips: type: array description: "Pod IPs" + nullable: true items: type: string fqdns: type: array description: "Pods FQDNs" + nullable: true items: type: string endpoint: @@ -225,11 +232,13 @@ spec: hostsWithTablesCreated: type: array description: "List of hosts with tables created by the operator" + nullable: true items: type: string usedTemplates: type: array description: "List of templates used to build this CHI" + nullable: true x-kubernetes-preserve-unknown-fields: true items: type: object @@ -313,6 +322,7 @@ spec: will be auto-added into ClickHouseInstallation, selectable by `chiSelector`. Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly. enum: + - "" - "auto" - "manual" chiSelector: @@ -350,6 +360,7 @@ spec: description: "behavior policy for unknown StatefulSet, Delete by default" enum: # List ObjectsCleanupXXX constants from model + - "" - "Retain" - "Delete" pvc: @@ -598,6 +609,7 @@ spec: description: "how schema is propagated within a replica" enum: # List SchemaPolicyReplicaXXX constants from model + - "" - "None" - "All" shard: @@ -605,6 +617,7 @@ spec: description: "how schema is propagated between shards" enum: # List SchemaPolicyShardXXX constants from model + - "" - "None" - "All" - "DistributedTablesOnly" @@ -1336,11 +1349,13 @@ spec: taskIDsStarted: type: array description: "Started task ids" + nullable: true items: type: string taskIDsCompleted: type: array description: "Completed task ids" + nullable: true items: type: string action: @@ -1349,6 +1364,7 @@ spec: actions: type: array description: "Actions" + nullable: true items: type: string error: @@ -1357,6 +1373,7 @@ spec: errors: type: array description: "Errors" + nullable: true items: type: string hostsUpdated: @@ -1382,16 +1399,19 @@ spec: pods: type: array description: "Pods" + nullable: true items: type: string pod-ips: type: array description: "Pod IPs" + nullable: true items: type: string fqdns: type: array description: "Pods FQDNs" + nullable: true items: type: string endpoint: @@ -1412,11 +1432,13 @@ spec: hostsWithTablesCreated: type: array description: "List of hosts with tables created by the operator" + nullable: true items: type: string usedTemplates: type: array description: "List of templates used to build this CHI" + nullable: true x-kubernetes-preserve-unknown-fields: true items: type: object @@ -1500,6 +1522,7 @@ spec: will be auto-added into ClickHouseInstallation, selectable by `chiSelector`. Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly. enum: + - "" - "auto" - "manual" chiSelector: @@ -1537,6 +1560,7 @@ spec: description: "behavior policy for unknown StatefulSet, Delete by default" enum: # List ObjectsCleanupXXX constants from model + - "" - "Retain" - "Delete" pvc: @@ -1785,6 +1809,7 @@ spec: description: "how schema is propagated within a replica" enum: # List SchemaPolicyReplicaXXX constants from model + - "" - "None" - "All" shard: @@ -1792,6 +1817,7 @@ spec: description: "how schema is propagated between shards" enum: # List SchemaPolicyShardXXX constants from model + - "" - "None" - "All" - "DistributedTablesOnly" @@ -2577,6 +2603,7 @@ spec: - ReadOnStart. Accept CHIT updates on the operators start only. - ApplyOnNextReconcile. Accept CHIT updates at all time. Apply news CHITs on next regular reconcile of the CHI enum: + - "" - "ReadOnStart" - "ApplyOnNextReconcile" path: @@ -3663,6 +3690,8 @@ spec: annotations: prometheus.io/port: '8888' prometheus.io/scrape: 'true' + clickhouse-operator-metrics/port: '9999' + clickhouse-operator-metrics/scrape: 'true' spec: serviceAccountName: clickhouse-operator volumes: diff --git a/deploy/operator/clickhouse-operator-install-tf.yaml b/deploy/operator/clickhouse-operator-install-tf.yaml index b43fb9d55..6d2640fac 100644 --- a/deploy/operator/clickhouse-operator-install-tf.yaml +++ b/deploy/operator/clickhouse-operator-install-tf.yaml @@ -156,11 +156,13 @@ spec: taskIDsStarted: type: array description: "Started task ids" + nullable: true items: type: string taskIDsCompleted: type: array description: "Completed task ids" + nullable: true items: type: string action: @@ -169,6 +171,7 @@ spec: actions: type: array description: "Actions" + nullable: true items: type: string error: @@ -177,6 +180,7 @@ spec: errors: type: array description: "Errors" + nullable: true items: type: string hostsUpdated: @@ -202,16 +206,19 @@ spec: pods: type: array description: "Pods" + nullable: true items: type: string pod-ips: type: array description: "Pod IPs" + nullable: true items: type: string fqdns: type: array description: "Pods FQDNs" + nullable: true items: type: string endpoint: @@ -232,11 +239,13 @@ spec: hostsWithTablesCreated: type: array description: "List of hosts with tables created by the operator" + nullable: true items: type: string usedTemplates: type: array description: "List of templates used to build this CHI" + nullable: true x-kubernetes-preserve-unknown-fields: true items: type: object @@ -320,6 +329,7 @@ spec: will be auto-added into ClickHouseInstallation, selectable by `chiSelector`. Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly. enum: + - "" - "auto" - "manual" chiSelector: @@ -357,6 +367,7 @@ spec: description: "behavior policy for unknown StatefulSet, Delete by default" enum: # List ObjectsCleanupXXX constants from model + - "" - "Retain" - "Delete" pvc: @@ -605,6 +616,7 @@ spec: description: "how schema is propagated within a replica" enum: # List SchemaPolicyReplicaXXX constants from model + - "" - "None" - "All" shard: @@ -612,6 +624,7 @@ spec: description: "how schema is propagated between shards" enum: # List SchemaPolicyShardXXX constants from model + - "" - "None" - "All" - "DistributedTablesOnly" @@ -1343,11 +1356,13 @@ spec: taskIDsStarted: type: array description: "Started task ids" + nullable: true items: type: string taskIDsCompleted: type: array description: "Completed task ids" + nullable: true items: type: string action: @@ -1356,6 +1371,7 @@ spec: actions: type: array description: "Actions" + nullable: true items: type: string error: @@ -1364,6 +1380,7 @@ spec: errors: type: array description: "Errors" + nullable: true items: type: string hostsUpdated: @@ -1389,16 +1406,19 @@ spec: pods: type: array description: "Pods" + nullable: true items: type: string pod-ips: type: array description: "Pod IPs" + nullable: true items: type: string fqdns: type: array description: "Pods FQDNs" + nullable: true items: type: string endpoint: @@ -1419,11 +1439,13 @@ spec: hostsWithTablesCreated: type: array description: "List of hosts with tables created by the operator" + nullable: true items: type: string usedTemplates: type: array description: "List of templates used to build this CHI" + nullable: true x-kubernetes-preserve-unknown-fields: true items: type: object @@ -1507,6 +1529,7 @@ spec: will be auto-added into ClickHouseInstallation, selectable by `chiSelector`. Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly. enum: + - "" - "auto" - "manual" chiSelector: @@ -1544,6 +1567,7 @@ spec: description: "behavior policy for unknown StatefulSet, Delete by default" enum: # List ObjectsCleanupXXX constants from model + - "" - "Retain" - "Delete" pvc: @@ -1792,6 +1816,7 @@ spec: description: "how schema is propagated within a replica" enum: # List SchemaPolicyReplicaXXX constants from model + - "" - "None" - "All" shard: @@ -1799,6 +1824,7 @@ spec: description: "how schema is propagated between shards" enum: # List SchemaPolicyShardXXX constants from model + - "" - "None" - "All" - "DistributedTablesOnly" @@ -2584,6 +2610,7 @@ spec: - ReadOnStart. Accept CHIT updates on the operators start only. - ApplyOnNextReconcile. Accept CHIT updates at all time. Apply news CHITs on next regular reconcile of the CHI enum: + - "" - "ReadOnStart" - "ApplyOnNextReconcile" path: @@ -3670,6 +3697,8 @@ spec: annotations: prometheus.io/port: '8888' prometheus.io/scrape: 'true' + clickhouse-operator-metrics/port: '9999' + clickhouse-operator-metrics/scrape: 'true' spec: serviceAccountName: clickhouse-operator volumes: diff --git a/deploy/operator/parts/crd.yaml b/deploy/operator/parts/crd.yaml index c7249054a..9a71a670e 100644 --- a/deploy/operator/parts/crd.yaml +++ b/deploy/operator/parts/crd.yaml @@ -149,11 +149,13 @@ spec: taskIDsStarted: type: array description: "Started task ids" + nullable: true items: type: string taskIDsCompleted: type: array description: "Completed task ids" + nullable: true items: type: string action: @@ -162,6 +164,7 @@ spec: actions: type: array description: "Actions" + nullable: true items: type: string error: @@ -170,6 +173,7 @@ spec: errors: type: array description: "Errors" + nullable: true items: type: string hostsUpdated: @@ -195,16 +199,19 @@ spec: pods: type: array description: "Pods" + nullable: true items: type: string pod-ips: type: array description: "Pod IPs" + nullable: true items: type: string fqdns: type: array description: "Pods FQDNs" + nullable: true items: type: string endpoint: @@ -225,11 +232,13 @@ spec: hostsWithTablesCreated: type: array description: "List of hosts with tables created by the operator" + nullable: true items: type: string usedTemplates: type: array description: "List of templates used to build this CHI" + nullable: true x-kubernetes-preserve-unknown-fields: true items: type: object @@ -313,6 +322,7 @@ spec: will be auto-added into ClickHouseInstallation, selectable by `chiSelector`. Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly. enum: + - "" - "auto" - "manual" chiSelector: @@ -350,6 +360,7 @@ spec: description: "behavior policy for unknown StatefulSet, Delete by default" enum: # List ObjectsCleanupXXX constants from model + - "" - "Retain" - "Delete" pvc: @@ -598,6 +609,7 @@ spec: description: "how schema is propagated within a replica" enum: # List SchemaPolicyReplicaXXX constants from model + - "" - "None" - "All" shard: @@ -605,6 +617,7 @@ spec: description: "how schema is propagated between shards" enum: # List SchemaPolicyShardXXX constants from model + - "" - "None" - "All" - "DistributedTablesOnly" @@ -1336,11 +1349,13 @@ spec: taskIDsStarted: type: array description: "Started task ids" + nullable: true items: type: string taskIDsCompleted: type: array description: "Completed task ids" + nullable: true items: type: string action: @@ -1349,6 +1364,7 @@ spec: actions: type: array description: "Actions" + nullable: true items: type: string error: @@ -1357,6 +1373,7 @@ spec: errors: type: array description: "Errors" + nullable: true items: type: string hostsUpdated: @@ -1382,16 +1399,19 @@ spec: pods: type: array description: "Pods" + nullable: true items: type: string pod-ips: type: array description: "Pod IPs" + nullable: true items: type: string fqdns: type: array description: "Pods FQDNs" + nullable: true items: type: string endpoint: @@ -1412,11 +1432,13 @@ spec: hostsWithTablesCreated: type: array description: "List of hosts with tables created by the operator" + nullable: true items: type: string usedTemplates: type: array description: "List of templates used to build this CHI" + nullable: true x-kubernetes-preserve-unknown-fields: true items: type: object @@ -1500,6 +1522,7 @@ spec: will be auto-added into ClickHouseInstallation, selectable by `chiSelector`. Default value is `manual`, meaning ClickHouseInstallation should request this ClickhouseInstallationTemplate explicitly. enum: + - "" - "auto" - "manual" chiSelector: @@ -1537,6 +1560,7 @@ spec: description: "behavior policy for unknown StatefulSet, Delete by default" enum: # List ObjectsCleanupXXX constants from model + - "" - "Retain" - "Delete" pvc: @@ -1785,6 +1809,7 @@ spec: description: "how schema is propagated within a replica" enum: # List SchemaPolicyReplicaXXX constants from model + - "" - "None" - "All" shard: @@ -1792,6 +1817,7 @@ spec: description: "how schema is propagated between shards" enum: # List SchemaPolicyShardXXX constants from model + - "" - "None" - "All" - "DistributedTablesOnly" @@ -2577,6 +2603,7 @@ spec: - ReadOnStart. Accept CHIT updates on the operators start only. - ApplyOnNextReconcile. Accept CHIT updates at all time. Apply news CHITs on next regular reconcile of the CHI enum: + - "" - "ReadOnStart" - "ApplyOnNextReconcile" path: