Skip to content

Commit 33031eb

Browse files
FosolFosol
committed
fix
1 parent 90d2199 commit 33031eb

File tree

6 files changed

+332
-10
lines changed

6 files changed

+332
-10
lines changed

‎openshift/kustomize/services/auto-clipper/base/deploy.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,13 +137,13 @@ spec:
137137
- name: Service__AzureSpeechRegion
138138
valueFrom:
139139
secretKeyRef:
140-
name: azure-cognitive-services
140+
name: azure-speech-services
141141
key: AZURE_REGION
142142
- name: Service__AzureSpeechKey
143143
valueFrom:
144144
secretKeyRef:
145-
name: azure-cognitive-services
146-
key: AZURE_COGNITIVE_SERVICES_KEY
145+
name: azure-speech-services
146+
key: AZURE_SPEECH_SERVICES_KEY
147147
- name: Service__LlmApiKey
148148
valueFrom:
149149
secretKeyRef:

‎openshift/kustomize/services/auto-clipper/base/secret.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
kind: Secret
22
apiVersion: v1
33
metadata:
4-
name: azure-cognitive-services
4+
name: azure-speech-services
55
namespace: default
66
annotations:
7-
description: Azure Cognitive Services secrets
7+
description: Azure Speech Services secrets
88
created-by: jeremy.foster
99
labels:
10-
name: azure-cognitive-services
10+
name: azure-speech-services
1111
part-of: tno
1212
version: 1.0.0
1313
component: transcription
1414
managed-by: kustomize
1515
type: Opaque
1616
stringData:
1717
AZURE_REGION: ${AZURE_REGION}
18-
AZURE_COGNITIVE_SERVICES_KEY: ${AZURE_COGNITIVE_SERVICES_KEY}
18+
AZURE_SPEECH_SERVICES_KEY: ${AZURE_SPEECH_SERVICES_KEY}
1919
---
2020
kind: Secret
2121
apiVersion: v1

‎openshift/kustomize/services/auto-clipper/deploy.yaml‎

