fix: Added minor changes for 3.0.0 artifacts (#4212)

* Added minor changes

Signed-off-by: Jonsy13 <vedant.shrotria@harness.io>

* Added minor changes

Signed-off-by: Jonsy13 <vedant.shrotria@harness.io>

---------

Signed-off-by: Jonsy13 <vedant.shrotria@harness.io>
This commit is contained in:
Vedant Shrotria 2023-10-04 19:10:18 +05:30 committed by GitHub
parent 835a670ea4
commit 5c36d14fb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 40 additions and 55 deletions

View File

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

View File

@ -415,7 +415,6 @@ kind: ConfigMap
metadata: metadata:
name: litmus-portal-admin-config name: litmus-portal-admin-config
data: 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 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" VERSION: "ci"
SKIP_SSL_VERIFY: "false" SKIP_SSL_VERIFY: "false"
@ -638,11 +637,11 @@ spec:
- name: ARGO_WORKFLOW_EXECUTOR_IMAGE - name: ARGO_WORKFLOW_EXECUTOR_IMAGE
value: "litmuschaos/argoexec:v3.3.1" value: "litmuschaos/argoexec:v3.3.1"
- name: LITMUS_CHAOS_OPERATOR_IMAGE - 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 - 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 - name: LITMUS_CHAOS_EXPORTER_IMAGE
value: "litmuschaos/chaos-exporter:3.0.0-beta11" value: "litmuschaos/chaos-exporter:3.0.0"
- name: CONTAINER_RUNTIME_EXECUTOR - name: CONTAINER_RUNTIME_EXECUTOR
value: "k8sapi" value: "k8sapi"
- name: DEFAULT_HUB_BRANCH_NAME - name: DEFAULT_HUB_BRANCH_NAME
@ -652,7 +651,7 @@ spec:
- name: LITMUS_AUTH_GRPC_PORT - name: LITMUS_AUTH_GRPC_PORT
value: ":3030" value: ":3030"
- name: WORKFLOW_HELPER_IMAGE_VERSION - name: WORKFLOW_HELPER_IMAGE_VERSION
value: "3.0.0-beta9" value: "3.0.0"
- name: REMOTE_HUB_MAX_SIZE - name: REMOTE_HUB_MAX_SIZE
value: "5000000" value: "5000000"
- name: INGRESS - name: INGRESS

View File

@ -1,6 +1,6 @@
### RBAC Manifests ### RBAC Manifests
## If SELF_AGENT="true" then these permissions are required to apply ## 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 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
@ -440,9 +440,7 @@ metadata:
name: litmus-portal-admin-config name: litmus-portal-admin-config
namespace: litmus namespace: litmus
data: 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 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
AGENT_SCOPE: cluster
AGENT_NAMESPACE: litmus
VERSION: "ci" VERSION: "ci"
SKIP_SSL_VERIFY: "false" SKIP_SSL_VERIFY: "false"
# Configurations if you are using dex for OAuth # Configurations if you are using dex for OAuth
@ -459,7 +457,7 @@ metadata:
name: litmusportal-frontend-nginx-configuration name: litmusportal-frontend-nginx-configuration
namespace: litmus namespace: litmus
data: data:
default.conf: | nginx.conf: |
pid /tmp/nginx.pid; pid /tmp/nginx.pid;
events { events {
@ -638,8 +636,6 @@ spec:
- secretRef: - secretRef:
name: litmus-portal-admin-secret name: litmus-portal-admin-secret
env: 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 # 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 - name: TLS_SECRET_NAME
value: "" value: ""
@ -658,23 +654,19 @@ spec:
- name: ARGO_WORKFLOW_EXECUTOR_IMAGE - name: ARGO_WORKFLOW_EXECUTOR_IMAGE
value: "litmuschaos/argoexec:v3.3.1" value: "litmuschaos/argoexec:v3.3.1"
- name: LITMUS_CHAOS_OPERATOR_IMAGE - 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 - 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 - name: LITMUS_CHAOS_EXPORTER_IMAGE
value: "litmuschaos/chaos-exporter:3.0.0-beta3" value: "litmuschaos/chaos-exporter:3.0.0"
- name: SERVER_SERVICE_NAME - name: SERVER_SERVICE_NAME
value: "litmusportal-server-service" value: "litmusportal-server-service"
- name: INFRA_DEPLOYMENTS - 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 - name: NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: SELF_AGENT_NODE_SELECTOR
value: ""
- name: SELF_AGENT_TOLERATIONS
value: ""
- name: CHAOS_CENTER_UI_ENDPOINT - name: CHAOS_CENTER_UI_ENDPOINT
value: "" value: ""
- name: INGRESS - name: INGRESS
@ -683,16 +675,18 @@ spec:
value: "litmus-ingress" value: "litmus-ingress"
- name: CONTAINER_RUNTIME_EXECUTOR - name: CONTAINER_RUNTIME_EXECUTOR
value: "k8sapi" value: "k8sapi"
- name: HUB_BRANCH_NAME - name: DEFAULT_HUB_BRANCH_NAME
value: "refactor-hub-3.0.0" value: "master"
- name: LITMUS_AUTH_GRPC_ENDPOINT - name: LITMUS_AUTH_GRPC_ENDPOINT
value: "litmusportal-auth-server-service.litmus.svc.cluster.local" value: "litmusportal-auth-server-service"
- name: LITMUS_AUTH_GRPC_PORT - name: LITMUS_AUTH_GRPC_PORT
value: ":3030" value: ":3030"
- name: WORKFLOW_HELPER_IMAGE_VERSION - name: WORKFLOW_HELPER_IMAGE_VERSION
value: "3.0.0-beta9" value: "3.0.0"
- name: REMOTE_HUB_MAX_SIZE - name: REMOTE_HUB_MAX_SIZE
value: "5000000" value: "5000000"
- name: INFRA_COMPATIBLE_VERSIONS
value: '["ci"]'
ports: ports:
- containerPort: 8080 - containerPort: 8080
- containerPort: 8000 - containerPort: 8000
@ -755,7 +749,7 @@ spec:
- name: ADMIN_PASSWORD - name: ADMIN_PASSWORD
value: "litmus" value: "litmus"
- name: LITMUS_GQL_GRPC_ENDPOINT - name: LITMUS_GQL_GRPC_ENDPOINT
value: "litmusportal-server-service.litmus.svc.cluster.local" value: "litmusportal-server-service"
- name: LITMUS_GQL_GRPC_PORT - name: LITMUS_GQL_GRPC_PORT
value: ":8000" value: ":8000"
ports: ports:

View File

@ -1,6 +1,6 @@
### RBAC Manifests ### RBAC Manifests
## If SELF_AGENT="true" then these permissions are required to apply ## 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 apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole kind: ClusterRole
@ -440,9 +440,7 @@ metadata:
name: litmus-portal-admin-config name: litmus-portal-admin-config
namespace: litmus namespace: litmus
data: 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 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
AGENT_SCOPE: cluster
AGENT_NAMESPACE: litmus
VERSION: "3.0.0" VERSION: "3.0.0"
SKIP_SSL_VERIFY: "false" SKIP_SSL_VERIFY: "false"
# Configurations if you are using dex for OAuth # Configurations if you are using dex for OAuth
@ -459,7 +457,7 @@ metadata:
name: litmusportal-frontend-nginx-configuration name: litmusportal-frontend-nginx-configuration
namespace: litmus namespace: litmus
data: data:
default.conf: | nginx.conf: |
pid /tmp/nginx.pid; pid /tmp/nginx.pid;
events { events {
@ -656,23 +654,19 @@ spec:
- name: ARGO_WORKFLOW_EXECUTOR_IMAGE - name: ARGO_WORKFLOW_EXECUTOR_IMAGE
value: "litmuschaos/argoexec:v3.3.1" value: "litmuschaos/argoexec:v3.3.1"
- name: LITMUS_CHAOS_OPERATOR_IMAGE - 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 - 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 - name: LITMUS_CHAOS_EXPORTER_IMAGE
value: "litmuschaos/chaos-exporter:3.0.0-beta10" value: "litmuschaos/chaos-exporter:3.0.0"
- name: SERVER_SERVICE_NAME - name: SERVER_SERVICE_NAME
value: "litmusportal-server-service" value: "litmusportal-server-service"
- name: INFRA_DEPLOYMENTS - 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 - name: NODE_NAME
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.nodeName fieldPath: spec.nodeName
- name: SELF_AGENT_NODE_SELECTOR
value: ""
- name: SELF_AGENT_TOLERATIONS
value: ""
- name: CHAOS_CENTER_UI_ENDPOINT - name: CHAOS_CENTER_UI_ENDPOINT
value: "" value: ""
- name: INGRESS - name: INGRESS
@ -684,13 +678,15 @@ spec:
- name: DEFAULT_HUB_BRANCH_NAME - name: DEFAULT_HUB_BRANCH_NAME
value: "master" value: "master"
- name: LITMUS_AUTH_GRPC_ENDPOINT - name: LITMUS_AUTH_GRPC_ENDPOINT
value: "litmusportal-auth-server-service.litmus.svc.cluster.local" value: "litmusportal-auth-server-service"
- name: LITMUS_AUTH_GRPC_PORT - name: LITMUS_AUTH_GRPC_PORT
value: ":3030" value: ":3030"
- name: WORKFLOW_HELPER_IMAGE_VERSION - name: WORKFLOW_HELPER_IMAGE_VERSION
value: "3.0.0-beta10" value: "3.0.0"
- name: REMOTE_HUB_MAX_SIZE - name: REMOTE_HUB_MAX_SIZE
value: "5000000" value: "5000000"
- name: INFRA_COMPATIBLE_VERSIONS
value: '["ci"]'
ports: ports:
- containerPort: 8080 - containerPort: 8080
- containerPort: 8000 - containerPort: 8000
@ -753,7 +749,7 @@ spec:
- name: ADMIN_PASSWORD - name: ADMIN_PASSWORD
value: "litmus" value: "litmus"
- name: LITMUS_GQL_GRPC_ENDPOINT - name: LITMUS_GQL_GRPC_ENDPOINT
value: "litmusportal-server-service.litmus.svc.cluster.local" value: "litmusportal-server-service"
- name: LITMUS_GQL_GRPC_PORT - name: LITMUS_GQL_GRPC_PORT
value: ":8000" value: ":8000"
ports: ports:

View File

@ -440,8 +440,7 @@ metadata:
name: litmus-portal-admin-config name: litmus-portal-admin-config
namespace: litmus namespace: litmus
data: 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 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
INFRA_SCOPE: cluster
VERSION: "3.0.0" VERSION: "3.0.0"
SKIP_SSL_VERIFY: "false" SKIP_SSL_VERIFY: "false"
# Configurations if you are using dex for OAuth # Configurations if you are using dex for OAuth
@ -688,7 +687,7 @@ spec:
- name: DEFAULT_HUB_BRANCH_NAME - name: DEFAULT_HUB_BRANCH_NAME
value: "master" value: "master"
- name: LITMUS_AUTH_GRPC_ENDPOINT - name: LITMUS_AUTH_GRPC_ENDPOINT
value: "litmusportal-auth-server-service.litmus.svc.cluster.local" value: "litmusportal-auth-server-service"
- name: LITMUS_AUTH_GRPC_PORT - name: LITMUS_AUTH_GRPC_PORT
value: ":3030" value: ":3030"
- name: WORKFLOW_HELPER_IMAGE_VERSION - name: WORKFLOW_HELPER_IMAGE_VERSION
@ -768,7 +767,7 @@ spec:
- name: ADMIN_PASSWORD - name: ADMIN_PASSWORD
value: "litmus" value: "litmus"
- name: LITMUS_GQL_GRPC_ENDPOINT - name: LITMUS_GQL_GRPC_ENDPOINT
value: "litmusportal-server-service.litmus.svc.cluster.local" value: "litmusportal-server-service"
- name: LITMUS_GQL_GRPC_PORT - name: LITMUS_GQL_GRPC_PORT
value: ":8000" value: ":8000"
resources: resources:

View File

@ -415,7 +415,6 @@ kind: ConfigMap
metadata: metadata:
name: litmus-portal-admin-config name: litmus-portal-admin-config
data: 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 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" VERSION: "3.0.0"
SKIP_SSL_VERIFY: "false" SKIP_SSL_VERIFY: "false"