Merge pull request #117 from openinsight-proj/fix_redis_no_root_bug

use support arm image

Author: Frapschen

.github/actions/setup/action.yaml

@@ -31,4 +31,5 @@ runs:
           helm repo add bitnami https://charts.bitnami.com/bitnami 
           helm repo add redis https://ot-container-kit.github.io/helm-charts
           helm dep up charts/openinsight
-          helm dep up charts/opentelemetry-demo
+          helm dep up charts/opentelemetry-demo
+          helm dep up charts/opentelemetry-demo-lite

.github/workflows/demo-lite-lint-chart.yaml

@@ -1,4 +1,4 @@
-name: Lint Charts (Demo lite)
+name: Lint and Test Charts (Demo lite)
 
 on:
   pull_request:
@@ -20,5 +20,37 @@ jobs:
         with:
           create-kind-cluster: "false"
 
+      - name: Run chart-testing (list-changed)
+        id: list-changed
+        run: |
+          changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
+          if [[ -n "$changed" ]]; then
+            echo "changed=true" >> "$GITHUB_OUTPUT"
+          fi
+
       - name: Run chart-testing (lint)
-        run: ct lint --target-branch main --chart-dirs charts/opentelemetry-demo-lite
+        if: steps.list-changed.outputs.changed == 'true'
+        run: ct lint --target-branch ${{ github.event.repository.default_branch }}
+
+#  e2e-test:
+#    runs-on: ubuntu-latest
+#    needs: lint-test
+#    steps:
+#      - name: Checkout
+#        uses: actions/checkout@v3
+#        with:
+#          fetch-depth: 0
+#      - name: Setup
+#        uses: ./.github/actions/setup
+#        with:
+#          create-kind-cluster: "true"
+#      - name: Run chart-testing (install)
+#        run: |
+#          helm repo add prometheus-community https://prometheus-community.github.io/helm-charts
+#          helm repo update
+#          helm install prometheus-community/prometheus-operator-crds --generate-name \
+#          --kube-context kind-chart-testing
+#
+#          helm install charts/opentelemetry-demo-lite --generate-name \
+#          --kube-context kind-chart-testing \
+#          --debug --wait --skip-crds --timeout 30m

charts/opentelemetry-demo-lite/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: opentelemetry-demo
   repository: https://open-telemetry.github.io/opentelemetry-helm-charts
-  version: 0.21.1
-digest: sha256:b652a9a810b0d0fe25c31859479ce8d58ea77b5d3e4199f5261b9ba0201de15a
-generated: "2023-04-21T18:26:11.133267+08:00"
+  version: 0.22.0
+digest: sha256:67f10b8028406356fc10761a3e21df722dc8e646a7f14827f4661f4cdc6ba4e1
+generated: "2023-04-28T17:52:50.954009+08:00"

charts/opentelemetry-demo-lite/Chart.yaml

@@ -1,20 +1,20 @@
 apiVersion: v2
 name: opentelemetry-demo-lite
 type: application
-version: 1.0.7
+version: 1.1.0
 icon: https://opentelemetry.io/img/logos/opentelemetry-logo-nav.png
 description: A helm chart for openTelemetry community demo application integration with other component(lite version).
 sources:
   - https://github.com/openinsight-proj/openinsight-helm-charts
 maintainers:
   - name: JaredTan95
   - name: Frapschen
-appVersion: "v1.4.0-beta-daocloud"
+appVersion: "v1.4.0-daocloud"
 keywords:
   - opentelemetry
   - webstore-demo
 dependencies:
   - name: opentelemetry-demo
-    version: 0.21.1
+    version: 0.22.0
     repository: "https://open-telemetry.github.io/opentelemetry-helm-charts"
-    condition: opentelemetry-demo.enabled
+    condition: opentelemetry-demo.enabled

charts/opentelemetry-demo-lite/README.md

@@ -1,12 +1,11 @@
 # OpenTelemetry Demo Lite Helm Chart
 
