Skip to content

Commit f3a3066

Browse files
cmdoretcmdoret
authored
Merge pull request #5 from sdsc-ordes/refactor/pure-helm
refactor: pure helm manifests
2 parents 693b130 + 73a14b5 commit f3a3066

30 files changed

+360
-339
lines changed

‎.github/workflows/build-images-manifests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Presidio Docker Build
22

33
on:
44
push:
5-
branches: [ main ]
5+
branches: [main]
66
workflow_dispatch:
77

88
env:

‎external/vendir.lock.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
apiVersion: vendir.k14s.io/v1alpha1
22
directories:
3-
- contents:
4-
- git:
5-
commitTitle: Add label to external PRs (#1707)...
6-
sha: af1c524460ad62e17313520a3cbb618b062b75cb
7-
tags:
8-
- 2.2.360
9-
path: .
10-
path: ytt/presidio
3+
- contents:
4+
- git:
5+
commitTitle: Add label to external PRs (#1707)...
6+
sha: af1c524460ad62e17313520a3cbb618b062b75cb
7+
tags:
8+
- 2.2.360
9+
path: .
10+
path: helm/presidio
1111
kind: LockConfig

‎external/vendir.yaml‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
11
apiVersion: vendir.k14s.io/v1alpha1
22
kind: Config
33
directories:
4-
- path: ytt/presidio
4+
- path: helm/presidio
55
contents:
66
- path: .
77
git:
88
url: https://github.com/microsoft/presidio
99
ref: refs/tags/2.2.360
1010
newRootPath: docs/samples/deployments/k8s/charts/presidio
11-
# - path: helm/presidio
12-
# contents:
13-
# - path: .
14-
# helmChart:
15-
# name: presidio
16-
# version: 2.2.360
17-
# git:
18-
# url: https://github.com/microsoft/presidio
19-
# ref: refs/tags/2.2.360
20-
# subPath: docs/samples/deployments/k8s/charts/presidio

‎justfile‎

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11,48 +11,31 @@ default:
1111

1212
# Format the whole repository.
1313
format *args:
14-
treefmt {{args}}
14+
treefmt --excludes 'src/chart/templates/*' {{args}}
1515

1616
# Clean up external and generated manifests.
1717
clean:
1818
@echo "Cleaning up..."
1919
rm -rf external/{helm,ytt}/**
20-
rm -rf src/**/{ytt,helm}/out
20+
rm -rf build/
2121

2222
# Render Helm charts [intermediate step before rendering ytt manifests]
2323
[private]
24-
render-helm dir="src":
24+
render-helm:
2525
# render external helm charts with our values into src/<service>/helm/out
26-
fd '^helm$' {{dir}} \
27-
-x sh -c 'helm template $(basename {//}) external/helm/$(basename {//}) -f {}/values.yaml --output-dir {}/out'
28-
29-
# Render ytt manifests
30-
[private]
31-
render-ytt dir="src":
32-
# render external ytt templates with our values into src/<service>/ytt/out
33-
fd '^ytt$' {{dir}} \
34-
-x sh -c 'ytt -f {}/values.yaml -f external/ytt/$(basename {//}) --output-files {}/out'
35-
36-
# Render when the code was pulled in via ytt but is a helm template
37-
[private]
38-
render-ytt-extract-helm-template dir="src":
39-
# render mixed ytt + helm templates with our values into src/<service>/mix/out
40-
fd '^helm$' {{dir}} \
41-
-x sh -c 'helm template $(basename {//}) external/ytt/$(basename {//}) -f {}/values.yaml --output-dir {}/out'
26+
helm template dev src/chart -f src/chart/values.yaml --output-dir build
4227

4328
# Render manifests
44-
render dir="src":
45-
just fetch && \
46-
just render-ytt {{dir}} && \
47-
just render-ytt-extract-helm-template {{dir}} && \
29+
render:
30+
just render-helm && \
4831
just format
4932

5033
# Apply manifests in dir to the cluster.
5134
deploy dir="src":
5235
# decrypts+sources the .env file and injects values into the manifests
5336
cd {{root_dir}} && \
5437
just secrets::exec-env \
55-
"kubectl kustomize {{dir}} | envsubst \\\$QLEVER_ACCESS_TOKEN | kubectl apply -f -"
38+
"kubectl kustomize {{dir}} | kubectl apply -f -"
5639

5740
# Enter development shell
5841
dev:

‎src/chart/Chart.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
apiVersion: v2
2+
name: deid-presidio
3+
description: A Helm chart for deploying Presidio with swiss-specific ConfigMaps and values
4+
type: application
5+
version: 0.1.0
6+
appVersion: "1.0"
7+
keywords:
8+
- presidio
9+
- deid
10+
- privacy
11+
- helm
12+
maintainers:
13+
- name: vancauwe
14+
- name: cmdoret
15+
sources:
16+
- https://github.com/sdsc-ordes/deid-module

‎src/chart/conf/default-analyzer.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
supported_languages:
2+
- en
3+
default_score_threshold: 0

src/presidio/conf/presidio-analyzer/default-recognizers.yaml renamed to src/chart/conf/default-recognizers.yaml

Lines changed: 89 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
supported_languages:
1+
supported_languages:
22
- en
33
global_regex_flags: 26
44

@@ -15,154 +15,180 @@ recognizers:
1515
# For example, see the CreditCardRecognizer definition below:
1616
- name: CreditCardRecognizer
1717
supported_languages:
18-
- language: en
19-
context: [credit, card, visa, mastercard, cc, amex, discover, jcb, diners, maestro, instapayment]
20-
- language: es
21-
context: [tarjeta, credito, visa, mastercard, cc, amex, discover, jcb, diners, maestro, instapayment]
22-
- language: it
23-
- language: pl
18+
- language: en
19+
context:
20+
[
21+
credit,
22+
card,
23+
visa,
24+
mastercard,
25+
cc,
26+
amex,
27+
discover,
28+
jcb,
29+
diners,
30+
maestro,
31+
instapayment,
32+
]
33+
- language: es
34+
context:
35+
[
36+
tarjeta,
37+
credito,
38+
visa,
39+
mastercard,
40+
cc,
41+
amex,
42+
discover,
43+
jcb,
44+
diners,
45+
maestro,
46+
instapayment,
47+
]
48+
- language: it
49+
- language: pl
2450
type: predefined
2551

2652
- name: UsBankRecognizer
27-
supported_languages:
28-
- en
53+
supported_languages:
54+
- en
2955
type: predefined
3056

3157
- name: UsLicenseRecognizer
32-
supported_languages:
33-
- en
58+
supported_languages:
59+
- en
3460
type: predefined
3561

3662
- name: UsItinRecognizer
37-
supported_languages:
38-
- en
63+
supported_languages:
64+
- en
3965
type: predefined
40-
66+
4167
- name: UsPassportRecognizer
42-
supported_languages:
43-
- en
68+
supported_languages:
69+
- en
4470
type: predefined
45-
71+
4672
- name: UsSsnRecognizer
47-
supported_languages:
48-
- en
73+
supported_languages:
74+
- en
4975
type: predefined
5076

5177
- name: NhsRecognizer
52-
supported_languages:
53-
- en
78+
supported_languages:
79+
- en
5480
type: predefined
5581

5682
- name: UkNinoRecognizer
5783
supported_languages:
58-
- en
84+
- en
5985
type: predefined
6086
enabled: false
6187

6288
- name: SgFinRecognizer
63-
supported_languages:
64-
- en
89+
supported_languages:
90+
- en
6591
type: predefined
6692
enabled: false
6793

6894
- name: AuAbnRecognizer
69-
supported_languages:
70-
- en
95+
supported_languages:
96+
- en
7197
type: predefined
7298
enabled: false
7399

74100
- name: AuAcnRecognizer
75-
supported_languages:
76-
- en
101+
supported_languages:
102+
- en
77103
type: predefined
78104
enabled: false
79105

80106
- name: AuTfnRecognizer
81-
supported_languages:
82-
- en
107+
supported_languages:
108+
- en
83109
type: predefined
84110
enabled: false
85111

86112
- name: AuMedicareRecognizer
87-
supported_languages:
88-
- en
113+
supported_languages:
114+
- en
89115
type: predefined
90116
enabled: false
91117

92118
- name: InPanRecognizer
93-
supported_languages:
94-
- en
119+
supported_languages:
120+
- en
95121
type: predefined
96122
enabled: false
97123

98124
- name: InAadhaarRecognizer
99-
supported_languages:
100-
- en
125+
supported_languages:
126+
- en
101127
type: predefined
102128
enabled: false
103129

104130
- name: InVehicleRegistrationRecognizer
105-
supported_languages:
106-
- en
131+
supported_languages:
132+
- en
107133
type: predefined
108134
enabled: false
109135

110136
- name: InPassportRecognizer
111-
supported_languages:
112-
- en
137+
supported_languages:
138+
- en
113139
type: predefined
114140
enabled: false
115141

116142
- name: EsNifRecognizer
117-
supported_languages:
118-
- es
143+
supported_languages:
144+
- es
119145
type: predefined
120146

121147
- name: EsNieRecognizer
122-
supported_languages:
123-
- es
148+
supported_languages:
149+
- es
124150
type: predefined
125151

126152
- name: ItDriverLicenseRecognizer
127-
supported_languages:
128-
- it
153+
supported_languages:
154+
- it
129155
type: predefined
130156

131157
- name: ItFiscalCodeRecognizer
132-
supported_languages:
133-
- it
158+
supported_languages:
159+
- it
134160
type: predefined
135161

136162
- name: ItVatCodeRecognizer
137-
supported_languages:
138-
- it
163+
supported_languages:
164+
- it
139165
type: predefined
140166

141167
- name: ItIdentityCardRecognizer
142-
supported_languages:
143-
- it
168+
supported_languages:
169+
- it
144170
type: predefined
145171

146172
- name: ItPassportRecognizer
147-
supported_languages:
148-
- it
173+
supported_languages:
174+
- it
149175
type: predefined
150176

151177
- name: PlPeselRecognizer
152-
supported_languages:
153-
- pl
178+
supported_languages:
179+
- pl
154180
type: predefined
155181

156182
- name: KrRrnRecognizer
157-
supported_languages:
158-
- ko
159-
- kr
183+
supported_languages:
184+
- ko
185+
- kr
160186
type: predefined
161187
enabled: false
162188

163189
- name: ThTninRecognizer
164190
supported_languages:
165-
- th
191+
- th
166192
type: predefined
167193
enabled: false
168194

@@ -195,7 +221,7 @@ recognizers:
195221
enabled: false
196222

197223
- name: InGstinRecognizer
198-
supported_languages:
199-
- en
224+
supported_languages:
225+
- en
200226
type: predefined
201-
enabled: false
227+
enabled: false

‎src/chart/templates/NOTES.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
presidio is now installed!
2+
3+
To find out about your newly configured system, run:
4+
5+
$ helm status {{ .Release.Name }}
6+
7+
To test your new Presidio service, forward the ports: the Analyzer publishes a service at port 8080. To use the Analyzer, you first need to forward this port to your local IP address:
8+
9+
$ kubectl port-forward -n presidio $(kubectl get pod -n presidio -l app=demo-presidio-analyzer -o jsonpath='{.items[0].metadata.name}') 8080:8080

0 commit comments

Comments
 (0)