Skip to content

Commit dd3a7ef

Browse files
SarthakJain26SarthakJain26
authored
added manifest changes for ci and 3.0.0 (#4195)
* added manifest changes for ci and 3.0.0 Signed-off-by: Sarthak Jain <[email protected]> * changed panic to fatal Signed-off-by: Sarthak Jain <[email protected]> * removed unused envs and code Signed-off-by: Sarthak Jain <[email protected]> --------- Signed-off-by: Sarthak Jain <[email protected]>
1 parent 48c2ee0 commit dd3a7ef

File tree

6 files changed

+46
-160
lines changed

6 files changed

+46
-160
lines changed

‎chaoscenter/authentication/api/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ func validatedAdminSetup(service services.ApplicationService) {
143143
if err != nil && err == utils.ErrUserExists {
144144
log.Println("Admin already exists in the database, not creating a new admin")
145145
} else if err != nil {
146-
log.Panicf("Unable to create admin, error: %v", err)
146+
log.Fatalf("Unable to create admin, error: %v", err)
147147
}
148148
}
149149

‎chaoscenter/graphql/server/pkg/self-deployer/start.go

Lines changed: 0 additions & 99 deletions
This file was deleted.

‎chaoscenter/manifests/litmus-cluster-scope.yaml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -647,8 +647,6 @@ spec:
647647
- secretRef:
648648
name: litmus-portal-admin-secret
649649
env:
650-
- name: SELF_AGENT
651-
value: "true"
652650
# if self-signed certificate are used pass the k8s tls secret name created in portal ns, to allow agents to use tls for communication
653651
- name: TLS_SECRET_NAME
654652
value: ""
@@ -667,23 +665,19 @@ spec:
667665
- name: ARGO_WORKFLOW_EXECUTOR_IMAGE
668666
value: "litmuschaos/argoexec:v3.3.1"
669667
- name: LITMUS_CHAOS_OPERATOR_IMAGE
670-
value: "litmuschaos/chaos-operator:3.0.0-beta3"
668+
value: "litmuschaos/chaos-operator:3.0.0-beta11"
671669
- name: LITMUS_CHAOS_RUNNER_IMAGE
672-
value: "litmuschaos/chaos-runner:3.0.0-beta3"
670+
value: "litmuschaos/chaos-runner:3.0.0-beta11"
673671
- name: LITMUS_CHAOS_EXPORTER_IMAGE
674-
value: "litmuschaos/chaos-exporter:3.0.0-beta3"
672+
value: "litmuschaos/chaos-exporter:3.0.0-beta11"
675673
- name: SERVER_SERVICE_NAME
676674
value: "litmusportal-server-service"
677675
- name: INFRA_DEPLOYMENTS
678-
value: '["app=chaos-exporter", "name=chaos-operator", "app=workflow-controller"]'
676+
value: '["app=chaos-exporter", "name=chaos-operator", "app=workflow-controller", "app=event-tracker"]'
679677
- name: NODE_NAME
680678
valueFrom:
681679
fieldRef:
682680
fieldPath: spec.nodeName
683-
- name: SELF_AGENT_NODE_SELECTOR
684-
value: ""
685-
- name: SELF_AGENT_TOLERATIONS
686-
value: ""
687681
- name: CHAOS_CENTER_UI_ENDPOINT
688682
value: ""
689683
- name: INGRESS
@@ -693,9 +687,7 @@ spec:
693687
- name: CONTAINER_RUNTIME_EXECUTOR
694688
value: "k8sapi"
695689
- name: DEFAULT_HUB_BRANCH_NAME
696-
value: "refactor-hub-3.0.0"
697-
- name: HUB_BRANCH_NAME
698-
value: "refactor-hub-3.0.0"
690+
value: "master"
699691
- name: LITMUS_AUTH_GRPC_ENDPOINT
700692
value: "litmusportal-auth-server-service.litmus.svc.cluster.local"
701693
- name: LITMUS_AUTH_GRPC_PORT
@@ -705,7 +697,7 @@ spec:
705697
- name: REMOTE_HUB_MAX_SIZE
706698
value: "5000000"
707699
- name: INFRA_COMPATIBLE_VERSIONS
708-
value: '["0.3.0", "0.2.0", "0.1.0","ci"]'
700+
value: '["ci"]'
709701
ports:
710702
- containerPort: 8080
711703
- containerPort: 8000

‎chaoscenter/manifests/litmus-namespaced-scope.yaml

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ metadata:
416416
name: litmus-portal-admin-config
417417
data:
418418
INFRA_SCOPE: namespace
419-
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
419+
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
420420
VERSION: "ci"
421421
SKIP_SSL_VERIFY: "false"
422422
---
@@ -425,7 +425,7 @@ kind: ConfigMap
425425
metadata:
426426
name: litmusportal-frontend-nginx-configuration
427427
data:
428-
default.conf: |
428+
nginx.conf: |
429429
pid /tmp/nginx.pid;
430430
431431
events {
@@ -539,10 +539,6 @@ spec:
539539
imagePullPolicy: Always
540540
ports:
541541
- containerPort: 8185
542-
volumeMounts:
543-
- name: nginx-config
544-
mountPath: /etc/nginx/nginx.conf
545-
subPath: nginx.conf
546542
resources:
547543
requests:
548544
memory: "250Mi"
@@ -552,6 +548,10 @@ spec:
552548
memory: "512Mi"
553549
cpu: "550m"
554550
ephemeral-storage: "1Gi"
551+
volumeMounts:
552+
- name: nginx-config
553+
mountPath: /etc/nginx/nginx.conf
554+
subPath: nginx.conf
555555
volumes:
556556
- name: nginx-config
557557
configMap:
@@ -595,7 +595,7 @@ spec:
595595
- name: graphql-server
596596
image: litmuschaos/litmusportal-server:ci
597597
volumeMounts:
598-
- mountPath: /tmp/gitops
598+
- mountPath: /tmp/
599599
name: gitops-storage
600600
- mountPath: /tmp/version
601601
name: hub-storage
@@ -618,19 +618,13 @@ spec:
618618
valueFrom:
619619
fieldRef:
620620
fieldPath: metadata.namespace
621-
- name: SELF_AGENT
622-
value: "true"
623-
- name: SELF_AGENT_NODE_SELECTOR
624-
value: ""
625-
- name: SELF_AGENT_TOLERATIONS
626-
value: ""
627621
# if self-signed certificate are used pass the base64 tls certificate, to allow agents to use tls for communication
628622
- name: TLS_CERT_B64
629623
value: ""
630624
- name: CHAOS_CENTER_SCOPE
631625
value: "namespace"
632626
- name: INFRA_DEPLOYMENTS
633-
value: '["app=chaos-exporter", "name=chaos-operator", "app=workflow-controller"]'
627+
value: '["app=chaos-exporter", "name=chaos-operator", "app=workflow-controller", "app=event-tracker"]'
634628
- name: SERVER_SERVICE_NAME
635629
value: "litmusportal-server-service"
636630
- name: CHAOS_CENTER_UI_ENDPOINT
@@ -644,15 +638,15 @@ spec:
644638
- name: ARGO_WORKFLOW_EXECUTOR_IMAGE
645639
value: "litmuschaos/argoexec:v3.3.1"
646640
- name: LITMUS_CHAOS_OPERATOR_IMAGE
647-
value: "litmuschaos/chaos-operator:3.0.0-beta3"
641+
value: "litmuschaos/chaos-operator:3.0.0-beta11"
648642
- name: LITMUS_CHAOS_RUNNER_IMAGE
649-
value: "litmuschaos/chaos-runner:3.0.0-beta3"
643+
value: "litmuschaos/chaos-runner:3.0.0-beta11"
650644
- name: LITMUS_CHAOS_EXPORTER_IMAGE
651-
value: "litmuschaos/chaos-exporter:3.0.0-beta3"
645+
value: "litmuschaos/chaos-exporter:3.0.0-beta11"
652646
- name: CONTAINER_RUNTIME_EXECUTOR
653647
value: "k8sapi"
654-
- name: HUB_BRANCH_NAME
655-
value: "refactor-hub-3.0.0"
648+
- name: DEFAULT_HUB_BRANCH_NAME
649+
value: "master"
656650
- name: LITMUS_AUTH_GRPC_ENDPOINT
657651
value: "litmusportal-auth-server-service"
658652
- name: LITMUS_AUTH_GRPC_PORT
@@ -665,6 +659,8 @@ spec:
665659
value: "false"
666660
- name: INGRESS_NAME
667661
value: "litmus-ingress"
662+
- name: INFRA_COMPATIBLE_VERSIONS
663+
value: '["ci"]'
668664
ports:
669665
- containerPort: 8080
670666
- containerPort: 8000

‎mkdocs/docs/3.0.0/litmus-3.0.0.yaml renamed to ‎mkdocs/docs/3.0.0/litmus-cluster-scope-3.0.0.yaml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,6 @@ metadata:
442442
data:
443443
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
444444
INFRA_SCOPE: cluster
445-
INFRA_NAMESPACE: litmus
446445
VERSION: "3.0.0"
447446
SKIP_SSL_VERIFY: "false"
448447
# Configurations if you are using dex for OAuth
@@ -665,23 +664,19 @@ spec:
665664
- name: ARGO_WORKFLOW_EXECUTOR_IMAGE
666665
value: "litmuschaos/argoexec:v3.3.1"
667666
- name: LITMUS_CHAOS_OPERATOR_IMAGE
668-
value: "litmuschaos/chaos-operator:3.0.0-beta10"
667+
value: "litmuschaos/chaos-operator:3.0.0"
669668
- name: LITMUS_CHAOS_RUNNER_IMAGE
670-
value: "litmuschaos/chaos-runner:3.0.0-beta10"
669+
value: "litmuschaos/chaos-runner:3.0.0"
671670
- name: LITMUS_CHAOS_EXPORTER_IMAGE
672-
value: "litmuschaos/chaos-exporter:3.0.0-beta10"
671+
value: "litmuschaos/chaos-exporter:3.0.0"
673672
- name: SERVER_SERVICE_NAME
674673
value: "litmusportal-server-service"
675674
- name: INFRA_DEPLOYMENTS
676-
value: '["app=chaos-exporter", "name=chaos-operator", "app=workflow-controller"]'
675+
value: '["app=chaos-exporter", "name=chaos-operator", "app=workflow-controller", "app=event-tracker"]'
677676
- name: NODE_NAME
678677
valueFrom:
679678
fieldRef:
680679
fieldPath: spec.nodeName
681-
- name: SELF_AGENT_NODE_SELECTOR
682-
value: ""
683-
- name: SELF_AGENT_TOLERATIONS
684-
value: ""
685680
- name: CHAOS_CENTER_UI_ENDPOINT
686681
value: ""
687682
- name: INGRESS
@@ -697,11 +692,11 @@ spec:
697692
- name: LITMUS_AUTH_GRPC_PORT
698693
value: ":3030"
699694
- name: WORKFLOW_HELPER_IMAGE_VERSION
700-
value: "3.0.0-beta10"
695+
value: "3.0.0"
701696
- name: REMOTE_HUB_MAX_SIZE
702697
value: "5000000"
703698
- name: INFRA_COMPATIBLE_VERSIONS
704-
value: '["0.3.0", "0.2.0", "0.1.0","ci"]'
699+
value: '["3.0.0"]'
705700
ports:
706701
- containerPort: 8080
707702
- containerPort: 8000

0 commit comments

Comments
 (0)