Skip to content

Commit

Permalink
update image version
Browse files Browse the repository at this point in the history
  • Loading branch information
wenkun.zwk committed May 21, 2024
1 parent 477ddfb commit 534f465
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 52 deletions.
4 changes: 2 additions & 2 deletions chaosmeta-deploy/templates/chaosmeta-inject.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ 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
Expand Down Expand Up @@ -374,7 +374,7 @@ data:
"executor": {
"mode": "daemonset",
"executor": "chaosmetad",
"version": "0.5.3",
"version": "0.5.1",
"agentConfig": {
"agentPort": 29595
},
Expand Down
4 changes: 2 additions & 2 deletions chaosmeta-deploy/templates/chaosmeta-platform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion chaosmeta-inject-operator/config/chaosmeta-inject.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"executor": {
"mode": "daemonset",
"executor": "chaosmetad",
"version": "0.5.3",
"version": "0.5.1",
"agentConfig": {
"agentPort": 29595
},
Expand Down
24 changes: 0 additions & 24 deletions chaosmeta-inject-operator/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,6 @@ require (
sigs.k8s.io/controller-runtime v0.14.1
)

require (
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-multierror v1.1.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/magiconair/properties v1.8.5 // indirect
github.com/natefinch/lumberjack v2.0.0+incompatible // indirect
github.com/valyala/fastjson v1.5.1 // indirect
gitlab.alipay-inc.com/naming/naming-sdk-go v1.2.3 // indirect
gitlab.alipay-inc.com/sofa-go/sofa-antvip-client-go v1.6.8 // indirect
gitlab.alipay-inc.com/sofa-go/sofa-bolt-go v0.3.4 // indirect
gitlab.alipay-inc.com/sofa-go/sofa-bolt-simplemap-go v0.2.1 // indirect
gitlab.alipay-inc.com/sofa-go/sofa-conn-go v0.2.7 // indirect
gitlab.alipay-inc.com/sofa-go/sofa-helper-go v0.1.0 // indirect
gitlab.alipay-inc.com/sofa-go/sofa-hessian-go v0.2.4 // indirect
gitlab.alipay-inc.com/sofa-go/sofa-logger-go v0.2.5 // indirect
gitlab.alipay-inc.com/sofa-go/sofa-registry-client-go v1.1.0 // indirect
gitlab.alipay-inc.com/sofa-go/sofa-registry-proto-go v0.1.1 // indirect
gitlab.alipay-inc.com/sofa-go/sofa-syncpool-go v0.1.3 // indirect
gitlab.alipay-inc.com/sofa-go/sofa-writer-go v0.2.4 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/grpc v1.49.0 // indirect
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
Expand Down Expand Up @@ -73,7 +50,6 @@ require (
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
gitlab.alipay-inc.com/mist-sdk/mist_sdk_go v1.0.5
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.24.0 // indirect
Expand Down
4 changes: 2 additions & 2 deletions chaosmeta-inject-operator/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -362,8 +362,8 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/tidwall/pretty v1.0.1/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/traas-stack/chaosmeta/chaosmeta-common v0.0.0-20240102105916-8f3b8d9accc5 h1:1RpFVSqiERGKUq2Yc6nioKEa0VyCXu0+t9vXpmK1WQ4=
github.com/traas-stack/chaosmeta/chaosmeta-common v0.0.0-20240102105916-8f3b8d9accc5/go.mod h1:291sLBmT/cXwucSh4T3kRmLX7JRlSNq5HY66PQtt4ow=
github.com/traas-stack/chaosmeta/chaosmeta-common v0.0.0-20240304074218-2b1da1d93caa h1:Z/0R8DkSZb0YBUN5wVDKmKiWV9D0vYC8iie6/DQuzmk=
github.com/traas-stack/chaosmeta/chaosmeta-common v0.0.0-20240304074218-2b1da1d93caa/go.mod h1:291sLBmT/cXwucSh4T3kRmLX7JRlSNq5HY66PQtt4ow=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/valyala/fastjson v1.5.1 h1:SXaQZVSwLjZOVhDEhjiCcDtnX0Feu7Z7A1+C5atpoHM=
github.com/valyala/fastjson v1.5.1/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,13 @@ package auth

import (
"github.com/traas-stack/chaosmeta/chaosmeta-inject-operator/pkg/config"
"gitlab.alipay-inc.com/mist-sdk/mist_sdk_go/mist"
"log"
)

type MistClient struct {
Config config.MistConfig
}

func (r *MistClient) MistConfig() (string, string) {
config := mist.NewMistConfig()
// 线下/线上AntVipUrl和BkmiUrl具体配置参看上面的 参数说明
config.SetAntVipUrl(r.Config.AntVipUrl)
config.SetBkmiUrl(r.Config.BkmiUrl)

config.SetAppName(r.Config.AppName)
config.SetTenant(r.Config.Tenant)

// 线下/线上Mode具体配置参看上面的 参数说明
config.SetMode(r.Config.Mode)

client := mist.NewMistClient(config)
ak, sk, _, _, err := client.GetSecretInfo(r.Config.SecretName)
if err != nil {
log.Println(err)
return "", ""
}
return ak, sk
// internal code
return "", ""
}
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func GetWorkflowStruct(experimentInstanceId string, nodes []*experiment_instance
},
Resource: &v1alpha1.ResourceTemplate{
Action: "create",
FailureCondition: "status.status == failed",
FailureCondition: "status.status in (failed, partSuccess)",
SuccessCondition: "status.phase == recover,status.status == success",
Manifest: fmt.Sprintf("{{inputs.parameters.%s}}", ParametersName),
},
Expand Down

0 comments on commit 534f465

Please sign in to comment.