Merge pull request #174 from traas-stack/dev/v0.6.2

new version v0.7.0
traas-stack · May 21, 2024 · 8191fc8 · 8191fc8
2 parents 98cf0b4 + b8a3b33
commit 8191fc8
Show file tree

Hide file tree

Showing 102 changed files with 6,532 additions and 4,502 deletions.
diff --git a/README.md b/README.md
@@ -94,7 +94,7 @@ The current version has released: user interface, fault injection scheduling eng
 #### Quickly try the single-machine injection capability
 ```shell
 # Download docker mirror and run container
-docker run --privileged -it registry.cn-hangzhou.aliyuncs.com/chaosmeta/chaosmetad-demo:v0.5.1 /bin/bash
+docker run --privileged -it registry.cn-hangzhou.aliyuncs.com/chaosmeta/chaosmetad-demo:v0.5.3 /bin/bash
 
 # Start the test service
 cd /tmp && python -m SimpleHTTPServer 8080 > server.log 2>&1 &

diff --git a/README_CN.md b/README_CN.md
@@ -93,7 +93,7 @@ ChaosMeta 则会在“混沌工程生命周期”的技术基础以及“风险
 #### 快速试用单机注入能力
 ```shell
 # 下载镜像并运行容器
-docker run --privileged -it registry.cn-hangzhou.aliyuncs.com/chaosmeta/chaosmetad-demo:v0.5.1 /bin/bash
+docker run --privileged -it registry.cn-hangzhou.aliyuncs.com/chaosmeta/chaosmetad-demo:v0.5.3 /bin/bash
 
 # 启动测试服务
 cd /tmp && python -m SimpleHTTPServer 8080 > server.log 2>&1 &

