Update config

deploy/all-cr.yaml

@@ -245,6 +245,8 @@ data:
       governance:
         initializeTimeout: ${CONFIG_POLICY_INITIALIZE_TIMEOUT:10000}
         service:
+          serviceGroups: ${CONFIG_SERVICE_GROUPS:}
+          serviceGroupOpen: ${CONFIG_SERVICE_GROUP_OPEN:true}
           warmups: ${CONFIG_WARMUP_SERVICES:}
           systemPaths: ${CONFIG_SYSTEM_HTTP_PATHS}
           concurrencyLimiter:

deploy/joylive-injector/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.3.1
+version: 1.3.2
 
 keywords:
   - joylive

deploy/joylive-injector/README-zh.md

@@ -20,6 +20,7 @@
 因证书签名已按照命名空间为`joylive`预生成，所以须指定安装到对应命名空间。 执行命令：
 ```bash
 helm repo add joylive https://jd-opensource.github.io/joylive-helm-charts
+helm repo update
 kubectl create namespace joylive
 helm install joylive-injector joylive/joylive-injector -n joylive
 ```

deploy/joylive-injector/README.md

@@ -19,6 +19,7 @@ This program monitors the `CREATE`, `UPDATE`, `DELETE` events for `deployments`
 Since the certificate signature has been pre-generated according to the namespace `joylive`, it is necessary to specify installation to the corresponding namespace. Execute the command:
 ```bash
 helm repo add joylive https://jd-opensource.github.io/joylive-helm-charts
+helm repo update
 kubectl create namespace joylive
 helm install joylive-injector joylive/joylive-injector -n joylive
 ```

deploy/joylive-injector/config/config.yaml

@@ -56,8 +56,8 @@ agent:
     profile: null
   sync:
     liveSpace:
-      type: ${CONFIG_LIVE_SPACE_API_TYPE:{{ .Values.sync.liveSpace.type }}} # [file,multilive]
-      url: ${CONFIG_LIVE_SPACE_API_URL:{{ .Values.sync.liveSpace.url }}}
+      type: ${CONFIG_LIVE_SPACE_API_TYPE:{{ .Values.agent.sync.liveSpace.type }}} # [file,multilive]
+      url: ${CONFIG_LIVE_SPACE_API_URL:{{ .Values.agent.sync.liveSpace.url }}}
       #spacesUrl: ${CONFIG_LIVE_SPACE_API_URL}/workspaces
       #spaceUrl: ${CONFIG_LIVE_SPACE_API_URL}/workspaces/${space_id}/version/${space_version}
       #serviceUrl: ${CONFIG_LIVE_SPACE_API_URL}/services/${service_name}/version/${service_version}
@@ -71,8 +71,8 @@ agent:
     laneSpace:
       type: file
     microservice:
-      type: ${CONFIG_SERVICE_API_TYPE:{{ .Values.sync.microservice.type }}}
-      url: ${CONFIG_SERVICE_API_URL:{{ .Values.sync.microservice.url }}}
+      type: ${CONFIG_SERVICE_API_TYPE:{{ .Values.agent.sync.microservice.type }}}
+      url: ${CONFIG_SERVICE_API_URL:{{ .Values.agent.sync.microservice.url }}}
       headers: ${CONFIG_SERVICE_API_HEADERS}
       interval: 5000
       timeout: 3000
@@ -118,6 +118,8 @@ agent:
   governance:
     initializeTimeout: ${CONFIG_POLICY_INITIALIZE_TIMEOUT:10000}
     service:
+      serviceGroups: ${CONFIG_SERVICE_GROUPS:}
+      serviceGroupOpen: ${CONFIG_SERVICE_GROUP_OPEN:true}
       warmups: ${CONFIG_WARMUP_SERVICES:}
       systemPaths: ${CONFIG_SYSTEM_HTTP_PATHS}
       concurrencyLimiter:

deploy/joylive-injector/config/injector.yaml

@@ -1,6 +1,6 @@
 # Define the version, environment variables, and other information of joylive-injector injecting joylive-agent
 agent:
-  image: ghcr.m.daocloud.io/jd-opensource/joylive-agent
-  version: v1.3.3
+  image: {{ .Values.agent.image.repository }}
+  version: {{ .Values.agent.image.tag }}
   env:
     JAVA_TOOL_OPTIONS: -javaagent:/joylive/live.jar

deploy/joylive-injector/values.yaml

@@ -32,14 +32,18 @@ serviceAccount:
   create: true
   name: joylive-injector
 
-sync:
-  liveSpace:
-    type: file
-    url: http://api.live.local:9090/v1
-    headers: ${CONFIG_LIVE_SPACE_API_HEADERS}
-  microservice:
-    type: file
-    url: http://api.jmsf.local:8080/v1
+agent:
+  image:
+    repository: ghcr.m.daocloud.io/jd-opensource/joylive-agent
+    tag: v1.3.3
+  sync:
+    liveSpace:
+      type: file
+      url: http://api.live.local:9090/v1
+      headers: ${CONFIG_LIVE_SPACE_API_HEADERS}
+    microservice:
+      type: file
+      url: http://api.jmsf.local:8080/v1
 
 #caBundle: $ {CA_BUNDLE}
 caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUdKRENDQkF5Z0F3SUJBZ0lVU3VsRVQxWGhqSk5jeDJBdFVCa3ZtSlBBNDRJd0RRWUpLb1pJaHZjTkFRRU4KQlFBd2dha3hDekFKQmdOVkJBWVRBa05PTVJBd0RnWURWUVFJRXdkQ1pXbHFhVzVuTVJBd0RnWURWUVFIRXdkQwpaV2xxYVc1bk1TSXdJQVlEVlFRS0V4bEVlVzVoYldsaklFRmtiV2x6YzJsdmJpQkRiMjUwY205c01Tc3dLUVlEClZRUUxFeUpFZVc1aGJXbGpJRUZrYldsemMybHZiaUJEYjI1MGNtOXNJRk5sWTNWeWFYUjVNU1V3SXdZRFZRUUQKRXh4RWVXNWhiV2xqSUVGa2JXbHpjMmx2YmlCRGIyNTBjbTlzSUVOQk1CNFhEVEkwTURZeE1qQTRNekV3TUZvWApEVE0wTURZeE1EQTRNekV3TUZvd2dha3hDekFKQmdOVkJBWVRBa05PTVJBd0RnWURWUVFJRXdkQ1pXbHFhVzVuCk1SQXdEZ1lEVlFRSEV3ZENaV2xxYVc1bk1TSXdJQVlEVlFRS0V4bEVlVzVoYldsaklFRmtiV2x6YzJsdmJpQkQKYjI1MGNtOXNNU3N3S1FZRFZRUUxFeUpFZVc1aGJXbGpJRUZrYldsemMybHZiaUJEYjI1MGNtOXNJRk5sWTNWeQphWFI1TVNVd0l3WURWUVFERXh4RWVXNWhiV2xqSUVGa2JXbHpjMmx2YmlCRGIyNTBjbTlzSUVOQk1JSUNJakFOCkJna3Foa2lHOXcwQkFRRUZBQU9DQWc4QU1JSUNDZ0tDQWdFQXpDRStnZWorUkFOV2Z1NDhRQnF5Ry9HUVFQVFUKeVFHV29jZHVIQ0x4WUVrNUtIL1NNVHZsbGpWaERGOWxENEVyTnQ0Nk95QnBzOTBiTG5aWDJKR3hrdFdmcVM5aAo4RUY3NXUycU9QcWhjMTd0dkowNTFrb2ZxZmVQOVcvbUtudkhpMlBEak1nMk9MbDBJWG5GazJOVDFtUFd6bXZaCkEvS1ZBVzNCcGIrOEg3djZBR2hDNSsvK0M1UlRCMnhaTVFuUmdXd3dmRHdRTzd4Qml0cEdEZXovWGpnN0JmcmYKYkNGekdPQTJvRzVTbk1YNzhOOHNNVEJuRmliLzNmWG5EQ1k4RVdsa0xpaG5pcXg2N3lLWkZSYlBEZy9COGNqWgoyK3RWc2pORUk2VUJhczQvNXUySGNuWStGNGV0cGwzdkNKZHNHbEpUeml1eWN4bTc0N1RuZi9sQ2Z6T3gzNVJKCmRSWWpoQlVRak1acDRhaUtCZ3BqMkxtdS9NV25qQURjemVkbVVlWWJCUEEyUGV4MFI1RHNTeFQyOE90V0RkS3QKZHhiSTAvZEhoT2pZbDl6T1MzMkdsRlhKSFNQM1cwR0tTSFVhMUp4bjFncURpM2MrTUNEVUZFTzFVWTVSMnFlUQpxY3ZkdUhxd3owdHdpTTd1VE1ySVlndUkzVUNkRUdxcjNwd0dpQURIbkcvT1pIMHRhTUFTbXVmVk1KWGIvTjZmCjM2ZURxNHpEOGlpbjBYTUs4WWtONFVKZkFKYUlFeU11RU1qUndSYUhPUlU3d1ZKakJEVWNwcitrU3ZkWDAzOHYKVGNObWYvTjU4QzFzUm1KeURDYmE3aW1qakE3RDh0ZSt3UnVnZUlURzhyRENOOEVqQVFVVEhJQTk5NWQ3cStETQpSNXU4ZStEU1dXRDdHK3NDQXdFQUFhTkNNRUF3RGdZRFZSMFBBUUgvQkFRREFnRUdNQThHQTFVZEV3RUIvd1FGCk1BTUJBZjh3SFFZRFZSME9CQllFRkJ4UWxqNlYyMHU3SWg2RUYwVEs3KzFyWkgrNk1BMEdDU3FHU0liM0RRRUIKRFFVQUE0SUNBUUFlS2FVcm1TMWdOeXp0dzM1a3FzYU9sWGV0ekJwUFlIc2F4azVHV1JjR0lQSUZmd212ZzZKUAptanRiLzI3Y0FXY0V3QTZlQUpFYmw2Nm9Ic3lOWUNkcmZheUg0M010Y1lTaUV3RVhCS2JhU3dBVWdXZi9CelNaCkFEa3daMEo4bWZXSnQ3NE1BTHl0Mk56VXJpUjJKcmhoS2p4TWJMN2pMZnRJaGZyRGJ1NnJXb2FUNWZMUUFMSEgKa3kveXNaZlJYcVJ1MXJTdldva1VUY201cGIwWVljRE84aWs4Y041VkJmWENRYjYvUkhVUjI2OUNpdllYU0tHLwpTdjdCTkpmckV0U3U0V01ya01nVmo0NmZvQUpiMGFKdFhzLyt0bzBjWDlaSG5hMXR2OFlXZ2JScWJPRnJhSk44ClFPTHNtcW55Yk1Tcjdnd0o0Q3B6c3VMNWh4TEtZZnozQWJlek5scXFiNzZkbE1mYlA4bzJRL1lITXptS2JkWmcKS2JzeTBzSmFBZEtURkYrRzluYlpBbEI3V3RkazNLOTFGNGRxUUpOUzZyZVBKVE9QSWZaajFmS3N2eXRmd3YzcwpPYjNyY2tPeTE2WXFVZEtsNVB5SzI0RjVZMXRhQlp3T0MzODdxcWpaRS9JNGhHdFhFZVp5aTUwWmpWS1VkZkhCCnNYc1VzcmNtQ3h2cXViRDF0K1R2UmVqNHBpMkZLem1MWFFRTXVJNTlJWHRlN3dSYUxDVENNWVdvcGZHeXZBdDQKM1hHSm4rKzZ4UVV4V01qcUhMbUdyQWFNU1ZhWnYvL3dzVzBFanJsdFVPcXI5NkJkNXllOFFXRmdlV21EUlVvUgpWMlZZZWhRelVOT1NaN0VZeU5NckxlWXJXcXBSeXgxaDRNV2kzem5XNVBqNEZjTGhaTWd0blE9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==