-这个 Chart 是官方 [OpenTelemetry Demo](https://github.com/open-telemetry/opentelemetry-demo) 和
-[OpenTelemetry Demo Chart](https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-demo)
-的扩展。
+This chart is an extension of [OpenTelemetry Demo](https://github.com/open-telemetry/opentelemetry-demo) and
+[OpenTelemetry Demo Chart](https://github.com/open-telemetry/opentelemetry-helm-charts/tree/main/charts/opentelemetry-demo).
 
-## 架构
+## Architecture
 
-这个 Chart 在保证购物主流程正常的情况下缩减了其他服务。以下是 OpenTelemetry Demo Lite 的架构图:
+This chart only retains those core services to ensure the shopping flow. Below is the current service diagram:
 
 ```mermaid
 graph TD
@@ -77,68 +76,57 @@ classDef rust fill:#dea584,color:black;
 classDef typescript fill:#e98516,color:black;
 ```
 
-## 涉及的改动
+## Changelog
 
-我们对官方的 Demo 做了一定的改造，以下是具体的改造细节。
+We have made certain modifications to the official demo, and the following are the specific details of the modifications.
 
-### 重写的组件
+### Re-implement components
 
 #### [Adservice](https://github.com/openinsight-proj/opentelemetry-demo/tree/daocloud/src/adservice-v2#note-the-overall-helm-chart)
 
-这个组件在重写后增加了以下功能：
-- 服务接入 nacos
-- 服务接入 sentinel
-- 支持 grpcurl 请求
-- [暴露 Prometheus 指标](https://github.com/openinsight-proj/adservice#metrics)
-- [延时模拟](https://github.com/openinsight-proj/adservice#mock-latency)
-- [50% 的请求错误率](https://github.com/openinsight-proj/adservice#mock-error)
-- 从 Dataservice 获取 Ad 数据
+- integrate nacos
+- integrate sentinel
+- support grpcurl
+- [expose Prometheus metrics](https://github.com/openinsight-proj/adservice#metrics)
+- [mock latency](https://github.com/openinsight-proj/adservice#mock-latency)
+- [50% error rate](https://github.com/openinsight-proj/adservice#mock-error)
+- call Dataservice to get Ad data
 
-#### [checkoutservice](https://github.com/openinsight-proj/opentelemetry-demo/tree/daocloud/src/checkoutservice-v2#checkout-service)
+#### [Checkoutservice](https://github.com/openinsight-proj/opentelemetry-demo/tree/daocloud/src/checkoutservice-v2#checkout-service)
 
-具体的改动：
+- doesn't depend Emailservice
+- doesn't depend Currencyservice
+- doesn't depend Kafka
 
-- 不再调用 Emailservice
-- 不再调用 Currencyservice
-- 不再依赖 Kafka
-
-### 增加的组件
+### Added components
 
 #### [Dataservice](https://github.com/openinsight-proj/opentelemetry-demo/tree/daocloud/src/dataservice)
 
-这个组件只被 Adservice 调用，在收到请求后，它会去 Mysql 中获取相关的数据并返回给 Adservice。
+This service only used by Adservice. It will accept Adservice's http request then response Ad data from mysql.
 
-### 官方 chart 参数改造
+### Official chart re-configuration
 
-1. 我们关闭了所有非业务组件，比如： Opentelemetry collector, Prometheus, Jaeger, Grafana等，在我们的版本中不需要用它们展示数据。
-   业务的观测性数据传输路径变成了：`Components --> Insight-agent OTel collector`。
+1. Close all none business services, such as Opentelemetry collector, Prometheus, Jaeger, Grafana,
+   all service's telemetry data will fellow this data flow: `Components --> Insight-agent OTel collector`。
 
-2. 支持通过 Redis operator 拉起 Redis 实例（保证 Redis operator 已经安装并正常工作）。
-   默认情况下使用官方的方式创建 Redis（`--set .global.middleware.redis.deployBy=builtin`）,
-   你可以通过 `--set .global.middleware.redis.deployBy=redisCR` 下发 Redis CR, 最后由 Redis operator 拉起 Redis 实例。
+2. Support deploying Redis instance from a  Redis operator(Make sure Redis operator already works).
 
-## 安装
+## Install
 
-_前提条件：请保证 Insight agent 已经安装并就绪(在 `--set .global.middleware.redis.deployBy=redisCR` 时请求保证 Redis operator
-已经安装并正常工作)_
+_Note：make sure Insight agent already works(If`--set .global.middleware.redis.deployBy=redisCR`, make sure Redis 
+operator already works)_
 
 ```shell
 helm repo add open-insight https://openinsight-proj.github.io/openinsight-helm-charts
 
 helm install webstore-demo open-insight/opentelemetry-demo-lite -n webstore-demo --create-namespace
 ```
 
-## 常见参数
-
-| 参数位置 | 参数说明                                                                                                                                            |
-| -------- |-------------------------------------------------------------------------------------------------------------------------------------------------|
-|adservice.enabled| 为 true 时部署adservice                                                                                                                             |
-|microservices.nacos.enabled| 改为 true，将会额外部署两个服务：dataservice, mysql, dataservice 会从 mysql 中获取广告数据，adservice 会向 dataservice 请求广告数据。此外，adservice, dataservice两个服务会被注册到nacos注册中心 |
-|microservices.nacos.registryAddr| 请修改为集群内nacos的可解析的域名，注意要带namespace                                                                                                               |
-
-更多的参数配置可以将 `values.schema.json` 文件中的内容复制到[ json schema editor ](https://form.lljj.me/#/demo?ui=VueElementForm&type=Test)
-进行实时配置编辑，用[ json-to-yaml ](https://codebeautify.org/json-to-yaml)将编辑的j结果转成 yaml。
+## Common chart param
 
+Please use `values.schema.json` to get to know how to control the deployment behavior of this chart(use 
+[json schema editor](https://form.lljj.me/#/demo?ui=VueElementForm&type=Test) to parse the schema and use 
+[json-to-yaml](https://codebeautify.org/json-to-yaml) to generate values.yaml).
 
 
 

charts/opentelemetry-demo-lite/templates/cartservice/redis.yaml

@@ -70,6 +70,10 @@ spec:
               limits:
                 cpu: "0.5"
                 memory: 512Mi
+            securityContext:
+              runAsUser: 999
+              runAsGroup: 1000
+              runAsNonRoot: true
 ---
 apiVersion: v1
 kind: Service

charts/opentelemetry-demo-lite/templates/serviceMonitor/adservice-service-monitor.yaml

@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
           - name: spring-cloud-gateway
-            image: "{{ .Values.extensions.springCloudGateway.image.repository }}:{{ .Values.extensions.springCloudGateway.image.tag | default .Chart.AppVersion }}"
+            image: "{{ .Values.extensions.springCloudGateway.image.registry }}/{{ .Values.extensions.springCloudGateway.image.repository }}:{{ .Values.extensions.springCloudGateway.image.tag | default .Chart.AppVersion }}"
             imagePullPolicy: Always
             ports:
               - name: http