diff --git a/chaosmeta-deploy/README.md b/chaosmeta-deploy/README.md
@@ -94,7 +94,7 @@ The current version has released: user interface, fault injection scheduling eng
 #### Quickly try the single-machine injection capability
 ```shell
 # Download docker mirror and run container
-docker run --privileged -it registry.cn-hangzhou.aliyuncs.com/chaosmeta/chaosmetad-demo:v0.5.1 /bin/bash
+docker run --privileged -it registry.cn-hangzhou.aliyuncs.com/chaosmeta/chaosmetad-demo:v0.5.3 /bin/bash
 
 # Start the test service
 cd /tmp && python -m SimpleHTTPServer 8080 > server.log 2>&1 &

diff --git a/chaosmeta-deploy/templates/chaosmeta-inject.yaml b/chaosmeta-deploy/templates/chaosmeta-inject.yaml
@@ -248,17 +248,21 @@ spec:
         - --leader-elect
         command:
         - /manager
-        image: registry.cn-hangzhou.aliyuncs.com/chaosmeta/chaosmeta-inject-controller:v0.1.2
+        image: registry.cn-hangzhou.aliyuncs.com/chaosmeta/chaosmeta-inject-controller:v0.1.3
         imagePullPolicy: Always
         env:
           - name: DEFAULTNAMESPACE
             valueFrom:
               fieldRef:
                 fieldPath: metadata.namespace
+          - name: LOCAL_IP
+            valueFrom:
+              fieldRef:
+                fieldPath: status.podIP
         livenessProbe:
           httpGet:
             path: /healthz
-            port: 8081
+            port: 8083
           initialDelaySeconds: 20
           periodSeconds: 20
           failureThreshold: 3
@@ -270,7 +274,7 @@ spec:
         readinessProbe:
           httpGet:
             path: /readyz
-            port: 8081
+            port: 8083
           initialDelaySeconds: 20
           periodSeconds: 20
           failureThreshold: 3
@@ -376,10 +380,22 @@ data:
         },
         "daemonsetConfig": {
           "localExecPath": "/tmp",
+          "daemonName": "chaosmeta-daemon",
           "daemonNs": "chaosmeta",
           "daemonLabel": {
             "app.chaosmeta.io": "chaosmeta-daemon"
           }
+        },
+        "middlewareConfig" : {
+          "url" : "http://shell-online-api.global.alipay.com",
+          "mistConfig" : {
+            "antVipUrl" : "antvip-pool.global.alipay.com",
+            "bkmiUrl" : "bkmi-read-pool.global.alipay.com",
+            "appName" : "antchaos",
+            "tenant" : "ALIPAY",
+            "mode" : "prod",
+            "secret" : "antchaos_fault_inject_online"
+          }
         }
       }
     }
diff --git a/chaosmeta-deploy/templates/chaosmeta-platform.yaml b/chaosmeta-deploy/templates/chaosmeta-platform.yaml
@@ -89,7 +89,7 @@ spec:
       serviceAccountName: chaosmeta-platform
       containers:
         - name: chaosmeta-platform
-          image: registry.cn-hangzhou.aliyuncs.com/chaosmeta/chaosmeta-platform:v0.6.1
+          image: registry.cn-hangzhou.aliyuncs.com/chaosmeta/chaosmeta-platform:v0.6.3
           resources:
             requests:
               cpu: "1"
@@ -101,7 +101,7 @@ spec:
             - name: chaosmeta-config
               mountPath: /home/admin/conf
         - name: chaosmeta-platform-frontend
-          image: registry.cn-hangzhou.aliyuncs.com/chaosmeta/chaosmeta-platform-frontend:v0.6.1
+          image: registry.cn-hangzhou.aliyuncs.com/chaosmeta/chaosmeta-platform-frontend:v0.6.3
           imagePullPolicy: Always
           ports:
             - containerPort: 8000

diff --git a/chaosmeta-deploy/templates/chaosmeta-workflow.yaml b/chaosmeta-deploy/templates/chaosmeta-workflow.yaml
@@ -384,7 +384,7 @@ spec:
       - args:
         - server
         env: []
-        image: registry.cn-hangzhou.aliyuncs.com/chaosmeta/argocli:v3.4.10
+        image: registry.cn-hangzhou.aliyuncs.com/chaosmeta/argocli:v3.4.10.3
         name: argo-server
         ports:
         - containerPort: 2746

diff --git a/chaosmeta-inject-operator/build/yamls/chaosmeta-daemonset.yaml b/chaosmeta-inject-operator/build/yamls/chaosmeta-daemonset.yaml
@@ -19,7 +19,7 @@ spec:
 #        chaos-role.chaosmeta.io: chaosmeta-daemon
       containers:
         - name: chaosmeta-daemon
-          image: registry.cn-hangzhou.aliyuncs.com/chaosmeta/chaosmeta-daemon:v0.5.1
+          image: registry.cn-hangzhou.aliyuncs.com/chaosmeta/chaosmeta-daemon:v0.5.3
           securityContext:
             privileged: true
           volumeMounts:

diff --git a/chaosmeta-inject-operator/config/chaosmeta-inject.json b/chaosmeta-inject-operator/config/chaosmeta-inject.json
@@ -14,9 +14,21 @@
     },
     "daemonsetConfig": {
       "localExecPath": "/tmp",
-      "daemonNs": "chaosmeta-inject",
+      "daemonNs": "chaosmeta",
       "daemonLabel": {
         "app.chaosmeta.io": "chaosmeta-daemon"
+      },
+      "daemonName": "chaosmeta-daemon"
+    },
+    "middlewareConfig" : {
+      "url" : "todo",
+      "mistConfig" : {
+        "antVipUrl" : "todo",
+        "bkmiUrl" : "todo",
+        "appName" : "chaosmetainject",
+        "tenant" : "ALIPAY",
+        "mode" : "todo",
+        "secretName" : "todo"
       }
     }
   }

diff --git a/chaosmeta-inject-operator/go.mod b/chaosmeta-inject-operator/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.6.0
 	github.com/onsi/gomega v1.24.1
 	github.com/stretchr/testify v1.8.0
-	github.com/traas-stack/chaosmeta/chaosmeta-common v0.0.0-20240102105916-8f3b8d9accc5
+	github.com/traas-stack/chaosmeta/chaosmeta-common v0.0.0-20240304074218-2b1da1d93caa
 	k8s.io/api v0.26.0
 	k8s.io/apimachinery v0.26.3
 	k8s.io/client-go v0.26.0
@@ -33,7 +33,7 @@ require (
 	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/google/uuid v1.1.2 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/imdario/mergo v0.3.6 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect