Integrate BanyanDB as storage solution #126
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ | |
| apiVersion: v2 | ||
| name: skywalking-helm-swck-adapter | ||
| home: https://github.com/apache/skywalking-swck/tree/master/adapter | ||
| version: 0.8.0 | ||
| description: Provide custom metrics coming from SkyWalking OAP cluster for autoscaling by Kubernetes HPA | ||
| icon: https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg | ||
| sources: | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,7 +45,7 @@ The following table lists the configurable parameters of the adapter chart and t | |
| | `.serviceAccountName` | The service account name of adapter | `skywalking-custom-metrics-apiserver` | | ||
| | `.image.repository` | Adapter container image name | `docker.io/apache/skywalking-swck` | | ||
| | `.image.pullPolicy` | Adapter container image pull policy | `IfNotPresent` | | ||
| | `.image.tag` | Adapter container image tag | `v0.8.0` | | ||
| | `.service.port` | The port for the adapter service | `6.1.0` | | ||
| | `.oap.service.name` | The service name of OAP | `skywalking-system-oap` | | ||
| | `.oap.service.namespace` | The service namespace of OAP | `skywalking-system` | | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,7 @@ serviceAccountName: skywalking-custom-metrics-apiserver | |
| image: | ||
| repository: docker.io/apache/skywalking-swck | ||
| pullPolicy: IfNotPresent | ||
| tag: "v0.8.0" | ||
| service: | ||
| port: 6443 | ||
| oap: | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ | |
| apiVersion: v2 | ||
| name: skywalking-helm-swck-operator | ||
| home: https://github.com/apache/skywalking-swck/tree/master/operator | ||
| version: 0.8.0 | ||
| description: Provision and maintain SkyWalking backend components | ||
| icon: https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg | ||
| sources: | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,7 +44,7 @@ The following table lists the configurable parameters of the operator chart and | |
| | `.serviceAccountName` | The service account name of operator | `skywalking-swck-controller-manager` | | ||
| | `.image.repository` | Operator container image name | `docker.io/apache/skywalking-swck` | | ||
| | `.image.pullPolicy` | Operator container image pull policy | `IfNotPresent` | | ||
| | `.image.tag` | Operator container image tag | `v0.8.0` | | ||
| | `.metrics.service.port` | The port for the operator metrics service | `8443` | | ||
| | `.webhook.service.port` | The port for the operator web hook service | `9443` | | ||
| | `.resources.limits.cpu` | The limits of cpu in the operator | `200m` | | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,7 @@ kind: CustomResourceDefinition | |
| metadata: | ||
| annotations: | ||
| cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . | trunc (int (sub 63 (len "-serving-cert"))) | printf "%s-serving-cert" }} | ||
| controller-gen.kubebuilder.io/version: v0.8.0 | ||
| name: fetchers.operator.skywalking.apache.org | ||
| spec: | ||
| conversion: | ||
|
|
@@ -131,7 +131,7 @@ kind: CustomResourceDefinition | |
| metadata: | ||
| annotations: | ||
| cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . | trunc (int (sub 63 (len "-serving-cert"))) | printf "%s-serving-cert" }} | ||
| controller-gen.kubebuilder.io/version: v0.8.0 | ||
| name: javaagents.operator.skywalking.apache.org | ||
| spec: | ||
| conversion: | ||
|
|
@@ -237,7 +237,7 @@ kind: CustomResourceDefinition | |
| metadata: | ||
| annotations: | ||
| cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . | trunc (int (sub 63 (len "-serving-cert"))) | printf "%s-serving-cert" }} | ||
| controller-gen.kubebuilder.io/version: v0.8.0 | ||
| name: oapserverconfigs.operator.skywalking.apache.org | ||
| spec: | ||
| conversion: | ||
|
|
@@ -453,7 +453,7 @@ apiVersion: apiextensions.k8s.io/v1 | |
| kind: CustomResourceDefinition | ||
| metadata: | ||
| annotations: | ||
| controller-gen.kubebuilder.io/version: v0.8.0 | ||
| creationTimestamp: null | ||
| name: oapserverdynamicconfigs.operator.skywalking.apache.org | ||
| spec: | ||
|
|
@@ -550,7 +550,7 @@ kind: CustomResourceDefinition | |
| metadata: | ||
| annotations: | ||
| cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . | trunc (int (sub 63 (len "-serving-cert"))) | printf "%s-serving-cert" }} | ||
| controller-gen.kubebuilder.io/version: v0.8.0 | ||
| name: oapservers.operator.skywalking.apache.org | ||
| spec: | ||
| conversion: | ||
|
|
@@ -1118,7 +1118,7 @@ kind: CustomResourceDefinition | |
| metadata: | ||
| annotations: | ||
| cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . | trunc (int (sub 63 (len "-serving-cert"))) | printf "%s-serving-cert" }} | ||
| controller-gen.kubebuilder.io/version: v0.8.0 | ||
| name: satellites.operator.skywalking.apache.org | ||
| spec: | ||
| conversion: | ||
|
|
@@ -1463,7 +1463,7 @@ kind: CustomResourceDefinition | |
| metadata: | ||
| annotations: | ||
| cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . | trunc (int (sub 63 (len "-serving-cert"))) | printf "%s-serving-cert" }} | ||
| controller-gen.kubebuilder.io/version: v0.8.0 | ||
| name: storages.operator.skywalking.apache.org | ||
| spec: | ||
| conversion: | ||
|
|
@@ -1721,7 +1721,7 @@ apiVersion: apiextensions.k8s.io/v1 | |
| kind: CustomResourceDefinition | ||
| metadata: | ||
| annotations: | ||
| controller-gen.kubebuilder.io/version: v0.8.0 | ||
| creationTimestamp: null | ||
| name: swagents.operator.skywalking.apache.org | ||
| spec: | ||
|
|
@@ -1981,7 +1981,7 @@ kind: CustomResourceDefinition | |
| metadata: | ||
| annotations: | ||
| cert-manager.io/inject-ca-from: {{ .Release.Namespace }}/{{ include "operator.fullname" . | trunc (int (sub 63 (len "-serving-cert"))) | printf "%s-serving-cert" }} | ||
| controller-gen.kubebuilder.io/version: v0.8.0 | ||
| name: uis.operator.skywalking.apache.org | ||
| spec: | ||
| conversion: | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,7 @@ serviceAccountName: skywalking-swck-controller-manager | |
| image: | ||
| repository: docker.io/apache/skywalking-swck | ||
| pullPolicy: IfNotPresent | ||
| tag: "v0.8.0" | ||
| securityContext: | ||
| allowPrivilegeEscalation: false | ||
| metrics: | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,3 +38,7 @@ dependencies: | |
| version: 12.1.2 | ||
| repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami | ||
| condition: postgresql.enabled | ||
| - name: skywalking-banyandb-helm | ||
| version: 0.0.0-67df1c7 | ||
| repository: oci://ghcr.io/apache/skywalking-banyandb-helm | ||
|
There was a problem hiding this comment. I don't think we could use this as the final release. We should request for docker hub repository, and do a release for banyandb helm. @hanahmily There was a problem hiding this comment. Because we deploy skywalking chart snapshot to ghcr so this makes sense in main branch but have to remember to change to a released one for banyandb chart before releasing. This also implies that a skywalking chart release depends on a banyandb release. There was a problem hiding this comment. Makes sense to me. We will release the banyandb helm once the cluster mode is supported later. @ButterBright please make a note of this. There was a problem hiding this comment.
For me, the concern is, that we don't release This PR is never urgent, so, if you feel the BanyanDB helm repo is ready to release, please go ahead to do so. I believe no matter banyandb helm repo is relying on BanyanDB server 0.5 release or not, it is close to be ready. There was a problem hiding this comment.
Okay. There was a problem hiding this comment.
Let's wait for banyandb's first official release then. There was a problem hiding this comment. Agreed. @ButterBright, could you please release the banyandb helm chart version 0.1.0? @kezhenxu94, would you kindly guide them through the process? There was a problem hiding this comment.
Reach out to me if there is any help I can offer, btw, it's too troublesome to ask a non-committer to release, even it's a committer who is releasing, one of the steps in release process still needs a PMC member to help, so basically there is few stuff can be done by @ButterBright to propose a release yet. There was a problem hiding this comment. We can't accept non committer to do a release. Because ASF requires apache ID and his/her sign based on that. There was a problem hiding this comment. I will take care of the release |
||
| condition: banyandb.enabled | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -115,6 +115,16 @@ Create the name of the service account to use for the satellite cluster | |
| echo "Waiting for postgresql..." | ||
| sleep 3 | ||
| done | ||
| {{- else if eq .Values.oap.storageType "banyandb" -}} | ||
| {{- $banyandbHost := "banyandb-http" -}} | ||
| {{- if not .Values.banyandb.enabled -}} | ||
| {{- $banyandbHost = .Values.banyandb.config.httpHost -}} | ||
| {{- end }} | ||
| - name: wait-for-banyandb | ||
| image: curlimages/curl | ||
| imagePullPolicy: IfNotPresent | ||
| command: ['sh', '-c', 'for i in $(seq 1 60); do curl {{ $banyandbHost }}:{{ .Values.banyandb.config.httpPort }}/api/healthz && exit 0 || sleep 5; done; exit 1'] | ||
|
|
||
|
|
||
| {{- end }} | ||
| {{- end -}} | ||
|
|
||
|
|
@@ -150,5 +160,14 @@ Create the name of the service account to use for the satellite cluster | |
| value: "{{ .Values.postgresql.auth.username }}" | ||
| - name: SW_DATA_SOURCE_PASSWORD | ||
| value: "{{ .Values.postgresql.auth.password }}" | ||
| {{- else if eq .Values.oap.storageType "banyandb" }} | ||
| {{- $banyandbHost := "banyandb-grpc" -}} | ||
| {{- if not .Values.banyandb.enabled -}} | ||
| {{- $banyandbHost = .Values.banyandb.config.grpcHost -}} | ||
| {{- end }} | ||
| - name: SW_STORAGE_BANYANDB_HOST | ||
| value: "{{ $banyandbHost }}" | ||
| - name: SW_STORAGE_BANYANDB_PORT | ||
| value: "{{ .Values.banyandb.config.grpcPort }}" | ||
| {{- end }} | ||
| {{- end -}} | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -444,6 +444,14 @@ postgresql: | |
| persistence: | ||
| enabled: false | ||
|
|
||
| banyandb: | ||
| enabled: false | ||
| config: | ||
| grpcHost: banyandb-grpc | ||
| httpHost: banyandb-http | ||
| grpcPort: 17912 | ||
| httpPort: 17913 | ||
|
|
||
| satellite: | ||
| name: satellite | ||
| replicas: 1 | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should run e2e in the parallel mode. You could ref the main repo skywalking.yml to use
matrixto definenameandconfig.