Skip to content

Commit

Permalink
Adapt operator helm chart to v0.9.0 (#146)
Browse files Browse the repository at this point in the history
* Adapt the helm chart of operator to swck v0.9.0

* Add the swck e2e test.

---------

Signed-off-by: Ye Cao <caoye.cao@alibaba-inc.com>
  • Loading branch information
dashanji committed Apr 28, 2024
1 parent 917a6ff commit 1741f5a
Show file tree
Hide file tree
Showing 21 changed files with 2,551 additions and 461 deletions.
12 changes: 10 additions & 2 deletions .github/workflows/e2e.ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,16 @@ jobs:
config: test/e2e/e2e-banyandb-standalone.yaml
- name: Run Skywalking E2E Test (BanyanDB cluster as database)
config: test/e2e/e2e-banyandb-cluster.yaml
- name: Run SWCK E2E Test
config: test/e2e/swck/e2e.yaml
- name: Run SWCK oap-agent-adapter-hpa Test
config: test/e2e/swck/oap-agent-adapter-hpa.yaml
- name: Run SWCK oap-agent-banyandb Test
config: test/e2e/swck/oap-agent-banyandb.yaml
- name: Run SWCK oap-ui-agent-elasticsearch Test
config: test/e2e/swck/oap-ui-agent-elasticsearch.yaml
- name: Run SWCK oap-ui-agent-oapserverconfig Test
config: test/e2e/swck/oap-ui-agent-oapserverconfig.yaml
- name: Run SWCK oap-ui-agent-satellite Test
config: test/e2e/swck/oap-ui-agent-satellite.yaml
name: ${{ matrix.test.name }}
env:
OAP_TAG: 965dea898986ed2ab1343559fb20d6faed11ada9
Expand Down
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Release Notes.
------------------

- Integrate BanyanDB as storage solution
- Bump up swck to v0.8.0
- Bump up swck to v0.9.0

4.5.0
------------------
Expand Down
2 changes: 1 addition & 1 deletion chart/adapter/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
version: 0.9.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:
Expand Down
2 changes: 1 addition & 1 deletion chart/adapter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
| `.image.tag` | Adapter container image tag | `v0.9.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` |
Expand Down
1 change: 0 additions & 1 deletion chart/adapter/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ spec:
containers:
- args:
- --secure-port={{ .Values.service.port }}
- --logtostderr=true
- --v=10
- --oap-addr=http://{{ .Values.oap.service.name }}.{{ .Values.oap.service.namespace }}:{{ .Values.oap.service.port }}/graphql
- --cert-dir=/tmp
Expand Down
2 changes: 1 addition & 1 deletion chart/adapter/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ serviceAccountName: skywalking-custom-metrics-apiserver
image:
repository: docker.io/apache/skywalking-swck
pullPolicy: IfNotPresent
tag: "v0.8.0"
tag: "v0.9.0"
service:
port: 6443
oap:
Expand Down
2 changes: 1 addition & 1 deletion chart/operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
version: 0.9.0
description: Provision and maintain SkyWalking backend components
icon: https://raw.githubusercontent.com/apache/skywalking-kubernetes/master/logo/sw-logo-for-chart.jpg
sources:
Expand Down
2 changes: 1 addition & 1 deletion chart/operator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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` |
| `.image.tag` | Operator container image tag | `v0.9.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` |
Expand Down
Loading

0 comments on commit 1741f5a

Please sign in to comment.