diff --git a/examples/helm-charts/cubejs/Chart.yaml b/examples/helm-charts/cubejs/Chart.yaml index 2776af45b3b2..11b3dfcf16b3 100644 --- a/examples/helm-charts/cubejs/Chart.yaml +++ b/examples/helm-charts/cubejs/Chart.yaml @@ -3,7 +3,7 @@ name: cubejs description: A Helm chart for Cubejs type: application version: 0.1.0 -appVersion: "0.28.26" +appVersion: "0.28.28" keywords: - cubejs maintainers: diff --git a/examples/helm-charts/cubejs/README.md b/examples/helm-charts/cubejs/README.md index 87a98698ed8e..6deaa9970bcf 100644 --- a/examples/helm-charts/cubejs/README.md +++ b/examples/helm-charts/cubejs/README.md @@ -183,6 +183,7 @@ cubestore: | `global.apiSecret` | The secret key used to sign and verify JWTs. Generated on project scaffold | | | `global.schemaPath` | The path where Cube.js loads schemas from. Defaults to schema | | | `global.app` | An application ID used to uniquely identify the Cube.js deployment. Can be different for multitenant setups. Defaults to cubejs | | +| `global.rollupOnly` | If true, this instance of Cube.js will only query rollup pre-aggregations. Defaults to false | | | `global.scheduledRefreshTimezones` | A comma-separated list of timezones to schedule refreshes for | | | `global.webSockets` | If true, then use WebSocket for data fetching. Defaults to true | | | `global.preAggregationsSchema` | The schema name to use for storing pre-aggregations true | | @@ -309,7 +310,7 @@ cubestore: | Name | Description | Value | | -------------------------- | ---------------------------------------------------- | ----- | | `master.affinity` | Affinity for pod assignment | `{}` | -| `master.spreadConstraints` | Topology spread constraint for pod assignment | `{}` | +| `master.spreadConstraints` | Topology spread constraint for pod assignment | `[]` | | `master.resources` | Define resources requests and limits for single Pods | `{}` | ### Workers parameters @@ -318,7 +319,7 @@ cubestore: | --------------------------- | ---------------------------------------------------- | ----- | | `workers.workersCount` | Number of workers to deploy | `1` | | `workers.affinity` | Affinity for pod assignment | `{}` | -| `workers.spreadConstraints` | Topology spread constraint for pod assignment | `{}` | +| `workers.spreadConstraints` | Topology spread constraint for pod assignment | `[]` | | `workers.resources` | Define resources requests and limits for single Pods | `{}` | ## Service parameters diff --git a/examples/helm-charts/cubejs/templates/common-env.tpl b/examples/helm-charts/cubejs/templates/common-env.tpl index 6a6cf9fc55d7..63dc1c03310d 100644 --- a/examples/helm-charts/cubejs/templates/common-env.tpl +++ b/examples/helm-charts/cubejs/templates/common-env.tpl @@ -21,6 +21,10 @@ - name: CUBEJS_CACHE_AND_QUEUE_DRIVER value: {{ .Values.global.cacheAndQueueDriver | quote }} {{- end }} +{{- if .Values.global.rollupOnly }} +- name: CUBEJS_ROLLUP_ONLY + value: {{ .Values.global.rollupOnly | quote }} +{{- end }} {{- if .Values.global.scheduledRefreshTimezones }} - name: CUBEJS_SCHEDULED_REFRESH_TIMEZONES value: {{ .Values.global.scheduledRefreshTimezones | quote }} diff --git a/examples/helm-charts/cubejs/values.yaml b/examples/helm-charts/cubejs/values.yaml index b58ee6d5ac4b..c9d01c552916 100644 --- a/examples/helm-charts/cubejs/values.yaml +++ b/examples/helm-charts/cubejs/values.yaml @@ -62,6 +62,10 @@ global: ## app: + ## If true, this instance of Cube.js will only query rollup pre-aggregations. Defaults to false + ## + rollupOnly: + ## A comma-separated list of timezones to schedule refreshes for. ## scheduledRefreshTimezones: @@ -431,7 +435,7 @@ master: ## Topology spread constraint for pod assignment ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ ## - spreadConstraints: {} + spreadConstraints: [] ## Define resources requests and limits for single Pods. ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ @@ -449,7 +453,7 @@ workers: ## topology spread constraint for pod assignment ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ ## - spreadConstraints: {} + spreadConstraints: [] ## Define resources requests and limits for single Pods. ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ diff --git a/examples/helm-charts/cubestore/Chart.yaml b/examples/helm-charts/cubestore/Chart.yaml index 8cf6274effcc..0ec43d5e71ce 100644 --- a/examples/helm-charts/cubestore/Chart.yaml +++ b/examples/helm-charts/cubestore/Chart.yaml @@ -3,7 +3,7 @@ name: cubestore description: A Helm chart for Cubestore type: application version: 0.1.0 -appVersion: "0.28.26" +appVersion: "0.28.28" keywords: - cubejs - cubestore diff --git a/examples/helm-charts/cubestore/README.md b/examples/helm-charts/cubestore/README.md index 0527e97ff97c..b7bdcf8d703e 100644 --- a/examples/helm-charts/cubestore/README.md +++ b/examples/helm-charts/cubestore/README.md @@ -96,10 +96,8 @@ By default local dir are not persisted. You can enable persistance on router and | `cloudStorage.gcp.credentialsFromSecret.key` | A Base64 encoded JSON key file for connecting to Google Cloud. Required when using Google Cloud Storage (using secret) | | | `cloudStorage.gcp.bucket` | The name of a bucket in GCS. Required when using GCS | | | `cloudStorage.gcp.subPath` | The path in a GCS bucket to store pre-aggregations. Optional | | -| `cloudStorage.aws.accessKeyID` | The Access Key ID for AWS. Required when using AWS S3 | -| | -| `cloudStorage.aws.secretKey` | A Base64 encoded JSON key file for connecting to Google Cloud. Required when using Google Cloud Storage | -| | +| `cloudStorage.aws.accessKeyID` | The Access Key ID for AWS. Required when using AWS S3 | | +| `cloudStorage.aws.secretKey` | A Base64 encoded JSON key file for connecting to Google Cloud. Required when using Google Cloud Storage | | | `cloudStorage.aws.secretKeyFromSecret.name` | The Secret Access Key for AWS. Required when using AWS S3 (using secret) | | | `cloudStorage.aws.secretKeyFromSecret.key` | The Secret Access Key for AWS. Required when using AWS S3 (using secret) | | | `cloudStorage.aws.bucket` | The name of a bucket in AWS S3. Required when using AWS S3 | | @@ -113,12 +111,13 @@ By default local dir are not persisted. You can enable persistance on router and | `router.httpPort` | The port for Cube Store to listen to HTTP connections on | `3030` | | `router.metaPort` | The port for the router node to listen for connections on | `9999` | | `router.mysqlPort` | The port for Cube Store to listen to connections on | `3306` | +| `router.statusPort` | The port for Cube Store to expose status probes | `3331` | | `router.persistence.enabled` | Enable persistence for local data using Persistent Volume Claims | `false` | | `router.persistance.size` | Persistent Volume size | `10Gi` | | `router.persistance.accessModes` | Persistent Volume access modes | [`ReadWriteOnce`] | | `router.persistance.annotations` | Additional custom annotations for the PVC | `{}` | | `router.affinity` | Affinity for pod assignment | `{}` | -| `router.spreadConstraints` | Topology spread constraint for pod assignment | `{}` | +| `router.spreadConstraints` | Topology spread constraint for pod assignment | `[]` | | `router.resources` | Define resources requests and limits for single Pods | `{}` | ### Workers parameters @@ -132,5 +131,5 @@ By default local dir are not persisted. You can enable persistance on router and | `workers.persistance.accessModes` | Persistent Volume access modes | [`ReadWriteOnce`] | | `workers.persistance.annotations` | Additional custom annotations for the PVC | `{}` | | `workers.affinity` | Affinity for pod assignment | `{}` | -| `workers.spreadConstraints` | Topology spread constraint for pod assignment | `{}` | +| `workers.spreadConstraints` | Topology spread constraint for pod assignment | `[]` | | `workers.resources` | Define resources requests and limits for single Pods | `{}` | diff --git a/examples/helm-charts/cubestore/templates/router/statefulset.yaml b/examples/helm-charts/cubestore/templates/router/statefulset.yaml index b7f146a7fc05..21bc0570a21a 100644 --- a/examples/helm-charts/cubestore/templates/router/statefulset.yaml +++ b/examples/helm-charts/cubestore/templates/router/statefulset.yaml @@ -37,6 +37,9 @@ spec: - name: mysql containerPort: {{ .Values.router.mysqlPort }} protocol: TCP + - name: status + containerPort: {{ .Values.router.statusPort }} + protocol: TCP env: {{- include "cubestore.common-env" . | nindent 12 }} {{- $fullName := include "cubestore.fullname" . }} @@ -44,8 +47,14 @@ spec: {{- $workerPort := .Values.workers.port | int }} - name: CUBESTORE_SERVER_NAME value: {{ printf "%s-router:%d" (include "cubestore.fullname" .) (.Values.router.metaPort | int) }} + - name: CUBESTORE_PORT + value: {{ .Values.router.mysqlPort | quote }} + - name: CUBESTORE_HTTP_PORT + value: {{ .Values.router.httpPort | quote }} - name: CUBESTORE_META_PORT value: {{ .Values.router.metaPort | quote }} + - name: CUBESTORE_STATUS_PORT + value: {{ .Values.router.statusPort | quote }} {{ if gt (.Values.workers.workersCount | int) 0 }} {{- $workers := list }} {{- range $e, $i := until ($.Values.workers.workersCount | int) }} @@ -60,6 +69,14 @@ spec: - name: CUBESTORE_REMOTE_DIR value: /cube/data {{- end}} + livenessProbe: + httpGet: + path: /readyz + port: status + readinessProbe: + httpGet: + path: /livez + port: status {{- if .Values.router.resources }} resources: {{- toYaml .Values.router.resources | nindent 12 }} diff --git a/examples/helm-charts/cubestore/values.yaml b/examples/helm-charts/cubestore/values.yaml index 0fc709380e00..953b1a07ac06 100644 --- a/examples/helm-charts/cubestore/values.yaml +++ b/examples/helm-charts/cubestore/values.yaml @@ -127,6 +127,10 @@ router: ## mysqlPort: 3306 + ## The port for Cube Store to expose status probes + ## + statusPort: 3031 + persistence: ## Enable persistence for local data using Persistent Volume Claims ## @@ -153,7 +157,7 @@ router: ## Topology spread constraint for pod assignment ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ ## - spreadConstraints: {} + spreadConstraints: [] ## Define resources requests and limits for single Pods. ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ @@ -195,7 +199,7 @@ workers: ## topology spread constraint for pod assignment ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ ## - spreadConstraints: {} + spreadConstraints: [] ## Define resources requests and limits for single Pods. ## ref: https://kubernetes.io/docs/user-guide/compute-resources/