diff --git a/chaoscenter/manifests/litmus-cluster-scope.yaml b/chaoscenter/manifests/litmus-cluster-scope.yaml index e908e704ca..a5529adf2e 100644 --- a/chaoscenter/manifests/litmus-cluster-scope.yaml +++ b/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: diff --git a/chaoscenter/manifests/litmus-namespaced-scope.yaml b/chaoscenter/manifests/litmus-namespaced-scope.yaml index f60de36916..a9b1a811dd 100644 --- a/chaoscenter/manifests/litmus-namespaced-scope.yaml +++ b/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 diff --git a/chaoscenter/manifests/litmus-without-resources.yaml b/chaoscenter/manifests/litmus-without-resources.yaml index 66047e36d9..a2146da87b 100644 --- a/chaoscenter/manifests/litmus-without-resources.yaml +++ b/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: diff --git a/mkdocs/docs/3.0.0/litmus-3.0.0-without-resources.yaml b/mkdocs/docs/3.0.0/litmus-3.0.0-without-resources.yaml index 5b3cc71746..a88e1b8616 100644 --- a/mkdocs/docs/3.0.0/litmus-3.0.0-without-resources.yaml +++ b/mkdocs/docs/3.0.0/litmus-3.0.0-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: "3.0.0" 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 { @@ -656,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-beta10" + value: "litmuschaos/chaos-operator:3.0.0" - name: LITMUS_CHAOS_RUNNER_IMAGE - value: "litmuschaos/chaos-runner:3.0.0-beta10" + value: "litmuschaos/chaos-runner:3.0.0" - name: LITMUS_CHAOS_EXPORTER_IMAGE - value: "litmuschaos/chaos-exporter:3.0.0-beta10" + 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 @@ -684,13 +678,15 @@ 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-beta10" + value: "3.0.0" - name: REMOTE_HUB_MAX_SIZE value: "5000000" + - name: INFRA_COMPATIBLE_VERSIONS + value: '["ci"]' ports: - containerPort: 8080 - containerPort: 8000 @@ -753,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: diff --git a/mkdocs/docs/3.0.0/litmus-cluster-scope-3.0.0.yaml b/mkdocs/docs/3.0.0/litmus-cluster-scope-3.0.0.yaml index 5a46080b43..38da586262 100644 --- a/mkdocs/docs/3.0.0/litmus-cluster-scope-3.0.0.yaml +++ b/mkdocs/docs/3.0.0/litmus-cluster-scope-3.0.0.yaml @@ -440,8 +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 + 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: "3.0.0" SKIP_SSL_VERIFY: "false" # Configurations if you are using dex for OAuth @@ -688,7 +687,7 @@ 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 @@ -768,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: diff --git a/mkdocs/docs/3.0.0/litmus-namespaced-3.0.0.yaml b/mkdocs/docs/3.0.0/litmus-namespaced-3.0.0.yaml index c68abac5ca..b3a6ad013e 100644 --- a/mkdocs/docs/3.0.0/litmus-namespaced-3.0.0.yaml +++ b/mkdocs/docs/3.0.0/litmus-namespaced-3.0.0.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: "3.0.0" SKIP_SSL_VERIFY: "false"