diff --git a/chaosmeta-platform/pkg/service/experiment/chaosmeta_inject.go b/chaosmeta-platform/pkg/service/experiment/chaosmeta_inject.go index 541206e..b1cba9c 100644 --- a/chaosmeta-platform/pkg/service/experiment/chaosmeta_inject.go +++ b/chaosmeta-platform/pkg/service/experiment/chaosmeta_inject.go @@ -161,12 +161,14 @@ func (c *ChaosmetaService) Update(ctx context.Context, chaosmeta *ExperimentInje return nil, err } - utd, err := c.Client.Resource(gvr).Get(ctx, obj.GetName(), v1.GetOptions{}) + utd, err := c.Client.Resource(gvr).Namespace(obj.GetNamespace()).Get(ctx, obj.GetName(), v1.GetOptions{}) if err != nil { + log.Error(err) return nil, err } + obj.SetResourceVersion(utd.GetResourceVersion()) - utd, err = c.Client.Resource(gvr).Update(ctx, obj, v1.UpdateOptions{}) + utd, err = c.Client.Resource(gvr).Namespace(obj.GetNamespace()).Update(ctx, obj, v1.UpdateOptions{}) if err != nil { return nil, err } diff --git a/chaosmeta-platform/pkg/service/experiment/experiment_flow.go b/chaosmeta-platform/pkg/service/experiment/experiment_flow.go index 675d0bd..c34f6da 100644 --- a/chaosmeta-platform/pkg/service/experiment/experiment_flow.go +++ b/chaosmeta-platform/pkg/service/experiment/experiment_flow.go @@ -322,7 +322,7 @@ func getExperimentInstanceIdFromWorkflowName(workflowName string) (string, error } func getExperimentUUIDAndNodeIDFromStepName(name string) (string, string, error) { - log.Error("ExperimentUUIDAndNodeIDFromStepName:", name) + log.Info("ExperimentUUIDAndNodeIDFromStepName:", name) var reg *regexp.Regexp var match []string diff --git a/chaosmeta-platform/pkg/service/experiment/routine.go b/chaosmeta-platform/pkg/service/experiment/routine.go index c89a176..db6138a 100644 --- a/chaosmeta-platform/pkg/service/experiment/routine.go +++ b/chaosmeta-platform/pkg/service/experiment/routine.go @@ -174,8 +174,9 @@ func StopExperiment(experimentInstanceID string) error { log.Error(err) return err } - chaosmetaCR.Status.Phase = "recover" + chaosmetaCR.Spec.TargetPhase = "recover" if _, err := chaosmetaService.Update(context.Background(), chaosmetaCR); err != nil { + log.Error(err) return err } _, nodeId, err := getExperimentUUIDAndNodeIDFromStepName(node.DisplayName) diff --git a/chaosmeta-platform/quick-start/platform/rbac.yaml b/chaosmeta-platform/quick-start/platform/rbac.yaml index deb4a90..afaa226 100644 --- a/chaosmeta-platform/quick-start/platform/rbac.yaml +++ b/chaosmeta-platform/quick-start/platform/rbac.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: chaosmeta-platform - namespace: default + namespace: chaosmeta --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole