Skip to content

Commit f7c3a91

Browse files
ejsmithejsmith
committed
Update CSP rules
1 parent f347266 commit f7c3a91

File tree

14 files changed

+102
-99
lines changed

14 files changed

+102
-99
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@ jobs:
8585
az login --service-principal --username ${{ secrets.AZ_USERNAME }} --password ${{ secrets.AZ_PASSWORD }} --tenant ${{ secrets.AZ_TENANT }} --output none
8686
az aks get-credentials --resource-group exceptionless-v6 --name ex-k8s-v6
8787
sed -i "s/^appVersion:.*$/appVersion: '${VERSION}'/" ./k8s/exceptionless/Chart.yaml
88-
helm upgrade --set "api.image.tag=${VERSION}" --set "jobs.image.tag=${VERSION}" --reuse-values --values ./k8s/ex-dev-values.yaml ex-dev --namespace ex-dev ./k8s/exceptionless
88+
helm upgrade --set "version=${VERSION}" --reuse-values --values ./k8s/ex-dev-values.yaml ex-dev --namespace ex-dev ./k8s/exceptionless
8989
- name: Deploy Changes to Production Environment
9090
if: "${{ env.DOCKER_USERNAME != '' && startsWith(github.ref, 'refs/tags/v') && github.event_name != 'pull_request' }}"
9191
run: |
9292
az login --service-principal --username ${{ secrets.AZ_USERNAME }} --password ${{ secrets.AZ_PASSWORD }} --tenant ${{ secrets.AZ_TENANT }} --output none
9393
az aks get-credentials --resource-group exceptionless-v6 --name ex-k8s-v6
9494
sed -i "s/^appVersion:.*$/appVersion: '${VERSION}'/" ./k8s/exceptionless/Chart.yaml
95-
helm upgrade --set "api.image.tag=${VERSION}" --set "jobs.image.tag=${VERSION}" --reuse-values --values ./k8s/ex-prod-values.yaml ex-prod --namespace ex-prod ./k8s/exceptionless
95+
helm upgrade --set "version=${VERSION}" --reuse-values --values ./k8s/ex-prod-values.yaml ex-prod --namespace ex-prod ./k8s/exceptionless

‎k8s/ex-dev-tasks.ps1‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@ helm repo update
4848
helm upgrade ex-dev-redis bitnami/redis --values ex-dev-redis-values.yaml --namespace ex-dev
4949

5050
# upgrade exceptionless app to a new docker image tag
51-
$APP_TAG="2.8.1502-pre"
52-
$API_TAG="6.0.3534-pre"
53-
helm upgrade --set "api.image.tag=$API_TAG" --set "jobs.image.tag=$API_TAG" --reuse-values ex-dev .\exceptionless
51+
$VERSION="8.0.0"
52+
helm upgrade --set "version=$VERSION" --reuse-values ex-dev .\exceptionless
5453

5554
# upgrade exceptionless app to set a new env variable
5655
helm upgrade `
@@ -66,12 +65,9 @@ helm upgrade `
6665

6766
helm upgrade --set "redis.connectionString=$REDIS_CONNECTIONSTRING" --reuse-values ex-dev --namespace ex-dev .\exceptionless
6867
helm upgrade --reuse-values ex-dev --namespace ex-dev .\exceptionless --dry-run | code-insiders -
69-
$APP_TAG="2.9.3-alpha.0.1"
70-
$API_TAG="6.1.4-alpha.0.11"
68+
$VERSION="8.0.0"
7169
helm upgrade ex-dev .\exceptionless --namespace ex-dev --values ex-dev-values.yaml `
72-
--set "app.image.tag=$APP_TAG" `
73-
--set "api.image.tag=$API_TAG" `
74-
--set "jobs.image.tag=$API_TAG" `
70+
--set "version=$VERSION" `
7571
--set "elasticsearch.connectionString=$ELASTIC_CONNECTIONSTRING" `
7672
--set "email.connectionString=$EMAIL_CONNECTIONSTRING" `
7773
--set "queue.connectionString=$QUEUE_CONNECTIONSTRING" `
@@ -84,7 +80,6 @@ helm upgrade ex-dev .\exceptionless --namespace ex-dev --values ex-dev-values.ya
8480
# stop the entire app
8581
kubectl scale deployment/ex-dev-app --replicas=0 --namespace ex-dev
8682
kubectl scale deployment/ex-dev-api --replicas=0 --namespace ex-dev
87-
kubectl scale deployment/ex-dev-collector --replicas=0 --namespace ex-dev
8883
kubectl scale deployment/ex-dev-jobs-close-inactive-sessions --replicas=0 --namespace ex-dev
8984
kubectl scale deployment/ex-dev-jobs-daily-summary --replicas=0 --namespace ex-dev
9085
kubectl scale deployment/ex-dev-jobs-event-notifications --replicas=0 --namespace ex-dev
@@ -103,7 +98,6 @@ kubectl patch cronjob/ex-dev-jobs-migration -p '{\"spec\":{\"suspend\": true}}'
10398
# resume the app
10499
kubectl scale deployment/ex-dev-app --replicas=1 --namespace ex-dev
105100
kubectl scale deployment/ex-dev-api --replicas=1 --namespace ex-dev
106-
kubectl scale deployment/ex-dev-collector --replicas=1 --namespace ex-dev
107101
kubectl scale deployment/ex-dev-jobs-close-inactive-sessions --replicas=1 --namespace ex-dev
108102
kubectl scale deployment/ex-dev-jobs-daily-summary --replicas=1 --namespace ex-dev
109103
kubectl scale deployment/ex-dev-jobs-event-notifications --replicas=1 --namespace ex-dev

