Skip to content

Commit

Permalink
CIV-52 Three helm fixes:
Browse files Browse the repository at this point in the history
1) A persistent rabbitmq secret that is not reset after every deploy (see bitnami/charts#3094 )
2) Enable rolling pod deployments on upgrades
3) Disable analytics in the sample deployment
  • Loading branch information
dankelleher committed Jul 13, 2020
1 parent 689065c commit ec7d45d
Show file tree
Hide file tree
Showing 13 changed files with 44 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ spec:
labels:
app: admin-interface
requires-aws-creds: "{{ .Values.pods.labels.requiresAwsCreds }}"
annotations:
rollme: {{ randAlphaNum 5 | quote }}
spec:
containers:
- name: admin-interface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ spec:
labels:
app: mobile-interface
requires-aws-creds: "{{ .Values.pods.labels.requiresAwsCreds }}"
annotations:
rollme: {{ randAlphaNum 5 | quote }}
spec:
containers:
- name: mobile-interface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ spec:
labels:
app: notification-interface
requires-aws-creds: "{{ .Values.pods.labels.requiresAwsCreds }}"
annotations:
rollme: {{ randAlphaNum 5 | quote }}
spec:
containers:
- name: notification-interface
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ spec:
labels:
app: analytics
requires-aws-creds: "{{ .Values.pods.labels.requiresAwsCreds }}"
annotations:
rollme: {{ randAlphaNum 5 | quote }}
spec:
containers:
- name: analytics
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ spec:
labels:
app: scheduler
requires-aws-creds: "{{ .Values.pods.labels.requiresAwsCreds }}"
annotations:
rollme: {{ randAlphaNum 5 | quote }}
spec:
containers:
- name: scheduler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ spec:
labels:
app: attestation-module
requires-aws-creds: "{{ .Values.pods.labels.requiresAwsCreds }}"
annotations:
rollme: {{ randAlphaNum 5 | quote }}
spec:
containers:
- name: attestation-module
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ spec:
labels:
app: credential-module
requires-aws-creds: "{{ .Values.pods.labels.requiresAwsCreds }}"
annotations:
rollme: {{ randAlphaNum 5 | quote }}
spec:
containers:
- name: credential-module
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ spec:
labels:
app: data-retention-module
requires-aws-creds: "{{ .Values.pods.labels.requiresAwsCreds }}"
annotations:
rollme: {{ randAlphaNum 5 | quote }}
spec:
containers:
- name: data-retention-module
Expand Down
2 changes: 2 additions & 0 deletions deploy/kubernetes/idv/templates/module-sign-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ spec:
labels:
app: sign-module
requires-aws-creds: "{{ .Values.pods.labels.requiresAwsCreds }}"
annotations:
rollme: {{ randAlphaNum 5 | quote }}
spec:
containers:
- name: sign-module
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ spec:
labels:
app: validator-portal
requires-aws-creds: "{{ .Values.pods.labels.requiresAwsCreds }}"
annotations:
rollme: {{ randAlphaNum 5 | quote }}
spec:
containers:
- name: validator-portal
Expand Down
20 changes: 20 additions & 0 deletions deploy/kubernetes/idv/templates/rabbitmq-secrets.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This secret file is copied from the rabbitmq subchart, and ensures that a
# new secret is created for rabbitmq on install only. Subsequent updates
# use the existing one.
# For this to work, existingPasswordSecret and existingErlangSecret must be
# true in values.yaml (to prevent the subchart from generating its own secret).
{{ if or ( .Release.IsInstall ) (or (not .Values.rabbitmq.rabbitmq.existingErlangSecret) (not .Values.rabbitmq.rabbitmq.existingPasswordSecret)) }}
apiVersion: v1
kind: Secret
metadata:
name: {{ .Values.rabbitmq.fullnameOverride }}
labels:
app: {{ .Values.rabbitmq.fullnameOverride }}
annotations:
# prevents helmm from deleting this when Release.IsInstall is false
helm.sh/resource-policy: "keep"
type: Opaque
data:
rabbitmq-password: {{ randAlphaNum 10 | b64enc | quote }}
rabbitmq-erlang-cookie: {{ randAlphaNum 32 | b64enc | quote }}
{{ end }}
2 changes: 1 addition & 1 deletion deploy/kubernetes/idv/values.sample.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ storage:
zones: us-east-1a, us-east-1b

analytics:
enabled: true
enabled: false
3 changes: 3 additions & 0 deletions deploy/kubernetes/idv/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ mongodb:
rabbitmq:
fullnameOverride: rabbitmq
internal: true
rabbitmq:
existingPasswordSecret: rabbitmq
existingErlangSecret: rabbitmq
resources:
requests:
memory: 256Mi
Expand Down

0 comments on commit ec7d45d

Please sign in to comment.