Skip to content

Commit

Permalink
Upgrading litmus portal to v1.11.0 (#2381)
Browse files Browse the repository at this point in the history
* Upgrading litmus portal v1.11.0

Signed-off-by: Raj Babu Das <[email protected]>

* Adding latest litmus crds

Signed-off-by: Raj Babu Das <[email protected]>

* Adding chaos operator labels

Signed-off-by: Raj Babu Das <[email protected]>

* Adding chaos operator labels

Signed-off-by: Raj Babu Das <[email protected]>
  • Loading branch information
imrajdas authored Dec 15, 2020
1 parent c117e31 commit d2a940b
Show file tree
Hide file tree
Showing 10 changed files with 389 additions and 131 deletions.
38 changes: 0 additions & 38 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ jobs:
echo 'export AUTHENTICATION_SERVER_IMAGE="litmusportal-auth-server"' >> workspace/env-vars
echo 'export FRONTEND_IMAGE="litmusportal-frontend"' >> workspace/env-vars
echo 'export SUBSCRIBER_IMAGE="litmusportal-subscriber"' >> workspace/env-vars
echo 'export FRONTEND_UNPRIVILEGED_IMAGE="litmusportal-unprivileged-frontend"' >> workspace/env-vars
echo 'export IMGTAG="ci"' >> workspace/env-vars
cat workspace/env-vars >> $BASH_ENV
source $BASH_ENV
Expand Down Expand Up @@ -110,28 +109,6 @@ jobs:
root: /tmp/workspace
paths:
- litmusportal-frontend.tar
docker-build-unprivileged-frontend:
machine:
image: circleci/classic:201808-01
resource_class: large
steps:
- attach_workspace:
at: /tmp/workspace
- run: |
cat /tmp/workspace/env-vars >> $BASH_ENV
source $BASH_ENV
- checkout
- run:
name: Build unprivileged frontend docker image
command: docker build . -f Dockerfile-Unprivileged -t ${REPONAME}/${FRONTEND_UNPRIVILEGED_IMAGE}:${IMGTAG}
working_directory: ~/project/litmus-portal/frontend
- run:
name: Save unprivileged frontend docker image
command: docker save -o /tmp/workspace/${FRONTEND_UNPRIVILEGED_IMAGE}.tar ${REPONAME}/${FRONTEND_UNPRIVILEGED_IMAGE}:${IMGTAG}
- persist_to_workspace:
root: /tmp/workspace
paths:
- litmusportal-unprivileged-frontend.tar
docker-push:
machine:
image: circleci/classic:201808-01
Expand All @@ -150,7 +127,6 @@ jobs:
docker load -i /tmp/workspace/${SUBSCRIBER_IMAGE}.tar
docker load -i /tmp/workspace/${AUTHENTICATION_SERVER_IMAGE}.tar
docker load -i /tmp/workspace/${FRONTEND_IMAGE}.tar
docker load -i /tmp/workspace/${FRONTEND_UNPRIVILEGED_IMAGE}.tar
- run:
name: Pushing graphql server image
command: bash ./hack/push --TYPE=ci --REPONAME=${REPONAME} --IMGNAME=${GRAPHQL_SERVER_IMAGE} --IMGTAG=${IMGTAG}
Expand All @@ -163,9 +139,6 @@ jobs:
- run:
name: Pushing subscriber server image
command: bash ./hack/push --TYPE=ci --REPONAME=${REPONAME} --IMGNAME=${SUBSCRIBER_IMAGE} --IMGTAG=${IMGTAG}
- run:
name: Pushing unprivileged frontend image
command: bash ./hack/push --TYPE=ci --REPONAME=${REPONAME} --IMGNAME=${FRONTEND_UNPRIVILEGED_IMAGE} --IMGTAG=${IMGTAG}
release:
machine:
image: circleci/classic:201808-01
Expand Down Expand Up @@ -231,21 +204,10 @@ workflows:
filters:
tags:
only: /.*/
- docker-build-unprivileged-frontend:
requires:
- setup-env
- backend-services-checks
- frontend-services-checks
filters:
branches:
only:
- master
- /^v.*/
- docker-push:
requires:
- docker-build-backend
- docker-build-frontend
- docker-build-unprivileged-frontend
filters:
branches:
only:
Expand Down
8 changes: 4 additions & 4 deletions litmus-portal/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ Litmus-Portal provides console and UI experience for managing, monitoring, and e
## **Installation**

#### Applying k8s manifest
> Alpha 2 (Stable)
> Beta 0 (Stable)
```bash
kubectl apply -f https://raw.githubusercontent.com/litmuschaos/litmus/v1.10.x/litmus-portal/cluster-k8s-manifest.yml
kubectl apply -f https://raw.githubusercontent.com/litmuschaos/litmus/v1.11.x/litmus-portal/cluster-k8s-manifest.yml
```

Or
Expand Down Expand Up @@ -78,9 +78,9 @@ View the User Guide <b>[here](https://docs.google.com/document/d/1fiN25BrZpvqg0U

### **Uninstallation**

> Alpha 1 (Stable)
> Beta 0 (Stable)
```bash
kubectl delete -f https://raw.githubusercontent.com/litmuschaos/litmus/v1.10.x/litmus-portal/cluster-k8s-manifest.yml
kubectl delete -f https://raw.githubusercontent.com/litmuschaos/litmus/v1.11.x/litmus-portal/cluster-k8s-manifest.yml
```

Or
Expand Down
4 changes: 2 additions & 2 deletions litmus-portal/cluster-k8s-manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,9 +164,9 @@ spec:
- name: ARGO_WORKFLOW_EXECUTOR_IMAGE
value: "argoproj/argoexec:v2.9.3"
- name: LITMUS_CHAOS_OPERATOR_IMAGE
value: "litmuschaos/chaos-operator:1.8.2"
value: "litmuschaos/chaos-operator:1.11.0"
- name: LITMUS_CHAOS_RUNNER_IMAGE
value: "litmuschaos/chaos-runner:1.8.2"
value: "litmuschaos/chaos-runner:1.11.0"
ports:
- containerPort: 8080
imagePullPolicy: Always
Expand Down
2 changes: 1 addition & 1 deletion litmus-portal/frontend/public/locales/en/translation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ welcomeModal:

sidebar:
title: Litmus
version: 'Version: 1.10'
version: 'Version: 1.11'

header:
notificationDropdown:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,7 @@ const WorkflowComparisonTable = () => {
const doc = new jsPDF('p', 'mm', 'a4'); // A4 size page of PDF
const position = -45;
doc.setFontSize(10);
doc.text('Litmus Portal Report Version: 1.10', 10, 10);
doc.text('Litmus Portal Report Version: 1.11', 10, 10);
doc.text('Time of Generation:', 10, 15);
doc.text(new Date().toString(), 42, 15);
doc.text(
Expand Down
Loading

0 comments on commit d2a940b

Please sign in to comment.