Skip to content

Commit

Permalink
Merge pull request #35 from ripienaar/rename_ssl_secret
Browse files Browse the repository at this point in the history
rename sslSecret to contextSecret for clarity
  • Loading branch information
ripienaar authored Feb 26, 2022
2 parents d1fd7ff + dfe75d0 commit 9e5b3d6
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions charts/asyncjobs-task-scheduler/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: asyncjobs-task-scheduler
version: 0.0.1
appVersion: 0.5.0
version: 0.0.2
appVersion: 0.0.6
description: Choria Asynchronous Jobs Task Scheduler
keywords:
- choria
Expand Down
28 changes: 14 additions & 14 deletions charts/asyncjobs-task-scheduler/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ In my case the context is made using this:

```
taskScheduler:
sslSecret: task-scheduler-tls
contextSecret: task-scheduler-tls
context:
url: nats://broker-broker-ss:4222
ca: /etc/asyncjobs/secret/ca.crt
Expand All @@ -53,16 +53,16 @@ Valid keys are: `url`, `token`, `user`, `password`, `creds` (path to a file), `n

## Values

| Variable | Description | Default |
|---------------------------|------------------------------------------------------------------|--------------------|
| `image.registry` | Domain name of the docker registry hosting your image | `docker.io` |
| `image.repository` | The docker repository with the image | `choria/asyncjobs` |
| `image.tag` | The tag to deploy | `latest` |
| `image.pullPolicy` | The kubernetes pull policy to use | `Always` |
| `image.pullSecret` | If you need a secret to access a private repository specify here | `""` |
| `podAnnotations` | Additional annotations to apply to the pod | `{}` |
| `podLabels` | Additional labels to apply to the pod | `{}` |
| `prometheus.enabled` | Add annotations for prometheus discovery | `true` |
| `taskScheduler.replicas` | How many instances to run | `2` |
| `taskScheduler.sslSecret` | An optional secret to mount onto `/etc/asyncjobs/secret` | `""` |
| `taskScheduler.context` | A required NATS connection context, see above | `{}` |
| Variable | Description | Default |
|-------------------------------|------------------------------------------------------------------|--------------------|
| `image.registry` | Domain name of the docker registry hosting your image | `docker.io` |
| `image.repository` | The docker repository with the image | `choria/asyncjobs` |
| `image.tag` | The tag to deploy | `latest` |
| `image.pullPolicy` | The kubernetes pull policy to use | `Always` |
| `image.pullSecret` | If you need a secret to access a private repository specify here | `""` |
| `podAnnotations` | Additional annotations to apply to the pod | `{}` |
| `podLabels` | Additional labels to apply to the pod | `{}` |
| `prometheus.enabled` | Add annotations for prometheus discovery | `true` |
| `taskScheduler.replicas` | How many instances to run | `2` |
| `taskScheduler.contextSecret` | An optional secret to mount onto `/etc/asyncjobs/secret` | `""` |
| `taskScheduler.context` | A required NATS connection context, see above | `{}` |
10 changes: 5 additions & 5 deletions charts/asyncjobs-task-scheduler/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ spec:
- name: context
mountPath: "/home/asyncjobs/.config/nats/context"
readOnly: true
{{- if .Values.taskScheduler.sslSecret }}
- name: ssl-secret
{{- if .Values.taskScheduler.contextSecret }}
- name: context-secret
mountPath: "/etc/asyncjobs/secret"
readOnly: true
{{- end }}
Expand All @@ -59,8 +59,8 @@ spec:
- name: context
configMap:
name: {{ template "ajcts.fullname" . }}-context
{{- if .Values.taskScheduler.sslSecret }}
- name: ssl-secret
{{- if .Values.taskScheduler.contextSecret }}
- name: context-secret
secret:
secretName: "{{ .Values.taskScheduler.sslSecret }}"
secretName: "{{ .Values.taskScheduler.contextSecret }}"
{{- end }}
2 changes: 1 addition & 1 deletion charts/asyncjobs-task-scheduler/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ taskScheduler:
replicas: 2

# if set mounts the secret on /etc/asyncjobs/secret
sslSecret: ~
contextSecret: ~

# configures the connection to NATS JetStream
context: {}

0 comments on commit 9e5b3d6

Please sign in to comment.