This is an automated email from the ASF dual-hosted git repository. hanahmily pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/skywalking-banyandb-helm.git
The following commit(s) were added to refs/heads/master by this push: new 5c073c1 Move image parameters to the root (#17) 5c073c1 is described below commit 5c073c19a9484f356c4e3d3d471a3f8442fb6e8d Author: Huang Youliang <butterbright0...@gmail.com> AuthorDate: Mon May 13 21:49:42 2024 +0800 Move image parameters to the root (#17) * Update image repository and tag of BanyanDB cluster * Move image parameters to the root * Update configuration in the document --- README.md | 22 +++++++--------------- chart/templates/deployment.yaml | 4 ++-- chart/templates/statefulset.yaml | 10 +++++----- chart/values.yaml | 13 +++++-------- test/e2e/values.cluster.yaml | 9 +++++---- test/e2e/values.standalone.yaml | 11 ++++++----- 6 files changed, 30 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index f10a917..138a4ec 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ The command removes all the banyandb components associated with the chart and de | cluster.data.grpcSvc.port | int | `17912` | | | cluster.data.name | string | `"banyandb"` | | | cluster.data.nodeSelector | list | `[]` | | -| cluster.data.podAnnotations.example | string | `"banyandb-foo"` | | +| cluster.data.podAnnotations | string | `nil` | | | cluster.data.podDisruptionBudget | object | `{}` | | | cluster.data.priorityClassName | string | `""` | | | cluster.data.replicas | int | `3` | | @@ -63,14 +63,9 @@ The command removes all the banyandb components associated with the chart and de | cluster.data.role | string | `"data"` | | | cluster.data.securityContext | object | `{}` | | | cluster.data.sidecar | list | `[]` | | -| cluster.data.tls.etcdSecretName | string | `""` | | -| cluster.data.tls.grpcSecretName | string | `""` | | | cluster.data.tolerations | list | `[]` | | | cluster.enabled | bool | `true` | | | cluster.etcdEndpoints | list | `[]` | | -| cluster.image.pullPolicy | string | `"IfNotPresent"` | | -| cluster.image.repository | string | `"docker.io/apache/skywalking-banyandb"` | | -| cluster.image.tag | string | `"0.6.0"` | | | cluster.liaison.affinity | object | `{}` | | | cluster.liaison.env | list | `[]` | | | cluster.liaison.grpcSvc.annotations | object | `{}` | | @@ -90,7 +85,7 @@ The command removes all the banyandb components associated with the chart and de | cluster.liaison.ingress.tls | list | `[]` | | | cluster.liaison.name | string | `"banyandb"` | | | cluster.liaison.nodeSelector | list | `[]` | | -| cluster.liaison.podAnnotations.example | string | `"banyandb-foo"` | | +| cluster.liaison.podAnnotations | string | `nil` | | | cluster.liaison.podDisruptionBudget | object | `{}` | | | cluster.liaison.priorityClassName | string | `""` | | | cluster.liaison.replicas | int | `2` | | @@ -98,9 +93,6 @@ The command removes all the banyandb components associated with the chart and de | cluster.liaison.resources.requests | list | `[]` | | | cluster.liaison.role | string | `"liaison"` | | | cluster.liaison.securityContext | object | `{}` | | -| cluster.liaison.tls.etcdSecretName | string | `""` | | -| cluster.liaison.tls.grpcSecretName | string | `""` | | -| cluster.liaison.tls.httpSecretName | string | `""` | | | cluster.liaison.tolerations | list | `[]` | | | etcd.auth.client.caFilename | string | `""` | | | etcd.auth.client.certFilename | string | `"tls.crt"` | | @@ -114,6 +106,9 @@ The command removes all the banyandb components associated with the chart and de | etcd.enabled | bool | `true` | | | etcd.replicaCount | int | `1` | | | fullnameOverride | string | `"banyandb"` | | +| image.pullPolicy | string | `"IfNotPresent"` | | +| image.repository | string | `"docker.io/apache/skywalking-banyandb"` | | +| image.tag | string | `"0.6.0"` | | | serviceAccount.annotations | object | `{}` | | | serviceAccount.create | bool | `true` | | | serviceAccount.name | string | `""` | | @@ -130,9 +125,6 @@ The command removes all the banyandb components associated with the chart and de | standalone.httpSvc.loadBalancerSourceRanges | list | `[]` | | | standalone.httpSvc.port | int | `17913` | | | standalone.httpSvc.type | string | `"LoadBalancer"` | | -| standalone.image.pullPolicy | string | `"IfNotPresent"` | | -| standalone.image.repository | string | `"docker.io/apache/skywalking-banyandb"` | | -| standalone.image.tag | string | `"0.6.0"` | | | standalone.ingress.annotations | object | `{}` | | | standalone.ingress.enabled | bool | `false` | | | standalone.ingress.labels | object | `{}` | | @@ -156,14 +148,14 @@ The command removes all the banyandb components associated with the chart and de | storage.persistentVolumeClaims[0].existingClaimName | string | `nil` | | | storage.persistentVolumeClaims[0].mountTargets[0] | string | `"measure"` | | | storage.persistentVolumeClaims[0].mountTargets[1] | string | `"stream"` | | -| storage.persistentVolumeClaims[0].size | string | `"200Gi"` | | +| storage.persistentVolumeClaims[0].size | string | `"50Gi"` | | | storage.persistentVolumeClaims[0].storageClass | string | `nil` | | | storage.persistentVolumeClaims[0].volumeMode | string | `"Filesystem"` | | | storage.persistentVolumeClaims[1].accessModes[0] | string | `"ReadWriteOnce"` | | | storage.persistentVolumeClaims[1].claimName | string | `"meta"` | | | storage.persistentVolumeClaims[1].existingClaimName | string | `nil` | | | storage.persistentVolumeClaims[1].mountTargets[0] | string | `"metadata"` | | -| storage.persistentVolumeClaims[1].size | string | `"10Gi"` | | +| storage.persistentVolumeClaims[1].size | string | `"5Gi"` | | | storage.persistentVolumeClaims[1].storageClass | string | `nil` | | | storage.persistentVolumeClaims[1].volumeMode | string | `"Filesystem"` | | diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index 51eca5d..56de208 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -54,8 +54,8 @@ spec: priorityClassName: {{ .Values.cluster.liaison.priorityClassName }} containers: - name: {{ .Values.cluster.liaison.name }} - image: {{ .Values.cluster.image.repository }}:{{ required "banyandb.image.tag is required" .Values.cluster.image.tag }} - imagePullPolicy: {{ .Values.cluster.image.pullPolicy }} + image: {{ .Values.image.repository }}:{{ required "banyandb.image.tag is required" .Values.image.tag }} + imagePullPolicy: {{ .Values.image.pullPolicy }} env: {{- range $env := .Values.cluster.liaison.env }} - name: {{ $env.name }} diff --git a/chart/templates/statefulset.yaml b/chart/templates/statefulset.yaml index 5e66df0..78afc70 100644 --- a/chart/templates/statefulset.yaml +++ b/chart/templates/statefulset.yaml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -{{- if and .Values.standalone.enabled }} +{{- if .Values.standalone.enabled }} apiVersion: apps/v1 kind: StatefulSet metadata: @@ -53,8 +53,8 @@ spec: priorityClassName: {{ .Values.standalone.priorityClassName }} containers: - name: {{ .Values.standalone.name }} - image: {{ .Values.standalone.image.repository }}:{{ required "banyandb.image.tag is required" .Values.standalone.image.tag }} - imagePullPolicy: {{ .Values.standalone.image.pullPolicy }} + image: {{ .Values.image.repository }}:{{ required "banyandb.image.tag is required" .Values.image.tag }} + imagePullPolicy: {{ .Values.image.pullPolicy }} env: {{- range $env := .Values.standalone.env }} - name: {{ $env.name }} @@ -292,8 +292,8 @@ spec: priorityClassName: {{ .Values.cluster.data.priorityClassName }} containers: - name: {{ .Values.cluster.data.name }} - image: {{ .Values.cluster.image.repository }}:{{ required "banyandb.image.tag is required" .Values.cluster.image.tag }} - imagePullPolicy: {{ .Values.cluster.image.pullPolicy }} + image: {{ .Values.image.repository }}:{{ required "banyandb.image.tag is required" .Values.image.tag }} + imagePullPolicy: {{ .Values.image.pullPolicy }} env: {{- range $env := .Values.cluster.data.env }} - name: {{ $env.name }} diff --git a/chart/values.yaml b/chart/values.yaml index 23b9e01..fca29b6 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -17,6 +17,11 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. +image: + repository: docker.io/apache/skywalking-banyandb + tag: 0.6.0 + pullPolicy: IfNotPresent + standalone: enabled: false name: banyandb @@ -26,10 +31,6 @@ standalone: # runAsUser: 1000 # runAsGroup: 1000 # fsGroup: 1000 - image: - repository: docker.io/apache/skywalking-banyandb - tag: 0.6.0 - pullPolicy: IfNotPresent env: [] # - name: BANYANDB_FOO # value: "bar" @@ -124,10 +125,6 @@ standalone: cluster: enabled: true - image: - repository: ghcr.io/apache/skywalking-banyandb - tag: dc88130e8d0516c7989734bdeb505e2d92c1ab71 - pullPolicy: IfNotPresent etcdEndpoints: [] liaison: name: banyandb diff --git a/test/e2e/values.cluster.yaml b/test/e2e/values.cluster.yaml index cc3a00b..3870843 100644 --- a/test/e2e/values.cluster.yaml +++ b/test/e2e/values.cluster.yaml @@ -17,12 +17,13 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. +image: + repository: docker.io/apache/skywalking-banyandb + tag: 0.6.0 + pullPolicy: IfNotPresent + cluster: enabled: true - image: - repository: docker.io/apache/skywalking-banyandb - tag: 0.6.0 - pullPolicy: IfNotPresent etcdEndpoints: [] liaison: name: banyandb diff --git a/test/e2e/values.standalone.yaml b/test/e2e/values.standalone.yaml index e757c65..4b8988d 100644 --- a/test/e2e/values.standalone.yaml +++ b/test/e2e/values.standalone.yaml @@ -23,6 +23,11 @@ cluster: etcd: enabled: false +image: + repository: docker.io/apache/skywalking-banyandb + tag: 0.6.0 + pullPolicy: IfNotPresent + standalone: enabled: true name: banyandb @@ -32,10 +37,6 @@ standalone: # runAsUser: 1000 # runAsGroup: 1000 # fsGroup: 1000 - image: - repository: docker.io/apache/skywalking-banyandb - tag: 0.6.0 - pullPolicy: IfNotPresent env: [] # - name: BANYANDB_FOO # value: "bar" @@ -150,4 +151,4 @@ serviceAccount: # If not set and create is true, a name is generated using the fullname template name: "" -fullnameOverride: "banyandb" \ No newline at end of file +fullnameOverride: "banyandb"