From 79158ad4bd145d2fee21dc0c5c5f97e2846456c7 Mon Sep 17 00:00:00 2001 From: liyang Date: Fri, 29 Dec 2023 17:36:38 +0800 Subject: [PATCH] chore: update version (#94) * chore: update version * chore: rename storage to objectStorage * chore: objectstorage secret --- README.md | 29 +++++----- charts/greptimedb-cluster/Chart.yaml | 4 +- charts/greptimedb-cluster/README.md | 38 +++++++------ charts/greptimedb-cluster/README.md.gotmpl | 19 ++++--- .../greptimedb-cluster/templates/cluster.yaml | 32 +++++------ .../greptimedb-cluster/templates/secret.yaml | 13 +++++ .../templates/storage-credentials-secret.yaml | 13 ----- charts/greptimedb-cluster/values.yaml | 54 +++++++++--------- charts/greptimedb-operator/Chart.yaml | 4 +- charts/greptimedb-operator/README.md | 8 +-- charts/greptimedb-operator/README.md.gotmpl | 4 +- .../crds/greptimedbcluster.yaml | 56 ++++++++----------- charts/greptimedb-operator/values.yaml | 2 +- charts/greptimedb-standalone/Chart.yaml | 4 +- charts/greptimedb-standalone/README.md | 16 +++++- charts/greptimedb-standalone/README.md.gotmpl | 12 +++- charts/greptimedb-standalone/values.yaml | 2 +- 17 files changed, 159 insertions(+), 151 deletions(-) create mode 100644 charts/greptimedb-cluster/templates/secret.yaml delete mode 100644 charts/greptimedb-cluster/templates/storage-credentials-secret.yaml diff --git a/README.md b/README.md index 944974e..2ddc9f3 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ If you want to deploy the GreptimeDB cluster, you can use the following command( We recommend using the Bitnami etcd [chart](https://github.com/bitnami/charts/blob/main/bitnami/etcd/README.md) to deploy the etcd cluster: ```console - helm install etcd oci://registry-1.docker.io/bitnamicharts/etcd \ + helm upgrade --install etcd oci://registry-1.docker.io/bitnamicharts/etcd \ --set replicaCount=3 \ --set auth.rbac.create=false \ --set auth.rbac.token.enabled=false \ @@ -44,7 +44,7 @@ If you want to deploy the GreptimeDB cluster, you can use the following command( 2. **Deploy GreptimeDB operator** ```console - helm install greptimedb-operator greptime/greptimedb-operator -n default + helm upgrade --install greptimedb-operator greptime/greptimedb-operator -n default ``` 3. **Deploy GreptimeDB cluster** @@ -54,7 +54,7 @@ If you want to deploy the GreptimeDB cluster, you can use the following command( The default installation will use the local storage: ```console - helm install mycluster greptime/greptimedb-cluster -n default + helm upgrade --install mycluster greptime/greptimedb-cluster -n default ``` - **Use AWS S3 as backend storage** @@ -62,23 +62,24 @@ If you want to deploy the GreptimeDB cluster, you can use the following command( Before installation, you must create the AWS S3 bucket, and the cluster will use the bucket as backend storage: ```console - helm install mycluster greptime/greptimedb-cluster -n default \ - --set storage.s3.bucket="your-bucket" \ - --set storage.s3.region="region-of-bucket" \ - --set storage.s3.root="root-directory-of-data" \ - --set storage.credentials.secretName="s3-credentials" \ - --set storage.credentials.accessKeyId="your-access-key-id" \ - --set storage.credentials.secretAccessKey="your-secret-access-key" + helm upgrade --install mycluster greptime/greptimedb-cluster -n default \ + --set objectStorage.s3.bucket="your-bucket" \ + --set objectStorage.s3.region="region-of-bucket" \ + --set objectStorage.s3.root="root-directory-of-data" \ + --set objectStorage.credentials.secretName="s3-credentials" \ + --set objectStorage.credentials.accessKeyId="your-access-key-id" \ + --set objectStorage.credentials.secretAccessKey="your-secret-access-key" \ + -n default ``` 4. **Use `kubectl port-forward` to access the GreptimeDB cluster** ```console # You can use the MySQL client to connect the cluster, for example: 'mysql -h 127.0.0.1 -P 4002'. - kubectl port-forward svc/mycluster-frontend 4002:4002 > connections.out & + kubectl port-forward -n default svc/mycluster-frontend 4002:4002 > connections.out & # You can use the PostgreSQL client to connect the cluster, for example: 'psql -h 127.0.0.1 -p 4003 -d public'. - kubectl port-forward svc/mycluster-frontend 4003:4003 > connections.out & + kubectl port-forward -n default svc/mycluster-frontend 4003:4003 > connections.out & ``` You also can read and write data by [Cluster](https://docs.greptime.com/user-guide/cluster). @@ -88,13 +89,13 @@ If you want to deploy the GreptimeDB cluster, you can use the following command( If you want to re-deploy the service because the configurations changed, you can: ```console -helm upgrade --values -n +helm upgrade --install --values -n ``` For example: ```console -helm upgrade mycluster greptime/greptimedb --values ./values.yaml +helm upgrade --install mycluster greptime/greptimedb --values ./values.yaml ``` ### Uninstallation diff --git a/charts/greptimedb-cluster/Chart.yaml b/charts/greptimedb-cluster/Chart.yaml index 3af9cbe..a59a6b8 100644 --- a/charts/greptimedb-cluster/Chart.yaml +++ b/charts/greptimedb-cluster/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: greptimedb-cluster description: A Helm chart for deploying GreptimeDB cluster in Kubernetes type: application -version: 0.1.8 -appVersion: 0.4.4 +version: 0.1.9 +appVersion: 0.5.0 diff --git a/charts/greptimedb-cluster/README.md b/charts/greptimedb-cluster/README.md index ea7d24d..cc55c15 100644 --- a/charts/greptimedb-cluster/README.md +++ b/charts/greptimedb-cluster/README.md @@ -2,7 +2,7 @@ A Helm chart for deploying GreptimeDB cluster in Kubernetes -![Version: 0.1.8](https://img.shields.io/badge/Version-0.1.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.4](https://img.shields.io/badge/AppVersion-0.4.4-informational?style=flat-square) +![Version: 0.1.9](https://img.shields.io/badge/Version-0.1.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square) ## Source Code @@ -17,7 +17,7 @@ A Helm chart for deploying GreptimeDB cluster in Kubernetes 2. Install the etcd cluster: ```console - helm install etcd oci://registry-1.docker.io/bitnamicharts/etcd \ + helm upgrade --install etcd oci://registry-1.docker.io/bitnamicharts/etcd \ --set replicaCount=3 \ --set auth.rbac.create=false \ --set auth.rbac.token.enabled=false \ @@ -29,7 +29,7 @@ A Helm chart for deploying GreptimeDB cluster in Kubernetes The default installation will use the local storage: ```console -helm install mycluster greptime/greptimedb-cluster -n default +helm upgrade --install mycluster greptime/greptimedb-cluster -n default ``` ### Use AWS S3 as backend storage @@ -37,13 +37,14 @@ helm install mycluster greptime/greptimedb-cluster -n default Before installation, you must create the AWS S3 bucket, and the cluster will use the bucket as backend storage: ```console -helm install mycluster greptime/greptimedb-cluster \ - --set storage.s3.bucket="your-bucket" \ - --set storage.s3.region="region-of-bucket" \ - --set storage.s3.root="root-directory-of-data" \ - --set storage.credentials.secretName="s3-credentials" \ - --set storage.credentials.accessKeyId="your-access-key-id" \ - --set storage.credentials.secretAccessKey="your-secret-access-key" +helm upgrade --install mycluster greptime/greptimedb-cluster \ + --set objectStorage.s3.bucket="your-bucket" \ + --set objectStorage.s3.region="region-of-bucket" \ + --set objectStorage.s3.root="root-directory-of-data" \ + --set objectStorage.credentials.secretName="s3-credentials" \ + --set objectStorage.credentials.accessKeyId="your-access-key-id" \ + --set objectStorage.credentials.secretAccessKey="your-secret-access-key" \ + -n default ``` If you set `storage.s3.root` as `mycluser`, then the data layout will be: @@ -65,7 +66,7 @@ helm uninstall mycluster -n default | Key | Type | Default | Description | |-----|------|---------|-------------| | datanode.config | string | `""` | Extra datanode config in toml format. | -| datanode.podTemplate | object | `{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","resources":{"limits":{},"requests":{}}},"nodeSelector":{},"serviceaccount":{"annotations":{},"create":false,"name":"datanode-sa"},"tolerations":[]}` | The pod template for datanode | +| datanode.podTemplate | object | `{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","resources":{"limits":{},"requests":{}}},"nodeSelector":{},"serviceaccount":{"annotations":{},"create":false},"tolerations":[]}` | The pod template for datanode | | datanode.podTemplate.affinity | object | `{}` | The pod affinity | | datanode.podTemplate.annotations | object | `{}` | The annotations to be created to the pod. | | datanode.podTemplate.labels | object | `{}` | The labels to be created to the pod. | @@ -79,13 +80,13 @@ helm uninstall mycluster -n default | datanode.podTemplate.nodeSelector | object | `{}` | The pod node selector | | datanode.podTemplate.serviceaccount.annotations | object | `{}` | The annotations for datanode serviceaccount | | datanode.podTemplate.serviceaccount.create | bool | `false` | Create a service account | -| datanode.podTemplate.serviceaccount.name | string | `"datanode-sa"` | The serviceaccount name | | datanode.podTemplate.tolerations | list | `[]` | The pod tolerations | | datanode.replicas | int | `3` | Datanode replicas | +| datanode.storage.dataHome | string | `"/data/greptimedb"` | The dataHome directory, default is "/data/greptimedb/" | | datanode.storage.storageClassName | string | `nil` | Storage class for datanode persistent volume | | datanode.storage.storageRetainPolicy | string | `"Retain"` | Storage retain policy for datanode persistent volume | | datanode.storage.storageSize | string | `"10Gi"` | Storage size for datanode persistent volume | -| datanode.storage.walDir | string | `"/tmp/greptimedb/wal"` | The wal directory of the storage, default is "/tmp/greptimedb/wal" | +| datanode.storage.walDir | string | `"/data/greptimedb/wal"` | The wal directory of the storage, default is "/data/greptimedb/wal" | | frontend.config | string | `""` | Extra frontend config in toml format. | | frontend.podTemplate | object | `{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","resources":{"limits":{},"requests":{}}},"nodeSelector":{},"serviceAccountName":"","tolerations":[]}` | The pod template for frontend | | frontend.podTemplate.affinity | object | `{}` | The pod affinity | @@ -109,10 +110,10 @@ helm uninstall mycluster -n default | image.pullSecrets | list | `[]` | The image pull secrets | | image.registry | string | `"docker.io"` | The image registry | | image.repository | string | `"greptime/greptimedb"` | The image repository | -| image.tag | string | `"v0.4.4"` | The image tag | +| image.tag | string | `"v0.5.0"` | The image tag | | initializer.registry | string | `"docker.io"` | Initializer image registry | | initializer.repository | string | `"greptime/greptimedb-initializer"` | Initializer image repository | -| initializer.tag | string | `"0.1.0-alpha.17"` | Initializer image tag | +| initializer.tag | string | `"0.1.0-alpha.19"` | Initializer image tag | | meta.config | string | `""` | Extra Meta config in toml format. | | meta.etcdEndpoints | string | `"etcd.default.svc.cluster.local:2379"` | Meta etcd endpoints | | meta.podTemplate | object | `{"affinity":{},"annotations":{},"labels":{},"main":{"args":[],"command":[],"env":[],"image":"","resources":{"limits":{},"requests":{}}},"nodeSelector":{},"serviceAccountName":"","tolerations":[]}` | The pod template for meta | @@ -131,9 +132,12 @@ helm uninstall mycluster -n default | meta.podTemplate.tolerations | list | `[]` | The pod tolerations | | meta.replicas | int | `1` | Meta replicas | | mysqlServicePort | int | `4002` | GreptimeDB mysql service port | +| objectStorage | object | `{"oss":{},"s3":{}}` | Configure to object storage | | openTSDBServicePort | int | `4242` | GreptimeDB opentsdb service port | | postgresServicePort | int | `4003` | GreptimeDB postgres service port | -| prometheusMonitor | object | `{}` | Configure to prometheus podmonitor | +| prometheusMonitor | object | `{"enabled":false,"interval":"30s","labels":{"release":"prometheus"}}` | Configure to prometheus PodMonitor | +| prometheusMonitor.enabled | bool | `false` | Create PodMonitor resource for scraping metrics using PrometheusOperator | +| prometheusMonitor.interval | string | `"30s"` | Interval at which metrics should be scraped | +| prometheusMonitor.labels | object | `{"release":"prometheus"}` | Add labels to the PodMonitor | | resources.limits | object | `{"cpu":"500m","memory":"512Mi"}` | The resources limits for the container | | resources.requests | object | `{"cpu":"500m","memory":"512Mi"}` | The requested resources for the container | -| storage | object | `{"local":{},"oss":{},"s3":{}}` | Configure to storage | diff --git a/charts/greptimedb-cluster/README.md.gotmpl b/charts/greptimedb-cluster/README.md.gotmpl index 7ddd645..22b4528 100644 --- a/charts/greptimedb-cluster/README.md.gotmpl +++ b/charts/greptimedb-cluster/README.md.gotmpl @@ -16,7 +16,7 @@ 2. Install the etcd cluster: ```console - helm install etcd oci://registry-1.docker.io/bitnamicharts/etcd \ + helm upgrade --install etcd oci://registry-1.docker.io/bitnamicharts/etcd \ --set replicaCount=3 \ --set auth.rbac.create=false \ --set auth.rbac.token.enabled=false \ @@ -29,7 +29,7 @@ The default installation will use the local storage: ```console -helm install mycluster greptime/greptimedb-cluster -n default +helm upgrade --install mycluster greptime/greptimedb-cluster -n default ``` ### Use AWS S3 as backend storage @@ -37,13 +37,14 @@ helm install mycluster greptime/greptimedb-cluster -n default Before installation, you must create the AWS S3 bucket, and the cluster will use the bucket as backend storage: ```console -helm install mycluster greptime/greptimedb-cluster \ - --set storage.s3.bucket="your-bucket" \ - --set storage.s3.region="region-of-bucket" \ - --set storage.s3.root="root-directory-of-data" \ - --set storage.credentials.secretName="s3-credentials" \ - --set storage.credentials.accessKeyId="your-access-key-id" \ - --set storage.credentials.secretAccessKey="your-secret-access-key" +helm upgrade --install mycluster greptime/greptimedb-cluster \ + --set objectStorage.s3.bucket="your-bucket" \ + --set objectStorage.s3.region="region-of-bucket" \ + --set objectStorage.s3.root="root-directory-of-data" \ + --set objectStorage.credentials.secretName="s3-credentials" \ + --set objectStorage.credentials.accessKeyId="your-access-key-id" \ + --set objectStorage.credentials.secretAccessKey="your-secret-access-key" \ + -n default ``` If you set `storage.s3.root` as `mycluser`, then the data layout will be: diff --git a/charts/greptimedb-cluster/templates/cluster.yaml b/charts/greptimedb-cluster/templates/cluster.yaml index 1e7273e..6a6ee3e 100644 --- a/charts/greptimedb-cluster/templates/cluster.yaml +++ b/charts/greptimedb-cluster/templates/cluster.yaml @@ -154,9 +154,8 @@ spec: storageClassName: {{ .Values.datanode.storage.storageClassName }} storageSize: {{ .Values.datanode.storage.storageSize }} storageRetainPolicy: {{ .Values.datanode.storage.storageRetainPolicy }} - {{- if .Values.datanode.storage.walDir }} + dataHome: {{ .Values.datanode.storage.dataHome }} walDir: {{ .Values.datanode.storage.walDir }} - {{- end }} {{- if (and .Values.prometheusMonitor (eq .Values.prometheusMonitor.enabled true ))}} prometheusMonitor: {{- toYaml .Values.prometheusMonitor | nindent 4 }} {{- end }} @@ -167,24 +166,21 @@ spec: openTSDBServicePort: {{ .Values.openTSDBServicePort }} initializer: image: '{{ .Values.initializer.registry }}/{{ .Values.initializer.repository }}:{{ .Values.initializer.tag }}' - storage: - {{- if .Values.storage.s3 }} + objectStorage: + {{- if .Values.objectStorage.s3 }} s3: - bucket: {{ .Values.storage.s3.bucket }} - region: {{ .Values.storage.s3.region }} - root: {{ .Values.storage.s3.root }} - secretName: {{ .Values.storage.credentials.secretName }} - endpoint: {{ .Values.storage.s3.endpoint }} - {{- else if .Values.storage.local }} - local: - directory: {{ .Values.storage.local.directory }} - {{- else if .Values.storage.oss }} + bucket: {{ .Values.objectStorage.s3.bucket }} + region: {{ .Values.objectStorage.s3.region }} + root: {{ .Values.objectStorage.s3.root }} + secretName: {{ .Values.objectStorage.credentials.secretName }} + endpoint: {{ .Values.objectStorage.s3.endpoint }} + {{- else if .Values.objectStorage.oss }} oss: - bucket: {{ .Values.storage.oss.bucket }} - region: {{ .Values.storage.oss.region }} - root: {{ .Values.storage.oss.root }} - secretName: {{ .Values.storage.credentials.secretName }} - endpoint: {{ .Values.storage.oss.endpoint }} + bucket: {{ .Values.objectStorage.oss.bucket }} + region: {{ .Values.objectStorage.oss.region }} + root: {{ .Values.objectStorage.oss.root }} + secretName: {{ .Values.objectStorage.credentials.secretName }} + endpoint: {{ .Values.objectStorage.oss.endpoint }} {{- else }} {} {{- end }} diff --git a/charts/greptimedb-cluster/templates/secret.yaml b/charts/greptimedb-cluster/templates/secret.yaml new file mode 100644 index 0000000..85518a8 --- /dev/null +++ b/charts/greptimedb-cluster/templates/secret.yaml @@ -0,0 +1,13 @@ +{{- if .Values.objectStorage }} +{{- if .Values.objectStorage.credentials }} +apiVersion: v1 +metadata: + name: {{ .Values.objectStorage.credentials.secretName }} + namespace: {{ .Release.Namespace }} +kind: Secret +type: Opaque +stringData: + access-key-id: {{ .Values.objectStorage.credentials.accessKeyId }} + secret-access-key: {{ .Values.objectStorage.credentials.secretAccessKey }} +{{- end }} +{{- end }} diff --git a/charts/greptimedb-cluster/templates/storage-credentials-secret.yaml b/charts/greptimedb-cluster/templates/storage-credentials-secret.yaml deleted file mode 100644 index 70744ff..0000000 --- a/charts/greptimedb-cluster/templates/storage-credentials-secret.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{- if .Values.storage }} -{{- if .Values.storage.credentials }} -apiVersion: v1 -metadata: - name: {{ .Values.storage.credentials.secretName }} - namespace: {{ .Release.Namespace }} -kind: Secret -type: Opaque -stringData: - access-key-id: {{ .Values.storage.credentials.accessKeyId }} - secret-access-key: {{ .Values.storage.credentials.secretAccessKey }} -{{- end }} -{{- end }} diff --git a/charts/greptimedb-cluster/values.yaml b/charts/greptimedb-cluster/values.yaml index b67db55..24515ff 100644 --- a/charts/greptimedb-cluster/values.yaml +++ b/charts/greptimedb-cluster/values.yaml @@ -4,10 +4,18 @@ image: # -- The image repository repository: greptime/greptimedb # -- The image tag - tag: "v0.4.4" + tag: "v0.5.0" # -- The image pull secrets pullSecrets: [] +initializer: + # -- Initializer image registry + registry: docker.io + # -- Initializer image repository + repository: greptime/greptimedb-initializer + # -- Initializer image tag + tag: 0.1.0-alpha.19 + resources: # -- The requested resources for the container requests: @@ -169,8 +177,6 @@ datanode: serviceaccount: # -- Create a service account create: false - # -- The serviceaccount name - name: datanode-sa # -- The annotations for datanode serviceaccount annotations: {} @@ -181,16 +187,10 @@ datanode: storageSize: 10Gi # -- Storage retain policy for datanode persistent volume storageRetainPolicy: Retain - # -- The wal directory of the storage, default is "/tmp/greptimedb/wal" - walDir: "/tmp/greptimedb/wal" - -initializer: - # -- Initializer image registry - registry: docker.io - # -- Initializer image repository - repository: greptime/greptimedb-initializer - # -- Initializer image tag - tag: 0.1.0-alpha.17 + # -- The dataHome directory, default is "/data/greptimedb/" + dataHome: "/data/greptimedb" + # -- The wal directory of the storage, default is "/data/greptimedb/wal" + walDir: "/data/greptimedb/wal" # -- GreptimeDB http service port httpServicePort: 4000 @@ -207,27 +207,23 @@ postgresServicePort: 4003 # -- GreptimeDB opentsdb service port openTSDBServicePort: 4242 -# -- Configure to prometheus podmonitor -prometheusMonitor: {} -# enabled: false -# path: "/metrics" -# port: "http" -# interval: "30s" -# honorLabels: true -# labelsSelector: -# release: prometheus - -# -- Configure to storage -storage: +# -- Configure to prometheus PodMonitor +prometheusMonitor: + # -- Create PodMonitor resource for scraping metrics using PrometheusOperator + enabled: false + # -- Interval at which metrics should be scraped + interval: "30s" + # -- Add labels to the PodMonitor + labels: + release: prometheus + +# -- Configure to object storage +objectStorage: # credentials: # secretName: "credentials" # accessKeyId: "you-should-set-the-access-key-id-here" # secretAccessKey: "you-should-set-the-secret-access-key-here" - # configure to use local storage. - local: {} -# directory: /tmp/greptimedb - # configure to use s3 storage. s3: {} # bucket: "bucket-name" diff --git a/charts/greptimedb-operator/Chart.yaml b/charts/greptimedb-operator/Chart.yaml index 5f4065d..1ba82c6 100644 --- a/charts/greptimedb-operator/Chart.yaml +++ b/charts/greptimedb-operator/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 kubeVersion: ">=1.18.0-0" description: The greptimedb-operator Helm chart for Kubernetes name: greptimedb-operator -appVersion: 0.1.0-alpha.17 -version: 0.1.4 +appVersion: 0.1.0-alpha.19 +version: 0.1.5 type: application home: https://github.com/GreptimeTeam/greptimedb-operator sources: diff --git a/charts/greptimedb-operator/README.md b/charts/greptimedb-operator/README.md index bdf3d81..33338b6 100644 --- a/charts/greptimedb-operator/README.md +++ b/charts/greptimedb-operator/README.md @@ -2,7 +2,7 @@ The greptimedb-operator Helm chart for Kubernetes -![Version: 0.1.4](https://img.shields.io/badge/Version-0.1.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0-alpha.17](https://img.shields.io/badge/AppVersion-0.1.0--alpha.17-informational?style=flat-square) +![Version: 0.1.5](https://img.shields.io/badge/Version-0.1.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.1.0-alpha.19](https://img.shields.io/badge/AppVersion-0.1.0--alpha.19-informational?style=flat-square) ## Source Code - https://github.com/GreptimeTeam/greptimedb-operator @@ -20,10 +20,10 @@ helm repo update helm search repo greptime -l --devel # Deploy greptimedb-operator in default namespace. -helm install greptimedb-operator greptime/greptimedb-operator -n default +helm upgrade --install greptimedb-operator greptime/greptimedb-operator -n default # Specifiy the chart version. -helm install greptimedb-operator greptime/greptimedb-operator -n default --version +helm upgrade --install greptimedb-operator greptime/greptimedb-operator -n default --version ``` ## How to uninstall @@ -45,7 +45,7 @@ Kubernetes: `>=1.18.0-0` | image.pullSecrets | list | `[]` | The image pull secrets | | image.registry | string | `"docker.io"` | The image registry | | image.repository | string | `"greptime/greptimedb-operator"` | The image repository | -| image.tag | string | `"0.1.0-alpha.17"` | The image tag | +| image.tag | string | `"0.1.0-alpha.19"` | The image tag | | nameOverride | string | `""` | String to partially override release template name | | nodeSelector | object | `{}` | The operator node selector | | rbac.create | bool | `true` | Install role based access control | diff --git a/charts/greptimedb-operator/README.md.gotmpl b/charts/greptimedb-operator/README.md.gotmpl index 12f54fa..96c9e88 100644 --- a/charts/greptimedb-operator/README.md.gotmpl +++ b/charts/greptimedb-operator/README.md.gotmpl @@ -19,10 +19,10 @@ helm repo update helm search repo greptime -l --devel # Deploy greptimedb-operator in default namespace. -helm install greptimedb-operator greptime/greptimedb-operator -n default +helm upgrade --install greptimedb-operator greptime/greptimedb-operator -n default # Specifiy the chart version. -helm install greptimedb-operator greptime/greptimedb-operator -n default --version +helm upgrade --install greptimedb-operator greptime/greptimedb-operator -n default --version ``` ## How to uninstall diff --git a/charts/greptimedb-operator/crds/greptimedbcluster.yaml b/charts/greptimedb-operator/crds/greptimedbcluster.yaml index 485e009..4fa367a 100644 --- a/charts/greptimedb-operator/crds/greptimedbcluster.yaml +++ b/charts/greptimedb-operator/crds/greptimedbcluster.yaml @@ -2695,6 +2695,8 @@ spec: type: integer storage: properties: + dataHome: + type: string mountPath: type: string name: @@ -2702,7 +2704,6 @@ spec: storageClassName: type: string storageRetainPolicy: - default: Retain enum: - Retain - Delete @@ -10690,43 +10691,12 @@ spec: mysqlServicePort: format: int32 type: integer - openTSDBServicePort: - format: int32 - type: integer - postgresServicePort: - format: int32 - type: integer - prometheusMonitor: - properties: - enabled: - type: boolean - honorLabels: - type: boolean - interval: - type: string - labelsSelector: - additionalProperties: - type: string - type: object - path: - type: string - port: - type: string - type: object - prometheusServicePort: - format: int32 - type: integer - storage: + objectStorage: properties: cacheCapacity: type: string cachePath: type: string - local: - properties: - directory: - type: string - type: object oss: properties: bucket: @@ -10754,6 +10724,26 @@ spec: type: string type: object type: object + openTSDBServicePort: + format: int32 + type: integer + postgresServicePort: + format: int32 + type: integer + prometheusMonitor: + properties: + enabled: + type: boolean + interval: + type: string + labels: + additionalProperties: + type: string + type: object + type: object + prometheusServicePort: + format: int32 + type: integer version: type: string type: object diff --git a/charts/greptimedb-operator/values.yaml b/charts/greptimedb-operator/values.yaml index 01d8bfd..18a85b0 100644 --- a/charts/greptimedb-operator/values.yaml +++ b/charts/greptimedb-operator/values.yaml @@ -8,7 +8,7 @@ image: # -- The image pull policy for the controller imagePullPolicy: IfNotPresent # -- The image tag - tag: 0.1.0-alpha.17 + tag: 0.1.0-alpha.19 # -- The image pull secrets pullSecrets: [] diff --git a/charts/greptimedb-standalone/Chart.yaml b/charts/greptimedb-standalone/Chart.yaml index a9e90f0..4a07310 100644 --- a/charts/greptimedb-standalone/Chart.yaml +++ b/charts/greptimedb-standalone/Chart.yaml @@ -2,5 +2,5 @@ apiVersion: v2 name: greptimedb-standalone description: A Helm chart for deploying standalone greptimedb type: application -version: 0.1.6 -appVersion: 0.4.4 +version: 0.1.7 +appVersion: 0.5.0 diff --git a/charts/greptimedb-standalone/README.md b/charts/greptimedb-standalone/README.md index 35cdf32..2af36a1 100644 --- a/charts/greptimedb-standalone/README.md +++ b/charts/greptimedb-standalone/README.md @@ -2,7 +2,7 @@ A Helm chart for deploying standalone greptimedb -![Version: 0.1.6](https://img.shields.io/badge/Version-0.1.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.4.4](https://img.shields.io/badge/AppVersion-0.4.4-informational?style=flat-square) +![Version: 0.1.7](https://img.shields.io/badge/Version-0.1.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.5.0](https://img.shields.io/badge/AppVersion-0.5.0-informational?style=flat-square) ## Source Code - https://github.com/GreptimeTeam/greptimedb @@ -15,7 +15,17 @@ helm repo add greptime https://greptimeteam.github.io/helm-charts/ helm repo update # Install greptimedb standalone in default namespace. -helm install greptimedb-standalone greptime/greptimedb-standalone -n default +helm upgrade --install greptimedb-standalone greptime/greptimedb-standalone -n default +``` + +## Connection + +```console +# You can use the MySQL client to connect the greptimedb, for example: 'mysql -h 127.0.0.1 -P 4002'. +kubectl port-forward -n default svc/greptimedb-standalone 4002:4002 > connections.out & + +# You can use the PostgreSQL client to connect the greptimedb, for example: 'psql -h 127.0.0.1 -p 4003 -d public'. +kubectl port-forward -n default svc/greptimedb-standalone 4003:4003 > connections.out & ``` ## How to uninstall @@ -43,7 +53,7 @@ helm uninstall greptimedb-standalone -n default | image.pullSecrets | list | `[]` | The image pull secrets. | | image.registry | string | `"docker.io"` | The image registry | | image.repository | string | `"greptime/greptimedb"` | The image repository | -| image.tag | string | `"v0.4.4"` | The image tag | +| image.tag | string | `"v0.5.0"` | The image tag | | monitoring.annotations | object | `{}` | PodMonitor annotations | | monitoring.enabled | bool | `false` | Enable prometheus podmonitor | | monitoring.interval | string | `"30s"` | PodMonitor scrape interval | diff --git a/charts/greptimedb-standalone/README.md.gotmpl b/charts/greptimedb-standalone/README.md.gotmpl index 17b4f6f..7f972e7 100644 --- a/charts/greptimedb-standalone/README.md.gotmpl +++ b/charts/greptimedb-standalone/README.md.gotmpl @@ -14,7 +14,17 @@ helm repo add greptime https://greptimeteam.github.io/helm-charts/ helm repo update # Install greptimedb standalone in default namespace. -helm install greptimedb-standalone greptime/greptimedb-standalone -n default +helm upgrade --install greptimedb-standalone greptime/greptimedb-standalone -n default +``` + +## Connection + +```console +# You can use the MySQL client to connect the greptimedb, for example: 'mysql -h 127.0.0.1 -P 4002'. +kubectl port-forward -n default svc/greptimedb-standalone 4002:4002 > connections.out & + +# You can use the PostgreSQL client to connect the greptimedb, for example: 'psql -h 127.0.0.1 -p 4003 -d public'. +kubectl port-forward -n default svc/greptimedb-standalone 4003:4003 > connections.out & ``` ## How to uninstall diff --git a/charts/greptimedb-standalone/values.yaml b/charts/greptimedb-standalone/values.yaml index d449568..e4cf8d0 100644 --- a/charts/greptimedb-standalone/values.yaml +++ b/charts/greptimedb-standalone/values.yaml @@ -4,7 +4,7 @@ image: # -- The image repository repository: greptime/greptimedb # -- The image tag - tag: "v0.4.4" + tag: "v0.5.0" # -- The image pull policy for the controller pullPolicy: IfNotPresent # -- The image pull secrets.