Skip to content

Commit

Permalink
Update the artifacts yamls to match the naming conventions
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanprodan committed Oct 23, 2018
1 parent 667e915 commit 8e66baa
Show file tree
Hide file tree
Showing 28 changed files with 35 additions and 425 deletions.
6 changes: 3 additions & 3 deletions artifacts/canaries/canary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ spec:
- public-gateway.istio-system.svc.cluster.local
# Istio virtual service host names (optional)
hosts:
- app.istio.weavedx.com
- podinfo.iowa.weavedx.com
canaryAnalysis:
# max number of failed metric checks before rollback
threshold: 5
threshold: 10
# max traffic percentage routed to canary
# percentage (0-100)
maxWeight: 50
# canary increment step
# percentage (0-100)
stepWeight: 10
stepWeight: 5
metrics:
- name: istio_requests_total
# minimum req success rate (non 5xx responses)
Expand Down
2 changes: 1 addition & 1 deletion artifacts/flagger/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
serviceAccountName: flagger
containers:
- name: flagger
image: stefanprodan/flagger:0.1.0-alpha.2
image: stefanprodan/flagger:0.1.0-beta.2
imagePullPolicy: Always
ports:
- name: http
Expand Down
8 changes: 4 additions & 4 deletions artifacts/routing/match.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
- public-gateway.istio-system.svc.cluster.local
- mesh
hosts:
- app.istio.weavedx.com
- podinfo.iowa.weavedx.com
- podinfo
http:
- match:
Expand All @@ -17,18 +17,18 @@ spec:
regex: ^(?!.*Chrome)(?=.*\bSafari\b).*$
route:
- destination:
host: podinfo
host: podinfo-primary
port:
number: 9898
weight: 0
- destination:
host: podinfo-canary
host: podinfo
port:
number: 9898
weight: 100
- route:
- destination:
host: podinfo
host: podinfo-primary
port:
number: 9898
weight: 100
6 changes: 3 additions & 3 deletions artifacts/routing/mirror.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ spec:
- public-gateway.istio-system.svc.cluster.local
- mesh
hosts:
- app.istio.weavedx.com
- podinfo.iowa.weavedx.com
- podinfo
http:
- route:
- destination:
host: podinfo
host: podinfo-primary
port:
number: 9898
weight: 100
mirror:
host: podinfo-canary
host: podinfo
port:
number: 9898
6 changes: 3 additions & 3 deletions artifacts/routing/weight.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ spec:
- public-gateway.istio-system.svc.cluster.local
- mesh
hosts:
- app.istio.weavedx.com
- podinfo.iowa.weavedx.com
- podinfo
http:
- route:
- destination:
host: podinfo
host: podinfo-primary
port:
number: 9898
weight: 100
- destination:
host: podinfo-canary
host: podinfo
port:
number: 9898
weight: 0
8 changes: 4 additions & 4 deletions artifacts/workloads/canary-deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: podinfo-canary
name: podinfo
namespace: test
labels:
app: podinfo-canary
app: podinfo
spec:
replicas: 1
strategy:
Expand All @@ -13,13 +13,13 @@ spec:
type: RollingUpdate
selector:
matchLabels:
app: podinfo-canary
app: podinfo
template:
metadata:
annotations:
prometheus.io/scrape: "true"
labels:
app: podinfo-canary
app: podinfo
spec:
containers:
- name: podinfod
Expand Down
4 changes: 2 additions & 2 deletions artifacts/workloads/canary-hpa.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apiVersion: autoscaling/v2beta1
kind: HorizontalPodAutoscaler
metadata:
name: podinfo-canary
name: podinfo
namespace: test
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: podinfo-canary
name: podinfo
minReplicas: 2
maxReplicas: 3
metrics:
Expand Down
6 changes: 3 additions & 3 deletions artifacts/workloads/canary-service.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apiVersion: v1
kind: Service
metadata:
name: podinfo-canary
name: podinfo
namespace: test
labels:
app: podinfo-canary
app: podinfo
spec:
type: ClusterIP
selector:
app: podinfo-canary
app: podinfo
ports:
- name: http
port: 9898
Expand Down
8 changes: 4 additions & 4 deletions artifacts/workloads/primary-deployment.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: podinfo
name: podinfo-primary
namespace: test
labels:
app: podinfo
app: podinfo-primary
spec:
replicas: 1
strategy:
Expand All @@ -13,13 +13,13 @@ spec:
type: RollingUpdate
selector:
matchLabels:
app: podinfo
app: podinfo-primary
template:
metadata:
annotations:
prometheus.io/scrape: "true"
labels:
app: podinfo
app: podinfo-primary
spec:
containers:
- name: podinfod
Expand Down
4 changes: 2 additions & 2 deletions artifacts/workloads/primary-hpa.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apiVersion: autoscaling/v2beta1
kind: HorizontalPodAutoscaler
metadata:
name: podinfo
name: podinfo-primary
namespace: test
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
name: podinfo
name: podinfo-primary
minReplicas: 2
maxReplicas: 4
metrics:
Expand Down
6 changes: 3 additions & 3 deletions artifacts/workloads/primary-service.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apiVersion: v1
kind: Service
metadata:
name: podinfo
name: podinfo-primary
namespace: test
labels:
app: podinfo
app: podinfo-primary
spec:
type: ClusterIP
selector:
app: podinfo
app: podinfo-primary
ports:
- name: http
port: 9898
Expand Down
6 changes: 3 additions & 3 deletions artifacts/workloads/virtual-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ spec:
- public-gateway.istio-system.svc.cluster.local
- mesh
hosts:
- app.istio.weavedx.com
- podinfo.istio.weavedx.com
- podinfo
http:
- route:
- destination:
host: podinfo
host: podinfo-primary
port:
number: 9898
weight: 100
- destination:
host: podinfo-canary
host: podinfo
port:
number: 9898
weight: 0
Expand Down
21 changes: 0 additions & 21 deletions charts/podinfo-flagger/.helmignore

This file was deleted.

12 changes: 0 additions & 12 deletions charts/podinfo-flagger/Chart.yaml

This file was deleted.

56 changes: 0 additions & 56 deletions charts/podinfo-flagger/README.md

This file was deleted.

1 change: 0 additions & 1 deletion charts/podinfo-flagger/templates/NOTES.txt

This file was deleted.

36 changes: 0 additions & 36 deletions charts/podinfo-flagger/templates/_helpers.tpl

This file was deleted.

Loading

0 comments on commit 8e66baa

Please sign in to comment.