‎k8s/ex-dev-values.yaml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ appScope: dev
33
app:
44
replicaCount: 0
55
image:
6-
repository: exceptionless/ui-ci
6+
repository: exceptionless/app-ci
77
defaultDomain: dev-app.exceptionless.io
88
domains:
99
- dev-app.exceptionless.io
10-
collector:
10+
api:
1111
replicaCount: 0
12+
image:
13+
repository: exceptionless/api-ci
1214
defaultDomain: dev-collector.exceptionless.io
1315
domains:
1416
- dev-collector.exceptionless.io

‎k8s/ex-prod-tasks.ps1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ kubectl apply --namespace ex-prod -f ex-prod-elasticsearch.yaml
8787
kubectl apply --namespace ex-prod -f ex-prod-monitor.yaml
8888

8989
# upgrade exceptionless app to a new docker image tag
90-
$API_TAG="7.0.7"
91-
helm upgrade --set "api.image.tag=$API_TAG" --set "jobs.image.tag=$API_TAG" --reuse-values ex-prod --namespace ex-prod .\exceptionless
90+
$VERSION="8.0.0"
91+
helm upgrade --set "version=$VERSION" --reuse-values ex-prod --namespace ex-prod .\exceptionless
9292
helm upgrade --reuse-values ex-prod --namespace ex-prod .\exceptionless
9393
# see what an upgrade will do
9494
helm diff upgrade --reuse-values ex-prod --namespace ex-prod .\exceptionless
@@ -114,8 +114,8 @@ helm upgrade `
114114
--reuse-values ex-prod --namespace ex-prod .\exceptionless
115115

116116
# stop the entire app
117+
kubectl scale deployment/ex-prod-app --replicas=0 --namespace ex-prod
117118
kubectl scale deployment/ex-prod-api --replicas=0 --namespace ex-prod
118-
kubectl scale deployment/ex-prod-collector --replicas=0 --namespace ex-prod
119119
kubectl scale deployment/ex-prod-jobs-close-inactive-sessions --replicas=0 --namespace ex-prod
120120
kubectl scale deployment/ex-prod-jobs-daily-summary --replicas=0 --namespace ex-prod
121121
kubectl scale deployment/ex-prod-jobs-event-notifications --replicas=0 --namespace ex-prod
@@ -136,8 +136,8 @@ kubectl patch cronjob/ex-prod-jobs-organization-snapshot -p '{\"spec\":{\"suspen
136136
kubectl patch cronjob/ex-prod-jobs-stack-snapshot -p '{\"spec\":{\"suspend\": true}}' --namespace ex-prod
137137

138138
# resume the app
139+
kubectl scale deployment/ex-prod-app --replicas=5 --namespace ex-prod
139140
kubectl scale deployment/ex-prod-api --replicas=5 --namespace ex-prod
140-
kubectl scale deployment/ex-prod-collector --replicas=5 --namespace ex-prod
141141
kubectl scale deployment/ex-prod-jobs-close-inactive-sessions --replicas=1 --namespace ex-prod
142142
kubectl scale deployment/ex-prod-jobs-daily-summary --replicas=1 --namespace ex-prod
143143
kubectl scale deployment/ex-prod-jobs-event-notifications --replicas=2 --namespace ex-prod

‎k8s/ex-prod-values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ app:
77
- be.exceptionless.io
88
- app.exceptionless.io
99
- app.exceptionless.com
10-
collector:
10+
api:
1111
replicaCount: 5
1212
defaultDomain: collector.exceptionless.io
1313
domains:

‎k8s/ex-setup.ps1‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,9 @@ helm repo add bitnami https://charts.bitnami.com/bitnami
138138
helm install ex-$ENV-redis bitnami/redis --values ex-$ENV-redis-values.yaml --namespace ex-$ENV
139139

140140
# install exceptionless app
141-
$APP_TAG="2.8.1-alpha.0.45"
142-
$API_TAG="6.1.1-alpha.0.81"
141+
$VERSION="8.0.0"
143142
helm install ex-$ENV .\exceptionless --namespace ex-$ENV --values ex-$ENV-values.yaml `
144-
--set "app.image.tag=$APP_TAG" `
145-
--set "api.image.tag=$API_TAG" `
146-
--set "jobs.image.tag=$API_TAG" `
143+
--set "version=$VERSION" `
147144
--set "elasticsearch.connectionString=$ELASTIC_CONNECTIONSTRING" `
148145
--set "email.connectionString=$EMAIL_CONNECTIONSTRING" `
149146
--set "queue.connectionString=$QUEUE_CONNECTIONSTRING" `

‎k8s/exceptionless/templates/collector.yaml‎ renamed to ‎k8s/exceptionless/templates/api.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
apiVersion: apps/v1
22
kind: Deployment
33
metadata:
4-
name: {{ template "exceptionless.fullname" . }}-collector
4+
name: {{ template "exceptionless.fullname" . }}-api
55
labels:
66
app: {{ template "exceptionless.name" . }}
7-
component: {{ template "exceptionless.fullname" . }}-collector
7+
component: {{ template "exceptionless.fullname" . }}-api
88
tier: {{ template "exceptionless.fullname" . }}-api
99
chart: {{ template "exceptionless.chart" . }}
1010
release: {{ .Release.Name }}
1111
heritage: {{ .Release.Service }}
1212
spec:
13-
replicas: {{ .Values.collector.replicaCount }}
13+
replicas: {{ .Values.api.replicaCount }}
1414
selector:
1515
matchLabels:
16-
component: {{ template "exceptionless.fullname" . }}-collector
16+
component: {{ template "exceptionless.fullname" . }}-api
1717
template:
1818
metadata:
1919
labels:
2020
app: {{ template "exceptionless.name" . }}
21-
component: {{ template "exceptionless.fullname" . }}-collector
21+
component: {{ template "exceptionless.fullname" . }}-api
2222
tier: {{ template "exceptionless.fullname" . }}-api
2323
chart: {{ template "exceptionless.chart" . }}
2424
release: {{ .Release.Name }}
@@ -27,8 +27,8 @@ spec:
2727
checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }}
2828
spec:
2929
containers:
30-
- name: {{ template "exceptionless.name" . }}-collector
31-
image: "{{ .Values.api.image.repository }}:{{ .Values.api.image.tag }}"
30+
- name: {{ template "exceptionless.name" . }}-api
31+
image: "{{ .Values.api.image.repository }}:{{ .Values.version }}"
3232
imagePullPolicy: {{ .Values.api.image.pullPolicy }}
3333
livenessProbe:
3434
httpGet:
@@ -75,10 +75,10 @@ spec:
7575
apiVersion: v1
7676
kind: Service
7777
metadata:
78-
name: {{ template "exceptionless.fullname" . }}-collector
78+
name: {{ template "exceptionless.fullname" . }}-api
7979
labels:
8080
app: {{ template "exceptionless.name" . }}
81-
component: {{ template "exceptionless.fullname" . }}-collector
81+
component: {{ template "exceptionless.fullname" . }}-api
8282
chart: {{ template "exceptionless.chart" . }}
8383
release: {{ .Release.Name }}
8484
heritage: {{ .Release.Service }}
@@ -90,13 +90,13 @@ spec:
9090
protocol: TCP
9191
name: http
9292
selector:
93-
component: {{ template "exceptionless.fullname" . }}-collector
93+
component: {{ template "exceptionless.fullname" . }}-api
9494

9595
---
9696
apiVersion: networking.k8s.io/v1
9797
kind: Ingress
9898
metadata:
99-
name: {{ template "exceptionless.fullname" . }}-collector-ingress
99+
name: {{ template "exceptionless.fullname" . }}-api-ingress
100100
annotations:
101101
kubernetes.io/ingress.class: nginx
102102
cert-manager.io/cluster-issuer: letsencrypt-prod
@@ -106,20 +106,20 @@ metadata:
106106
spec:
107107
tls:
108108
- hosts:
109-
{{- range .Values.collector.domains }}
109+
{{- range .Values.api.domains }}
110110
- {{ . }}
111111
{{- end }}
112-
secretName: {{ template "exceptionless.fullname" . }}-collector-tls
112+
secretName: {{ template "exceptionless.fullname" . }}-api-tls
113113
rules:
114-
{{- range .Values.collector.domains }}
114+
{{- range .Values.api.domains }}
115115
- host: {{ . }}
116116
http:
117117
paths:
118118
- path: /
119119
pathType: Prefix
120120
backend:
121121
service:
122-
name: {{ template "exceptionless.fullname" $ }}-collector
122+
name: {{ template "exceptionless.fullname" $ }}-api
123123
port:
124124
number: 80
125125
{{- end }}

‎k8s/exceptionless/templates/app.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
spec:
2929
containers:
3030
- name: {{ template "exceptionless.name" . }}-app
31-
image: "{{ .Values.app.image.repository }}:{{ .Values.app.image.tag }}"
31+
image: "{{ .Values.app.image.repository }}:{{ .Values.version }}"
3232
imagePullPolicy: {{ .Values.app.image.pullPolicy }}
3333
livenessProbe:
3434
httpGet:

‎k8s/exceptionless/templates/config.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ data:
77
{{- if .Values.appScope }}
88
EX_AppScope: {{ .Values.appScope }}
99
{{- end }}
10-
EX_ApiUrl: https://{{.Values.api.defaultDomain}}
1110
EX_BaseUrl: https://{{.Values.app.defaultDomain}}
12-
EX_ExceptionlessServerUrl: https://{{.Values.collector.defaultDomain}}
11+
EX_ExceptionlessServerUrl: https://{{.Values.api.defaultDomain}}
1312
EX_DisabledPlugins: GeoPlugin,LocationPlugin
1413
EX_EnableSsl: "true"
1514
EX_Html5Mode: "true"

‎k8s/exceptionless/templates/jobs.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
spec:
2929
containers:
3030
- name: {{ template "exceptionless.name" . }}-jobs-close-inactive-sessions
31-
image: "{{ .Values.jobs.image.repository }}:{{ .Values.jobs.image.tag }}"
31+
image: "{{ .Values.jobs.image.repository }}:{{ .Values.version }}"
3232
imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
3333
livenessProbe:
3434
httpGet:
@@ -79,7 +79,7 @@ spec:
7979
spec:
8080
containers:
8181
- name: {{ template "exceptionless.name" . }}-jobs-daily-summary
82-
image: "{{ .Values.jobs.image.repository }}:{{ .Values.jobs.image.tag }}"
82+
image: "{{ .Values.jobs.image.repository }}:{{ .Values.version }}"
8383
imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
8484
livenessProbe:
8585
httpGet:
@@ -120,7 +120,7 @@ spec:
120120
spec:
121121
containers:
122122
- name: {{ template "exceptionless.name" . }}-jobs-download-geoip-database
123-
image: "{{ .Values.jobs.image.repository }}:{{ .Values.jobs.image.tag }}"
123+
image: "{{ .Values.jobs.image.repository }}:{{ .Values.version }}"
124124
imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
125125
livenessProbe:
126126
httpGet:
@@ -172,7 +172,7 @@ spec:
172172
spec:
173173
containers:
174174
- name: {{ template "exceptionless.name" . }}-jobs-event-notifications
175-
image: "{{ .Values.jobs.image.repository }}:{{ .Values.jobs.image.tag }}"
175+
image: "{{ .Values.jobs.image.repository }}:{{ .Values.version }}"
176176
imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
177177
livenessProbe:
178178
httpGet:
@@ -223,7 +223,7 @@ spec:
223223
spec:
224224
containers:
225225
- name: {{ template "exceptionless.name" . }}-jobs-event-posts
226-
image: "{{ .Values.jobs.image.repository }}:{{ .Values.jobs.image.tag }}"
226+
image: "{{ .Values.jobs.image.repository }}:{{ .Values.version }}"
227227
imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
228228
livenessProbe:
229229
httpGet:
@@ -264,7 +264,7 @@ spec:
264264
spec:
265265
containers:
266266
- name: {{ template "exceptionless.name" . }}-jobs-migration
267-
image: "{{ .Values.jobs.image.repository }}:{{ .Values.jobs.image.tag }}"
267+
image: "{{ .Values.jobs.image.repository }}:{{ .Values.version }}"
268268
imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
269269
resources:
270270
requests:
@@ -310,7 +310,7 @@ spec:
310310
spec:
311311
containers:
312312
- name: {{ template "exceptionless.name" . }}-jobs-event-user-descriptions
313-
image: "{{ .Values.jobs.image.repository }}:{{ .Values.jobs.image.tag }}"
313+
image: "{{ .Values.jobs.image.repository }}:{{ .Values.version }}"
314314
imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
315315
livenessProbe:
316316
httpGet:
@@ -361,7 +361,7 @@ spec:
361361
spec:
362362
containers:
363363
- name: {{ template "exceptionless.name" . }}-jobs-mail-message
364-
image: "{{ .Values.jobs.image.repository }}:{{ .Values.jobs.image.tag }}"
364+
image: "{{ .Values.jobs.image.repository }}:{{ .Values.version }}"
365365
imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
366366
livenessProbe:
367367
httpGet:
@@ -402,7 +402,7 @@ spec:
402402
spec:
403403
containers:
404404
- name: {{ template "exceptionless.name" . }}-jobs-maintain-indexes
405-
image: "{{ .Values.jobs.image.repository }}:{{ .Values.jobs.image.tag }}"
405+
image: "{{ .Values.jobs.image.repository }}:{{ .Values.version }}"
406406
imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
407407
livenessProbe:
408408
httpGet:
@@ -444,7 +444,7 @@ spec:
444444
spec:
445445
containers:
446446
- name: {{ template "exceptionless.name" . }}-jobs-cleanup-data
447-
image: "{{ .Values.jobs.image.repository }}:{{ .Values.jobs.image.tag }}"
447+
image: "{{ .Values.jobs.image.repository }}:{{ .Values.version }}"
448448
imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
449449
livenessProbe:
450450
httpGet:
@@ -486,7 +486,7 @@ spec:
486486
spec:
487487
containers:
488488
- name: {{ template "exceptionless.name" . }}-jobs-cleanup-orphaned-data
489-
image: "{{ .Values.jobs.image.repository }}:{{ .Values.jobs.image.tag }}"
489+
image: "{{ .Values.jobs.image.repository }}:{{ .Values.version }}"
490490
imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
491491
livenessProbe:
492492
httpGet:
@@ -538,7 +538,7 @@ spec:
538538
spec:
539539
containers:
540540
- name: {{ template "exceptionless.name" . }}-jobs-stack-event-count
541-
image: "{{ .Values.jobs.image.repository }}:{{ .Values.jobs.image.tag }}"
541+
image: "{{ .Values.jobs.image.repository }}:{{ .Values.version }}"
542542
imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
543543
livenessProbe:
544544
httpGet:
@@ -589,7 +589,7 @@ spec:
589589
spec:
590590
containers:
591591
- name: {{ template "exceptionless.name" . }}-jobs-web-hooks
592-
image: "{{ .Values.jobs.image.repository }}:{{ .Values.jobs.image.tag }}"
592+
image: "{{ .Values.jobs.image.repository }}:{{ .Values.version }}"
593593
imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
594594
livenessProbe:
595595
httpGet:
@@ -640,7 +640,7 @@ spec:
640640
spec:
641641
containers:
642642
- name: {{ template "exceptionless.name" . }}-jobs-work-item
643-
image: "{{ .Values.jobs.image.repository }}:{{ .Values.jobs.image.tag }}"
643+
image: "{{ .Values.jobs.image.repository }}:{{ .Values.version }}"
644644
imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
645645
livenessProbe:
646646
httpGet:
@@ -700,7 +700,7 @@ spec:
700700
spec:
701701
containers:
702702
- name: {{ template "exceptionless.name" . }}-jobs-event-usage
703-
image: "{{ .Values.jobs.image.repository }}:{{ .Values.jobs.image.tag }}"
703+
image: "{{ .Values.jobs.image.repository }}:{{ .Values.version }}"
704704
imagePullPolicy: {{ .Values.jobs.image.pullPolicy }}
705705
livenessProbe:
706706
httpGet:

0 commit comments

Comments
 (0)