Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
@alxgomz
alxgomz committed Dec 18, 2023
1 parent fbf9250 commit 19fdfcb
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 24 deletions.
2 changes: 1 addition & 1 deletion charts/alfresco-ai-transformer/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ A Helm chart for deploying Alfresco ai transformer service
| livenessProbe.maxTransforms | int | `10000` | |
| livenessProbe.periodSeconds | int | `20` | |
| livenessProbe.timeoutSeconds | int | `10` | |
| messageBroker.existingConfigMap | object | `{"keys":{"url":null},"name":null}` | Alternatively, provide credentials via an existing secret and set the keys as they are given |
| messageBroker.existingConfigMap | object | `{"keys":{"url":"BROKER_URL"},"name":null}` | Alternatively, provide credentials via an existing secret and set the keys as they are given |
| messageBroker.existingSecret.keys.password | string | `"BROKER_PASSWORD"` | |
| messageBroker.existingSecret.keys.username | string | `"BROKER_USERNAME"` | |
| messageBroker.existingSecret.name | string | `nil` | |
Expand Down
19 changes: 9 additions & 10 deletions charts/alfresco-ai-transformer/templates/deployment-ai-transformer.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ spec:
- configMapRef:
name: {{ template "alfresco-ai-transformer.fullname" . }}
env:
{{- include "activemq.env" . | nindent 12 }}
{{- $mqSecretCtx := dict "Values" (dict "nameOverride" "ai-mq") "Chart" $.Chart "Release" $.Release }}
{{- $mqSecret := coalesce .Values.messageBroker.existingSecret.name (include "alfresco-ai-transformer.fullname" $mqSecretCtx) }}
{{- $awsSecretCtx := dict "Values" (dict "nameOverride" "aws-comprehend") "Chart" $.Chart "Release" $.Release }}
Expand All @@ -76,47 +75,47 @@ spec:
{{- $sfsCmCtx := dict "Values" (dict "nameOverride" "ai-sfs") "Chart" .Chart "Release" .Release }}
{{- $sfsCm := coalesce .Values.sfs.existingConfigMap.name (include "alfresco-ai-transformer.fullname" $sfsCmCtx) }}
- name: BROKER_USERNAME
valuesFrom:
valueFrom:
secretKeyRef:
name: {{ $mqSecret }}
key: {{ .Values.messageBroker.existingSecret.keys.username }}
- name: BROKER_PASSWORD
valuesFrom:
valueFrom:
secretKeyRef:
name: {{ $mqSecret }}
key: {{ .Values.messageBroker.existingSecret.keys.password }}
- name: BROKER_URL
valuesFrom:
valueFrom:
configMapKeyRef:
name: {{ $mqCm }}
key: {{ .Values.messageBroker.existingConfigMap.keys.url }}
- name: FILE_STORE_URL
valuesFrom:
valueFrom:
configMapKeyRef:
name: {{ $sfsCm }}
key: {{ .Values.sfs.existingConfigMap.keys.url }}
- name: AWS_ACCESS_KEY_ID
valuesFrom:
valueFrom:
secretKeyRef:
name: {{ $awsSecret }}
key: {{ .Values.aws.existingSecret.keys.accessKeyId }}
- name: AWS_SECRET_ACCESS_KEY
valuesFrom:
valueFrom:
secretKeyRef:
name: {{ $awsSecret }}
key: {{ .Values.aws.existingSecret.keys.secretAccessKey }}
- name: AWS_REGION
valuesFrom:
valueFrom:
configMapKeyRef:
name: {{ $awsCm }}
key: {{ .Values.aws.existingConfigMap.keys.region }}
- name: AWS_S3_BUCKET
valuesFrom:
valueFrom:
configMapKeyRef:
name: {{ $awsCm }}
key: {{ .Values.aws.existingConfigMap.keys.s3Bucket }}
- name: AWS_COMPREHEND_ROLE_ARN
valuesFrom:
valueFrom:
configMapKeyRef:
name: {{ $awsCm }}
key: {{ .Values.aws.existingConfigMap.keys.comprehendRoleARN }}
Expand Down
24 changes: 12 additions & 12 deletions charts/alfresco-ai-transformer/tests/deployment-ai-tranformer_test.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,47 +12,47 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: AWS_ACCESS_KEY_ID
valuesFrom:
valueFrom:
secretKeyRef:
name: RELEASE-NAME-aws-comprehend
key: AWS_ACCESS_KEY_ID
- contains:
path: spec.template.spec.containers[0].env
content:
name: AWS_SECRET_ACCESS_KEY
valuesFrom:
valueFrom:
secretKeyRef:
name: RELEASE-NAME-aws-comprehend
key: AWS_SECRET_ACCESS_KEY
- contains:
path: spec.template.spec.containers[0].env
content:
name: FILE_STORE_URL
valuesFrom:
valueFrom:
configMapKeyRef:
name: RELEASE-NAME-ai-sfs
key: FILE_STORE_URL
- contains:
path: spec.template.spec.containers[0].env
content:
name: AWS_REGION
valuesFrom:
valueFrom:
configMapKeyRef:
name: RELEASE-NAME-aws-comprehend
key: AWS_REGION
- contains:
path: spec.template.spec.containers[0].env
content:
name: AWS_S3_BUCKET
valuesFrom:
valueFrom:
configMapKeyRef:
name: RELEASE-NAME-aws-comprehend
key: AWS_S3_BUCKET
- contains:
path: spec.template.spec.containers[0].env
content:
name: AWS_COMPREHEND_ROLE_ARN
valuesFrom:
valueFrom:
configMapKeyRef:
name: RELEASE-NAME-aws-comprehend
key: AWS_COMPREHEND_ROLE_ARN
Expand Down Expand Up @@ -110,47 +110,47 @@ tests:
path: spec.template.spec.containers[0].env
content:
name: AWS_ACCESS_KEY_ID
valuesFrom:
valueFrom:
secretKeyRef:
name: awscreds
key: AWSACCESSKEYID
- contains:
path: spec.template.spec.containers[0].env
content:
name: AWS_SECRET_ACCESS_KEY
valuesFrom:
valueFrom:
secretKeyRef:
name: awscreds
key: AWSSECRETACCESSKEY
- contains:
path: spec.template.spec.containers[0].env
content:
name: FILE_STORE_URL
valuesFrom:
valueFrom:
configMapKeyRef:
name: sfsurl
key: SFS_URL
- contains:
path: spec.template.spec.containers[0].env
content:
name: AWS_REGION
valuesFrom:
valueFrom:
configMapKeyRef:
name: amazon
key: REGION
- contains:
path: spec.template.spec.containers[0].env
content:
name: AWS_S3_BUCKET
valuesFrom:
valueFrom:
configMapKeyRef:
name: amazon
key: comprehendbucket
- contains:
path: spec.template.spec.containers[0].env
content:
name: AWS_COMPREHEND_ROLE_ARN
valuesFrom:
valueFrom:
configMapKeyRef:
name: amazon
key: ROLE
2 changes: 1 addition & 1 deletion charts/alfresco-ai-transformer/values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ messageBroker:
existingConfigMap:
name: null
keys:
url: null
url: BROKER_URL
existingSecret:
name: null
keys:
Expand Down

0 comments on commit 19fdfcb

Please sign in to comment.