Merge branch 'master' into readme-fix

chaoscenter/graphql/server/pkg/chaos_experiment/handler/handler.go

@@ -106,18 +106,10 @@ func (c *ChaosExperimentHandler) SaveChaosExperiment(ctx context.Context, reques
 	if wfDetails.ExperimentID == request.ID {
 		logrus.WithFields(logFields).Info("request received to update k8s chaos experiment")
 		if wfDetails.Name != request.Name {
-			filterQuery := bson.D{
-				{"project_id", request.ID},
-				{"name", request.Name},
-				{"is_removed", false},
-			}
-			experimentCount, err := c.chaosExperimentOperator.CountChaosExperiments(ctx, filterQuery)
+			err = c.validateDuplicateExperimentName(ctx, projectID, request.Name)
 			if err != nil {
 				return "", err
 			}
-			if experimentCount > 0 {
-				return "", errors.New("experiment name should be unique, duplicate experiment found with name: " + request.Name)
-			}
 		}
 
 		err = c.chaosExperimentService.ProcessExperimentUpdate(newRequest, username, wfType, revID, false, projectID, nil)
@@ -128,10 +120,15 @@ func (c *ChaosExperimentHandler) SaveChaosExperiment(ctx context.Context, reques
 		return "experiment updated successfully", nil
 	}
 
+	err = c.validateDuplicateExperimentName(ctx, projectID, request.Name)
+	if err != nil {
+		return "", err
+	}
+
 	// Saving chaos experiment in the DB
 	logrus.WithFields(logFields).Info("request received to save k8s chaos experiment")
 
-	err = c.chaosExperimentService.ProcessExperimentCreation(context.TODO(), newRequest, username, projectID, wfType, revID, nil)
+	err = c.chaosExperimentService.ProcessExperimentCreation(ctx, newRequest, username, projectID, wfType, revID, nil)
 	if err != nil {
 		return "", err
 	}
@@ -144,18 +141,10 @@ func (c *ChaosExperimentHandler) CreateChaosExperiment(ctx context.Context, requ
 	var revID = uuid.New().String()
 
 	// Check if the experiment_name exists under same project
-	filterQuery := bson.D{
-		{"project_id", projectID},
-		{"name", request.ExperimentName},
-		{"is_removed", false},
-	}
-	experimentCount, err := c.chaosExperimentOperator.CountChaosExperiments(ctx, filterQuery)
+	err := c.validateDuplicateExperimentName(ctx, projectID, request.ExperimentName)
 	if err != nil {
 		return nil, err
 	}
-	if experimentCount > 0 {
-		return nil, errors.New("experiment name should be unique, duplicate experiment found with name: " + request.ExperimentName)
-	}
 
 	newRequest, wfType, err := c.chaosExperimentService.ProcessExperiment(request, projectID, revID)
 	if err != nil {
@@ -240,18 +229,10 @@ func (c *ChaosExperimentHandler) UpdateChaosExperiment(ctx context.Context, requ
 	)
 
 	// Check if the experiment_name exists under same project
-	filterQuery := bson.D{
-		{"project_id", projectID},
-		{"name", request.ExperimentName},
-		{"is_removed", false},
-	}
-	experimentCount, err := c.chaosExperimentOperator.CountChaosExperiments(ctx, filterQuery)
+	err := c.validateDuplicateExperimentName(ctx, projectID, request.ExperimentName)
 	if err != nil {
 		return nil, err
 	}
-	if experimentCount > 0 {
-		return nil, errors.New("experiment name should be unique, duplicate experiment found with name: " + request.ExperimentName)
-	}
 
 	newRequest, wfType, err := c.chaosExperimentService.ProcessExperiment(request, projectID, revID)
 	if err != nil {
@@ -1317,3 +1298,21 @@ func (c *ChaosExperimentHandler) GetProbesInExperimentRun(ctx context.Context, p
 
 	return probeDetails, nil
 }
+
+// validateDuplicateExperimentName validates if the name of experiment is duplicate
+func (c *ChaosExperimentHandler) validateDuplicateExperimentName(ctx context.Context, projectID, name string) error {
+	filterQuery := bson.D{
+		{"project_id", projectID},
+		{"name", name},
+		{"is_removed", false},
+	}
+	experimentCount, err := c.chaosExperimentOperator.CountChaosExperiments(ctx, filterQuery)
+	if err != nil {
+		return err
+	}
+	if experimentCount > 0 {
+		return errors.New("experiment name should be unique, duplicate experiment found with name: " + name)
+	}
+
+	return nil
+}

chaoscenter/graphql/server/pkg/chaos_infrastructure/infra_utils.go

@@ -59,23 +59,19 @@ func GetK8sInfraYaml(infra dbChaosInfra.ChaosInfra) ([]byte, error) {
 		config.TLSCert = utils.Config.TlsCertB64
 	}
 
-	if !infra.IsRegistered {
-		var respData []byte
-		if infra.InfraScope == ClusterScope {
-			respData, err = ManifestParser(infra, "manifests/cluster", &config)
-		} else if infra.InfraScope == NamespaceScope {
-			respData, err = ManifestParser(infra, "manifests/namespace", &config)
-		} else {
-			logrus.Error("INFRA_SCOPE env is empty!")
-		}
-		if err != nil {
-			return nil, err
-		}
-
-		return respData, nil
+	var respData []byte
+	if infra.InfraScope == ClusterScope {
+		respData, err = ManifestParser(infra, "manifests/cluster", &config)
+	} else if infra.InfraScope == NamespaceScope {
+		respData, err = ManifestParser(infra, "manifests/namespace", &config)
 	} else {
-		return []byte("Infra is already registered"), nil
+		logrus.Error("INFRA_SCOPE env is empty!")
 	}
+	if err != nil {
+		return nil, err
+	}
+
+	return respData, nil
 }
 
 // ManifestParser parses manifests yaml and generates dynamic manifest with specified keys

chaoscenter/manifests/litmus-cluster-scope.yaml

@@ -440,9 +440,7 @@ metadata:
   name: litmus-portal-admin-config
   namespace: litmus
 data:
-  DB_SERVER: mongodb://my-release-mongodb-0.my-release-mongodb-headless.litmus.svc.cluster.local:27017,my-release-mongodb-1.my-release-mongodb-headless.litmus.svc.cluster.local:27017,my-release-mongodb-2.my-release-mongodb-headless.litmus.svc.cluster.local:27017/admin
-  INFRA_SCOPE: cluster
-  INFRA_NAMESPACE: litmus
+  DB_SERVER: mongodb://my-release-mongodb-0.my-release-mongodb-headless:27017,my-release-mongodb-1.my-release-mongodb-headless:27017,my-release-mongodb-2.my-release-mongodb-headless:27017/admin
   VERSION: "ci"
   SKIP_SSL_VERIFY: "false"
   # Configurations if you are using dex for OAuth
@@ -665,11 +663,11 @@ spec:
             - name: ARGO_WORKFLOW_EXECUTOR_IMAGE
               value: "litmuschaos/argoexec:v3.3.1"
             - name: LITMUS_CHAOS_OPERATOR_IMAGE
-              value: "litmuschaos/chaos-operator:3.0.0-beta11"
+              value: "litmuschaos/chaos-operator:3.0.0"
             - name: LITMUS_CHAOS_RUNNER_IMAGE
-              value: "litmuschaos/chaos-runner:3.0.0-beta11"
+              value: "litmuschaos/chaos-runner:3.0.0"
             - name: LITMUS_CHAOS_EXPORTER_IMAGE
-              value: "litmuschaos/chaos-exporter:3.0.0-beta11"
+              value: "litmuschaos/chaos-exporter:3.0.0"
             - name: SERVER_SERVICE_NAME
               value: "litmusportal-server-service"
             - name: INFRA_DEPLOYMENTS
@@ -689,11 +687,11 @@ spec:
             - name: DEFAULT_HUB_BRANCH_NAME
               value: "master"
             - name: LITMUS_AUTH_GRPC_ENDPOINT
-              value: "litmusportal-auth-server-service.litmus.svc.cluster.local"
+              value: "litmusportal-auth-server-service"
             - name: LITMUS_AUTH_GRPC_PORT
               value: ":3030"
             - name: WORKFLOW_HELPER_IMAGE_VERSION
-              value: "3.0.0-beta9"
+              value: "3.0.0"
             - name: REMOTE_HUB_MAX_SIZE
               value: "5000000"
             - name: INFRA_COMPATIBLE_VERSIONS
@@ -769,7 +767,7 @@ spec:
             - name: ADMIN_PASSWORD
               value: "litmus"
             - name: LITMUS_GQL_GRPC_ENDPOINT
-              value: "litmusportal-server-service.litmus.svc.cluster.local"
+              value: "litmusportal-server-service"
             - name: LITMUS_GQL_GRPC_PORT
               value: ":8000"
           resources:

chaoscenter/manifests/litmus-namespaced-scope.yaml

@@ -415,7 +415,6 @@ kind: ConfigMap
 metadata:
   name: litmus-portal-admin-config
 data:
-  INFRA_SCOPE: namespace
   DB_SERVER: mongodb://my-release-mongodb-0.my-release-mongodb-headless:27017,my-release-mongodb-1.my-release-mongodb-headless:27017,my-release-mongodb-2.my-release-mongodb-headless:27017/admin
   VERSION: "ci"
   SKIP_SSL_VERIFY: "false"
@@ -638,11 +637,11 @@ spec:
             - name: ARGO_WORKFLOW_EXECUTOR_IMAGE
               value: "litmuschaos/argoexec:v3.3.1"
             - name: LITMUS_CHAOS_OPERATOR_IMAGE
-              value: "litmuschaos/chaos-operator:3.0.0-beta11"
+              value: "litmuschaos/chaos-operator:3.0.0"
             - name: LITMUS_CHAOS_RUNNER_IMAGE
-              value: "litmuschaos/chaos-runner:3.0.0-beta11"
+              value: "litmuschaos/chaos-runner:3.0.0"
             - name: LITMUS_CHAOS_EXPORTER_IMAGE
-              value: "litmuschaos/chaos-exporter:3.0.0-beta11"
+              value: "litmuschaos/chaos-exporter:3.0.0"
             - name: CONTAINER_RUNTIME_EXECUTOR
               value: "k8sapi"
             - name: DEFAULT_HUB_BRANCH_NAME
@@ -652,7 +651,7 @@ spec:
             - name: LITMUS_AUTH_GRPC_PORT
               value: ":3030"
             - name: WORKFLOW_HELPER_IMAGE_VERSION
-              value: "3.0.0-beta9"
+              value: "3.0.0"
             - name: REMOTE_HUB_MAX_SIZE
               value: "5000000"
             - name: INGRESS

chaoscenter/manifests/litmus-without-resources.yaml

@@ -1,6 +1,6 @@
 ### RBAC Manifests
 ## If SELF_AGENT="true" then these permissions are required to apply
-## https://github.com/litmuschaos/litmus/blob/master/litmus-portal/graphql-server/manifests/cluster/1b_argo_rbac.yaml
+## https://github.com/litmuschaos/litmus/blob/master/chaoscenter/graphql/server/manifests/cluster/1b_argo_rbac.yaml
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -440,9 +440,7 @@ metadata:
   name: litmus-portal-admin-config
   namespace: litmus
 data:
-  DB_SERVER: mongodb://my-release-mongodb-0.my-release-mongodb-headless.litmus.svc.cluster.local:27017,my-release-mongodb-1.my-release-mongodb-headless.litmus.svc.cluster.local:27017,my-release-mongodb-2.my-release-mongodb-headless.litmus.svc.cluster.local:27017/admin
-  AGENT_SCOPE: cluster
-  AGENT_NAMESPACE: litmus
+  DB_SERVER: mongodb://my-release-mongodb-0.my-release-mongodb-headless:27017,my-release-mongodb-1.my-release-mongodb-headless:27017,my-release-mongodb-2.my-release-mongodb-headless:27017/admin
   VERSION: "ci"
   SKIP_SSL_VERIFY: "false"
   # Configurations if you are using dex for OAuth
@@ -459,7 +457,7 @@ metadata:
   name: litmusportal-frontend-nginx-configuration
   namespace: litmus
 data:
-  default.conf: |
+  nginx.conf: |
     pid /tmp/nginx.pid;
 
     events {
@@ -638,8 +636,6 @@ spec:
             - secretRef:
                 name: litmus-portal-admin-secret
           env:
-            - name: SELF_AGENT
-              value: "true"
             # if self-signed certificate are used pass the k8s tls secret name created in portal ns, to allow agents to use tls for communication
             - name: TLS_SECRET_NAME
               value: ""
@@ -658,23 +654,19 @@ spec:
             - name: ARGO_WORKFLOW_EXECUTOR_IMAGE
               value: "litmuschaos/argoexec:v3.3.1"
             - name: LITMUS_CHAOS_OPERATOR_IMAGE
-              value: "litmuschaos/chaos-operator:3.0.0-beta3"
+              value: "litmuschaos/chaos-operator:3.0.0"
             - name: LITMUS_CHAOS_RUNNER_IMAGE
-              value: "litmuschaos/chaos-runner:3.0.0-beta3"
+              value: "litmuschaos/chaos-runner:3.0.0"
             - name: LITMUS_CHAOS_EXPORTER_IMAGE
-              value: "litmuschaos/chaos-exporter:3.0.0-beta3"
+              value: "litmuschaos/chaos-exporter:3.0.0"
             - name: SERVER_SERVICE_NAME
               value: "litmusportal-server-service"
             - name: INFRA_DEPLOYMENTS
-              value: '["app=chaos-exporter", "name=chaos-operator", "app=workflow-controller"]'
+              value: '["app=chaos-exporter", "name=chaos-operator", "app=workflow-controller", "app=event-tracker"]'
             - name: NODE_NAME
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
-            - name: SELF_AGENT_NODE_SELECTOR
-              value: ""
-            - name: SELF_AGENT_TOLERATIONS
-              value: ""
             - name: CHAOS_CENTER_UI_ENDPOINT
               value: ""
             - name: INGRESS
@@ -683,16 +675,18 @@ spec:
               value: "litmus-ingress"
             - name: CONTAINER_RUNTIME_EXECUTOR
               value: "k8sapi"
-            - name: HUB_BRANCH_NAME
-              value: "refactor-hub-3.0.0"
+            - name: DEFAULT_HUB_BRANCH_NAME
+              value: "master"
             - name: LITMUS_AUTH_GRPC_ENDPOINT
-              value: "litmusportal-auth-server-service.litmus.svc.cluster.local"
+              value: "litmusportal-auth-server-service"
             - name: LITMUS_AUTH_GRPC_PORT
               value: ":3030"
             - name: WORKFLOW_HELPER_IMAGE_VERSION
-              value: "3.0.0-beta9"
+              value: "3.0.0"
             - name: REMOTE_HUB_MAX_SIZE
               value: "5000000"
+            - name: INFRA_COMPATIBLE_VERSIONS
+              value: '["ci"]'
           ports:
             - containerPort: 8080
             - containerPort: 8000
@@ -755,7 +749,7 @@ spec:
             - name: ADMIN_PASSWORD
               value: "litmus"
             - name: LITMUS_GQL_GRPC_ENDPOINT
-              value: "litmusportal-server-service.litmus.svc.cluster.local"
+              value: "litmusportal-server-service"
             - name: LITMUS_GQL_GRPC_PORT
               value: ":8000"
           ports:

chaoscenter/web/src/components/PipelineDiagram/Nodes/ChaosExecutionNode/ChaosExecutionNode.tsx

@@ -132,7 +132,7 @@ function ChaosExecutionNode(props: ChaosExecutionNodeProps): JSX.Element {
               {
                 nodeName: props.name ?? props.data.name,
                 stepStatus: props.status as ExperimentRunFaultStatus,
-                chaosResult: props.data.chaosData?.chaosResult
+                chaosResult: props.data.chaosResult
               },
               {
                 useArrows: true,

chaoscenter/web/src/strings/strings.en.yaml

@@ -653,10 +653,7 @@ noKubernetesChaosInfrastructureFound: >-
 noLogs: Sorry, Logs are currently not available
 noMonitoredService: No monitoring services found for
 noProbeDescription: >-
-  Probes are pluggable checks that can be defined within the ChaosEngine for any
-  Chaos Fault. The experiment pods execute these checks based on the mode they
-  are defined in & factor their success as necessary conditions in
-  determining the verdict of the experiment
+  Probes are lightweight, self-contained scripts that can be run against Kubernetes applications to gather information about their behavior under stress and failure conditions.
 noProbeExecution: No Probe executions found
 noProbeExecutionDetails:
   subtitle: >-

chaoscenter/web/src/views/Environments/EnvironmentList/CreateEnvironment.tsx

@@ -156,7 +156,11 @@ export default function CreateEnvironment({
                       variation={ButtonVariation.SECONDARY}
                       text={getString('cancel')}
                     />
-                    <Button type="submit" variation={ButtonVariation.PRIMARY} text={getString('save')} />
+                    <Button
+                      onClick={() => formikProps.handleSubmit()}
+                      variation={ButtonVariation.PRIMARY}
+                      text={getString('save')}
+                    />
                   </Layout.Horizontal>
                 </Layout.Vertical>
               </Form>