Lines changed: 322 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,322 @@
1+
apiVersion: v1
2+
data:
3+
CHES_EMAIL_AUTHORIZED: "true"
4+
CHES_EMAIL_ENABLED: "true"
5+
KAFKA_CLIENT_ID: AutoClipper
6+
LLM_API_URL: https://mmiopenai.cognitiveservices.azure.com
7+
LLM_DEPLOYMENT_NAME: gpt-4o-mini
8+
LLM_MODEL_NAME: ""
9+
MAX_FAIL_LIMIT: "5"
10+
TOPICS: request-clips
11+
VOLUME_PATH: /data
12+
kind: ConfigMap
13+
metadata:
14+
annotations:
15+
created-by: jeremy.foster
16+
description: Transcription service configuration settings
17+
labels:
18+
component: auto-clipper-service
19+
managed-by: kustomize
20+
name: auto-clipper-service
21+
part-of: tno
22+
version: 1.0.0
23+
name: auto-clipper-service
24+
namespace: 9b301c-dev
25+
---
26+
apiVersion: v1
27+
data:
28+
AZURE_OPENAI_KEY: |
29+
R0VUdE5ZUllSeXBxRUNCRTIzU3FBSHFRYWE4SFJSSGRheFQzc1RvNTRlanZxTzBaaHU4TU
30+
pRUUo5OUJMQUM0ZjFjTVhKM3czQUFBQkFDT0c5SE9V
31+
kind: Secret
32+
metadata:
33+
name: azure-openai
34+
namespace: 9b301c-dev
35+
type: stringData
36+
---
37+
apiVersion: v1
38+
data:
39+
AZURE_REGION: d2VzdHVz
40+
AZURE_SPEECH_SERVICES_KEY: |
41+
Q0FNVlh2dnVBZjZKaWdJekpCdG1YdEZEQkVLVE01NHRad2taMkJUNnhPMWhWeWJoaDlCU0
42+
pRUUo5OUJMQUM0ZjFjTVhKM3czQUFBWUFDT0dVeUdF
43+
kind: Secret
44+
metadata:
45+
name: azure-speech-services
46+
namespace: 9b301c-dev
47+
type: stringData
48+
---
49+
apiVersion: v1
50+
kind: Service
51+
metadata:
52+
annotations:
53+
created-by: jeremy.foster
54+
description: Exposes and load balances the application pods.
55+
labels:
56+
component: auto-clipper-service
57+
managed-by: kustomize
58+
name: auto-clipper-service
59+
part-of: tno
60+
version: 1.0.0
61+
name: auto-clipper-service
62+
namespace: 9b301c-dev
63+
spec:
64+
ports:
65+
- name: 8080-tcp
66+
port: 8080
67+
protocol: TCP
68+
targetPort: 8080
69+
selector:
70+
component: auto-clipper-service
71+
part-of: tno
72+
sessionAffinity: None
73+
type: ClusterIP
74+
---
75+
apiVersion: apps/v1
76+
kind: Deployment
77+
metadata:
78+
annotations:
79+
created-by: jeremy.foster
80+
description: Defines how to deploy auto-clipper-service
81+
image.openshift.io/triggers: '[{"from": {"kind": "ImageStreamTag", "name": "auto-clipper-service:dev",
82+
"namespace": "9b301c-tools"}, "fieldPath": "spec.template.spec.containers[?(@.name==\"auto-clipper-service\")].image"}]'
83+
labels:
84+
component: auto-clipper-service
85+
managed-by: kustomize
86+
name: auto-clipper-service
87+
part-of: tno
88+
version: 1.0.0
89+
name: auto-clipper-service
90+
namespace: 9b301c-dev
91+
spec:
92+
replicas: 2
93+
selector:
94+
matchLabels:
95+
component: auto-clipper-service
96+
name: auto-clipper-service
97+
part-of: tno
98+
strategy:
99+
rollingUpdate:
100+
maxSurge: 25%
101+
maxUnavailable: 25%
102+
type: RollingUpdate
103+
template:
104+
metadata:
105+
labels:
106+
component: auto-clipper-service
107+
name: auto-clipper-service
108+
part-of: tno
109+
name: auto-clipper-service
110+
spec:
111+
containers:
112+
- env:
113+
- name: ASPNETCORE_ENVIRONMENT
114+
value: Production
115+
- name: ASPNETCORE_URLS
116+
value: http://+:8080
117+
- name: Serilog__MinimumLevel__Override__TNO
118+
value: Information
119+
- name: Service__ApiUrl
120+
valueFrom:
121+
configMapKeyRef:
122+
key: API_HOST_URL
123+
name: services
124+
- name: Service__EmailTo
125+
valueFrom:
126+
configMapKeyRef:
127+
key: EMAIL_FAILURE_TO
128+
name: services
129+
- name: Service__NoticeEmailTo
130+
valueFrom:
131+
configMapKeyRef:
132+
key: EMAIL_NOTICE_TO
133+
name: services
134+
- name: Auth__Keycloak__Authority
135+
valueFrom:
136+
configMapKeyRef:
137+
key: KEYCLOAK_AUTHORITY
138+
name: services
139+
- name: Auth__Keycloak__Audience
140+
valueFrom:
141+
configMapKeyRef:
142+
key: KEYCLOAK_AUDIENCE
143+
name: services
144+
- name: Auth__Keycloak__Secret
145+
valueFrom:
146+
secretKeyRef:
147+
key: KEYCLOAK_CLIENT_SECRET
148+
name: keycloak
149+
- name: Kafka__Admin__ClientId
150+
valueFrom:
151+
configMapKeyRef:
152+
key: KAFKA_CLIENT_ID
153+
name: auto-clipper-service
154+
- name: Kafka__Admin__BootstrapServers
155+
valueFrom:
156+
configMapKeyRef:
157+
key: KAFKA_BOOTSTRAP_SERVERS
158+
name: services
159+
- name: Kafka__Consumer__GroupId
160+
valueFrom:
161+
configMapKeyRef:
162+
key: KAFKA_CLIENT_ID
163+
name: auto-clipper-service
164+
- name: Kafka__Consumer__BootstrapServers
165+
valueFrom:
166+
configMapKeyRef:
167+
key: KAFKA_BOOTSTRAP_SERVERS
168+
name: services
169+
- name: Kafka__Producer__ClientId
170+
valueFrom:
171+
configMapKeyRef:
172+
key: KAFKA_CLIENT_ID
173+
name: auto-clipper-service
174+
- name: Kafka__Producer__BootstrapServers
175+
valueFrom:
176+
configMapKeyRef:
177+
key: KAFKA_BOOTSTRAP_SERVERS
178+
name: services
179+
- name: Service__AzureSpeechRegion
180+
valueFrom:
181+
secretKeyRef:
182+
key: AZURE_REGION
183+
name: azure-speech-services
184+
- name: Service__AzureSpeechKey
185+
valueFrom:
186+
secretKeyRef:
187+
key: AZURE_SPEECH_SERVICES_KEY
188+
name: azure-speech-services
189+
- name: Service__LlmApiKey
190+
valueFrom:
191+
secretKeyRef:
192+
key: AZURE_OPENAI_KEY
193+
name: azure-openai
194+
- name: Service__MaxFailLimit
195+
valueFrom:
196+
configMapKeyRef:
197+
key: MAX_FAIL_LIMIT
198+
name: auto-clipper-service
199+
- name: Service__Topics
200+
valueFrom:
201+
configMapKeyRef:
202+
key: TOPICS
203+
name: auto-clipper-service
204+
- name: Service__VolumePath
205+
valueFrom:
206+
configMapKeyRef:
207+
key: VOLUME_PATH
208+
name: auto-clipper-service
209+
- name: Service__LlmApiUrl
210+
valueFrom:
211+
configMapKeyRef:
212+
key: LLM_API_URL
213+
name: auto-clipper-service
214+
- name: Service__LlmModel
215+
valueFrom:
216+
configMapKeyRef:
217+
key: LLM_MODEL_NAME
218+
name: auto-clipper-service
219+
- name: Service__LlmDeployment
220+
valueFrom:
221+
configMapKeyRef:
222+
key: LLM_DEPLOYMENT_NAME
223+
name: auto-clipper-service
224+
- name: S3__AccessKey
225+
valueFrom:
226+
secretKeyRef:
227+
key: S3_ACCESS_KEY
228+
name: s3-backup-credentials
229+
- name: S3__SecretKey
230+
valueFrom:
231+
secretKeyRef:
232+
key: S3_SECRET_KEY
233+
name: s3-backup-credentials
234+
- name: S3__BucketName
235+
valueFrom:
236+
secretKeyRef:
237+
key: S3_BUCKET_NAME
238+
name: s3-backup-credentials
239+
- name: S3__ServiceUrl
240+
valueFrom:
241+
secretKeyRef:
242+
key: S3_SERVICE_URL
243+
name: s3-backup-credentials
244+
- name: CHES__From
245+
valueFrom:
246+
configMapKeyRef:
247+
key: CHES_FROM
248+
name: ches
249+
- name: CHES__EmailEnabled
250+
valueFrom:
251+
configMapKeyRef:
252+
key: CHES_EMAIL_ENABLED
253+
name: auto-clipper-service
254+
- name: CHES__EmailAuthorized
255+
valueFrom:
256+
configMapKeyRef:
257+
key: CHES_EMAIL_AUTHORIZED
258+
name: auto-clipper-service
259+
- name: CHES__AuthUrl
260+
valueFrom:
261+
configMapKeyRef:
262+
key: CHES_AUTH_URL
263+
name: ches
264+
- name: CHES__HostUri
265+
valueFrom:
266+
configMapKeyRef:
267+
key: CHES_HOST_URI
268+
name: ches
269+
- name: CHES__Username
270+
valueFrom:
271+
secretKeyRef:
272+
key: USERNAME
273+
name: ches
274+
- name: CHES__Password
275+
valueFrom:
276+
secretKeyRef:
277+
key: PASSWORD
278+
name: ches
279+
image: image-registry.openshift-image-registry.svc:5000/9b301c-tools/auto-clipper-service:dev
280+
imagePullPolicy: Always
281+
livenessProbe:
282+
failureThreshold: 3
283+
httpGet:
284+
path: /health
285+
port: 8080
286+
scheme: HTTP
287+
initialDelaySeconds: 30
288+
periodSeconds: 20
289+
successThreshold: 1
290+
timeoutSeconds: 30
291+
name: auto-clipper-service
292+
ports:
293+
- containerPort: 8080
294+
protocol: TCP
295+
readinessProbe:
296+
failureThreshold: 3
297+
httpGet:
298+
path: /health
299+
port: 8080
300+
scheme: HTTP
301+
initialDelaySeconds: 30
302+
periodSeconds: 20
303+
successThreshold: 1
304+
timeoutSeconds: 30
305+
resources:
306+
limits:
307+
cpu: 50m
308+
memory: 300Mi
309+
requests:
310+
cpu: 20m
311+
memory: 100Mi
312+
volumeMounts:
313+
- mountPath: /data
314+
name: api-storage
315+
dnsPolicy: ClusterFirst
316+
restartPolicy: Always
317+
securityContext: {}
318+
terminationGracePeriodSeconds: 30
319+
volumes:
320+
- name: api-storage
321+
persistentVolumeClaim:
322+
claimName: api-storage

‎openshift/kustomize/services/auto-clipper/overlays/dev/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ generatorOptions:
1010
disableNameSuffixHash: true
1111

1212
secretGenerator:
13-
- name: azure-cognitive-services
13+
- name: azure-speech-services
1414
type: stringData
1515
env: azure.env
1616
- name: azure-openai

‎openshift/kustomize/services/auto-clipper/overlays/prod/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ generatorOptions:
1010
disableNameSuffixHash: true
1111

1212
secretGenerator:
13-
- name: azure-cognitive-services
13+
- name: azure-speech-services
1414
type: stringData
1515
env: azure.env
1616
- name: azure-openai

‎openshift/kustomize/services/auto-clipper/overlays/test/kustomization.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ generatorOptions:
1010
disableNameSuffixHash: true
1111

1212
secretGenerator:
13-
- name: azure-cognitive-services
13+
- name: azure-speech-services
1414
type: stringData
1515
env: azure.env
1616
- name: azure-openai

0 commit comments

Comments
 (0)