Merge pull request #19 from keptn-sandbox/patch/fix-docs

Patch/fix docs
keptn-sandbox · Dec 9, 2020 · 7d64c75 · 7d64c75
2 parents 1aebb5f + b27c1b6
commit 7d64c75
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 231 deletions.
diff --git a/README.md b/README.md
@@ -13,7 +13,8 @@ the [LitmusChaos](https://litmuschaos.io) framework.
 | Keptn Version    | [litmus-service Docker Image](https://hub.docker.com/r/keptnsandbox/litmus-service/tags) |
 |:----------------:|:----------------------------------------:|
 |       0.7.1      | keptnsandbox/litmus-service:0.1.0 |
-|       0.7.2      | TBD |
+|       0.7.2      | keptnsandbox/litmus-service:0.1.0 |
+|       0.7.3      | keptnsandbox/litmus-service:0.1.0 |
 
 
 ## Prerequisites

diff --git a/test-data/carts-db/Chart.yaml b/test-data/carts-db/Chart.yaml
diff --git a/test-data/carts-db/templates/carts-db-deployment.yaml b/test-data/carts-db/templates/carts-db-deployment.yaml
diff --git a/test-data/carts-db/templates/carts-db-service.yaml b/test-data/carts-db/templates/carts-db-service.yaml
diff --git a/test-data/carts-db/values.yaml b/test-data/carts-db/values.yaml
diff --git a/test-data/carts/Chart.yaml b/test-data/carts/Chart.yaml
diff --git a/test-data/carts/templates/deployment.yaml b/test-data/carts/templates/deployment.yaml
diff --git a/test-data/carts/templates/service.yaml b/test-data/carts/templates/service.yaml
diff --git a/test-data/carts/values.yaml b/test-data/carts/values.yaml
diff --git a/test-data/helloservice/deploy-event.json b/test-data/helloservice/deploy-event.json
@@ -12,7 +12,7 @@
     "stage": "",
     "valuesCanary": {
       "image": "jetzlstorfer/hello-server:v0.1.0",
-      "replicaCount": 1
+      "replicaCount": 3
     }
   },
   "source": "https://github.com/keptn/keptn/cli#configuration-change",

diff --git a/test-data/helloservice/helm/templates/service.yaml b/test-data/helloservice/helm/templates/service.yaml
@@ -12,4 +12,3 @@ spec:
     port: 80
     protocol: TCP
     targetPort: 9000
-  type: LoadBalancer
diff --git a/test-data/helloservice/setup.sh b/test-data/helloservice/setup.sh
diff --git a/test-data/setup.sh b/test-data/setup.sh
@@ -6,31 +6,40 @@
 # 3. configure Istio + Keptn  shttps://tutorials.keptn.sh/tutorials/keptn-full-tour-prometheus-07/index.html?index=..%2F..index#5
 # 4. connect the Keptn CLI to the cluster https://tutorials.keptn.sh/tutorials/keptn-full-tour-prometheus-07/index.html?index=..%2F..index#6 
 
+## CREATE PROJECT
 keptn create project litmus --shipyard=./shipyard.yaml
 
-keptn onboard service carts-db --chart=./carts-db/ --project=litmus
+## ONBOARD SERVICE
+keptn onboard service helloservice --chart=./helloservice/helm/ --project=litmus
 
-keptn onboard service carts --chart=./carts --project=litmus
+## ADD JMETER TESTS & CONFIG
+keptn add-resource --project=litmus --stage=chaos --service=helloservice --resource=helloservice/jmeter/load.jmx --resourceUri=jmeter/load.jmx
 
-keptn send event new-artifact --project=litmus --service=carts-db --image=docker.io/mongo --tag=4.2.2
+keptn add-resource --project=litmus --stage=chaos --service=helloservice --resource=helloservice/jmeter/jmeter.conf.yaml --resourceUri=jmeter/jmeter.conf.yaml
 
-keptn send event new-artifact --project=litmus --service=carts --image=docker.io/keptnexamples/carts --tag=0.11.1
+## ADD QUALITY GATE
+keptn add-resource --project=litmus --stage=chaos --service=helloservice --resource=helloservice/prometheus/sli.yaml --resourceUri=prometheus/sli.yaml
 
-keptn add-resource --project=litmus --stage=chaos --service=carts --resource=jmeter/load.jmx --resourceUri=jmeter/load.jmx
+keptn add-resource --project=litmus --stage=chaos --service=helloservice --resource=helloservice/slo.yaml --resourceUri=slo.yaml
 
-keptn add-resource --project=litmus --stage=chaos --service=carts --resource=jmeter/jmeter.conf.yaml --resourceUri=jmeter/jmeter.conf.yaml
+## ADD LITMUS EXPERIMENT
+keptn add-resource --project=litmus --stage=chaos --service=helloservice --resource=helloservice/litmus/experiment.yaml --resourceUri=litmus/experiment.yaml
 
+
+## ADD PROMETHEUS
 kubectl apply -f https://raw.githubusercontent.com/keptn-contrib/prometheus-service/release-0.3.5/deploy/service.yaml
 
 kubectl apply -f https://raw.githubusercontent.com/keptn-contrib/prometheus-sli-service/release-0.2.2/deploy/service.yaml
 
-keptn add-resource --project=litmus --stage=chaos --service=carts --resource=prometheus/sli.yaml --resourceUri=prometheus/sli.yaml 
+keptn configure monitoring prometheus --project=litmus --service=helloservice
+
+kubectl apply -f helloservice/prometheus/blackbox-exporter.yaml
 
-keptn add-resource --project=litmus --stage=chaos --service=carts --resource=slo.yaml --resourceUri=slo.yaml
+kubectl apply -f helloservice/prometheus/prometheus-server-conf-cm.yaml
 
-keptn configure monitoring prometheus --project=litmus --service=carts
+kubectl delete pod -l app=prometheus-server -n monitoring
 
-# Litmus PreReq Begins!! 
+### LITMUS  Begins!! 
 
 ## install litmus operator & chaos CRDs 
 
@@ -47,9 +56,11 @@ kubectl apply -f litmus/pod-delete-rbac.yaml
 # Litmus PreReq End!! 
 
 ## now we also have to add the chaos tests - ATTENTION right now this file is empty!
-keptn add-resource --project=litmus --stage=chaos --service=carts --resource=litmus/experiment.yaml --resourceUri=litmus/experiment.yaml
+keptn add-resource --project=litmus --stage=chaos --service=carts --resource=helloservice/litmus/experiment.yaml --resourceUri=litmus/experiment.yaml
 
 
-# now test with a a new-artifact event
-keptn send event new-artifact --project=litmus --service=carts --image=docker.io/keptnexamples/carts --tag=0.11.3
+## first deployment event
+keptn send event new-artifact --project=litmus --service=helloservice --image=jetzlstorfer/hello-server:v0.1.1 
 
+## second deployment event (able to scale by editing the deploy-event.json)
+keptn send event -f test-data/helloservice/deploy-event.json
diff --git a/test-data/slo.yaml b/test-data/slo.yaml