diff --git a/.github/workflows/e2e.ci.yaml b/.github/workflows/e2e.ci.yaml index 4b81d0e..f4c8f53 100644 --- a/.github/workflows/e2e.ci.yaml +++ b/.github/workflows/e2e.ci.yaml @@ -55,7 +55,7 @@ jobs: steps: - uses: actions/checkout@v2 - name: Login to ghcr - uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 + uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0 with: registry: ghcr.io username: ${{ github.repository_owner }} diff --git a/.github/workflows/publish-helm.yaml b/.github/workflows/publish-helm.yaml index df2e051..f88f52e 100644 --- a/.github/workflows/publish-helm.yaml +++ b/.github/workflows/publish-helm.yaml @@ -45,7 +45,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Log in to the Container registry - uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 + uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0 with: registry: ${{ env.HUB }} username: ${{ github.actor }} diff --git a/chart/skywalking/README.md b/chart/skywalking/README.md index 89be301..fd05b8a 100644 --- a/chart/skywalking/README.md +++ b/chart/skywalking/README.md @@ -73,6 +73,7 @@ The following table lists the configurable parameters of the Skywalking chart an | `oap.readinessProbe` | Configuration fields for the [readinessProbe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) | `tcpSocket.port: 12800`
`initialDelaySeconds: 5`
`periodSeconds: 10` | `oap.env` | OAP environment variables | `[]` | | `oap.securityContext` | Allows you to set the [securityContext](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) for the pod | `fsGroup: 1000`
`runAsUser: 1000` | +| `oap.sidecars` | Extra sidecar containers to run in the OAP pod (appended to the pod's `containers` list, rendered through `tpl`) | `[]` | | `ui.enabled` | Deploy the Horizon UI. Set `false` to skip the UI Deployment, Service, Ingress, ConfigMap, and PVC entirely (useful when an external UI talks to OAP directly) | `true` | | `ui.name` | Web UI deployment name | `ui` | | `ui.replicas` | Web UI k8s deployment replicas. Keep at `1` unless your ingress provides sticky sessions — the Horizon BFF holds the session table in memory | `1` | diff --git a/chart/skywalking/templates/oap-deployment.yaml b/chart/skywalking/templates/oap-deployment.yaml index 8ab826d..4d26f7f 100644 --- a/chart/skywalking/templates/oap-deployment.yaml +++ b/chart/skywalking/templates/oap-deployment.yaml @@ -168,6 +168,9 @@ spec: volumeMounts: {{- include "skywalking.oap.volumeMounts" . | nindent 8 }} + {{- with .Values.oap.sidecars }} + {{- tpl (toYaml .) $ | nindent 6 }} + {{- end }} volumes: {{- include "skywalking.oap.volumes" . | nindent 6 }} diff --git a/chart/skywalking/values.yaml b/chart/skywalking/values.yaml index 5681cc2..ff37eb3 100644 --- a/chart/skywalking/values.yaml +++ b/chart/skywalking/values.yaml @@ -94,6 +94,15 @@ oap: # runAsUser: 1000 # runAsGroup: 1000 # fsGroup: 1000 + # Extra sidecar containers to run in the OAP pod. Each entry is a full + # container spec appended to the pod's `containers` list (e.g. a query proxy, + # log shipper). Rendered through `tpl`, so values may contain template + # expressions (evaluated against the release context). Empty by default. + sidecars: [] + # - name: query-proxy + # image: my/query-proxy:1.0.0 + # ports: + # - { name: http, containerPort: 8080 } env: # more env, please refer to https://hub.docker.com/r/apache/skywalking-oap-server # or https://github.com/apache/skywalking-docker/blob/master/6/6.4/oap/README.md#sw_telemetry