Skip to content

Commit c7675d9

Browse files
committed
Merge branch 'master' into wwi-app
2 parents aafabb1 + 3c0ebd1 commit c7675d9

4 files changed

Lines changed: 49 additions & 3 deletions

File tree

samples/databases/wide-world-importers/wwi-ssdt/wwi-ssdt/Application/Stored Procedures/Configuration_ApplyRowLevelSecurity.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RETURN (SELECT 1 AS AccessResult
2828
INNER JOIN [Application].StateProvinces AS sp
2929
ON c.StateProvinceID = sp.StateProvinceID
3030
WHERE c.CityID = @CityID) + N'' Sales'') <> 0
31-
OR (ORIGINAL_LOGIN() = N''Website''
31+
OR (ORIGINAL_LOGIN() = N''Website'' OR ORIGINAL_LOGIN() = N''WebApi''
3232
AND EXISTS (SELECT 1
3333
FROM [Application].Cities AS c
3434
INNER JOIN [Application].StateProvinces AS sp
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Django==1.11.5
1+
django ~> 1.11.15
22
django-pyodbc-azure==1.11.0.0

samples/development-frameworks/django/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Django==1.9.8
1+
django ~> 1.11.15
22
dj-database-url==0.3.0
33
dj-static==0.0.6
44
gunicorn==19.6.0
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
apiVersion: v1
2+
kind: ServiceAccount
3+
metadata: {name: manual-failover, namespace: ag1}
4+
---
5+
apiVersion: rbac.authorization.k8s.io/v1
6+
kind: Role
7+
metadata: {name: manual-failover, namespace: ag1}
8+
rules:
9+
- apiGroups: ['']
10+
resourceNames: [ag1]
11+
resources: [configmaps]
12+
verbs: [get, update]
13+
- apiGroups: ['']
14+
resourceNames: [ag1]
15+
resources: [endpoints]
16+
verbs: [get]
17+
- apiGroups: ['']
18+
resources: [pods]
19+
verbs: [list]
20+
---
21+
apiVersion: rbac.authorization.k8s.io/v1
22+
kind: RoleBinding
23+
metadata: {name: manual-failover, namespace: ag1}
24+
roleRef: {apiGroup: rbac.authorization.k8s.io, kind: Role, name: manual-failover}
25+
subjects:
26+
- {kind: ServiceAccount, name: manual-failover}
27+
---
28+
apiVersion: batch/v1
29+
kind: Job
30+
metadata: {name: manual-failover, namespace: ag1}
31+
spec:
32+
template:
33+
metadata: {name: manual-failover}
34+
spec:
35+
containers:
36+
- command: [/mssql-server-k8s-failover]
37+
env:
38+
- {name: MSSQL_K8S_AG_NAME, value: ag1}
39+
- {name: MSSQL_K8S_NEW_PRIMARY, value: <containerName>}
40+
- name: MSSQL_K8S_NAMESPACE
41+
valueFrom:
42+
fieldRef: {fieldPath: metadata.namespace}
43+
image: mcr.microsoft.com/mssql/ha:vNext-CTP2.0-ubuntu
44+
name: manual-failover
45+
restartPolicy: Never
46+
serviceAccount: manual-failover

0 commit comments

Comments
 (0)