Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: added mtls support #361

Merged
merged 2 commits into from
May 21, 2024
Merged

feat: added mtls support #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
becca80
feat: added mtls support
alanjino May 8, 2024
9922764
Merge branch 'intelops:main' into main
alanjino May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/agent/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.1.21
version: 1.1.22

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
59 changes: 55 additions & 4 deletions charts/agent/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,16 @@ spec:
# path: /
# port: http
env:
{{- if .Values.mtls.enabled }}
- name: CERT_FILE
value: /etc/mtls/client-cert.pem
- name: KEY_FILE
value: /etc/mtls/client-key.pem
- name: CA_FILE
value: /etc/mtls/ca-cert.pem
- name: ENABLE_MTLS_NATS
value: "true"
{{- end }}
- name: KUBERHEALTHY_URL
value: {{ .Values.kuberhealthy.url }}
- name: POLL_INTERVAL
Expand Down Expand Up @@ -91,8 +101,13 @@ spec:
value: {{ .Values.opentelemetry.url }}
- name : APPLICATION_NAME
value : {{ .Values.opentelemetry.appName }}
{{- if .Values.persistence.enabled }}

volumeMounts:
{{- if .Values.mtls.enabled }}
- name: mtls
mountPath: /etc/mtls
{{- end }}
{{- if .Values.persistence.enabled }}
- name: data
mountPath: {{ .Values.persistence.mountPath }}
{{- end }}
Expand All @@ -118,6 +133,16 @@ spec:
containerPort: 8081
protocol: TCP
env:
{{- if .Values.mtls.enabled }}
- name: CERT_FILE
value: /etc/mtls/client-cert.pem
- name: KEY_FILE
value: /etc/mtls/client-key.pem
- name: CA_FILE
value: /etc/mtls/ca-cert.pem
- name: ENABLE_MTLS_NATS
value: "true"
{{- end }}
- name: CLUSTER_NAME
value: {{ .Values.clusterName }}
- name: NATS_TOKEN
Expand All @@ -137,8 +162,13 @@ spec:
value: {{ .Values.opentelemetry.url }}
- name : APPLICATION_NAME
value : {{ .Values.opentelemetry.appName }}
{{- if .Values.git_bridge.persistence.enabled }}

volumeMounts:
{{- if .Values.mtls.enabled }}
- name: mtls
mountPath: /etc/mtls
{{- end }}
{{- if .Values.git_bridge.persistence.enabled }}
- name: data
mountPath: {{ .Values.git_bridge.persistence.mountPath }}
{{- end }}
Expand All @@ -165,6 +195,16 @@ spec:
containerPort: 8082
protocol: TCP
env:
{{- if .Values.mtls.enabled }}
- name: CERT_FILE
value: /etc/mtls/client-cert.pem
- name: KEY_FILE
value: /etc/mtls/client-key.pem
- name: CA_FILE
value: /etc/mtls/ca-cert.pem
- name: ENABLE_MTLS_NATS
value: "true"
{{- end }}
- name: CLUSTER_NAME
value: {{ .Values.clusterName }}
- name: NATS_TOKEN
Expand All @@ -184,8 +224,13 @@ spec:
value: {{ .Values.opentelemetry.url }}
- name : APPLICATION_NAME
value : {{ .Values.opentelemetry.appName }}
{{- if .Values.container_bridge.persistence.enabled }}

volumeMounts:
{{- if .Values.mtls.enabled }}
- name: mtls
mountPath: /etc/mtls
{{- end }}
{{- if .Values.container_bridge.persistence.enabled }}
- name: data
mountPath: {{ .Values.container_bridge.persistence.mountPath }}
{{- end }}
Expand All @@ -203,12 +248,18 @@ spec:
ephemeral-storage: {{ .Values.container_bridge.resources.requests.ephemeralstorage }}
{{- end }}
{{- end }}
{{- if .Values.persistence.enabled }}

volumes:
{{- if .Values.persistence.enabled }}
- name: data
persistentVolumeClaim:
claimName: {{ include "agent.fullname" . }}-data
{{- end }}
{{- if .Values.mtls.enabled }}
- name: mtls
secret:
secretName: {{ .Values.mtls.secret.name }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
6 changes: 6 additions & 0 deletions charts/agent/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,3 +281,9 @@ nats:
# secret:
# name: ""
# key: ""


mtls:
enabled: false
secret:
name:
2 changes: 1 addition & 1 deletion charts/client/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 1.1.27
version: 1.1.28

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
22 changes: 22 additions & 0 deletions charts/client/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,12 @@ spec:
- name: http
containerPort: 80
protocol: TCP

volumeMounts:
{{- if .Values.mtls.enabled }}
- name: mtls
mountPath: /etc/mtls
{{- end }}
# livenessProbe:
# httpGet:
# path: /
Expand All @@ -93,6 +99,16 @@ spec:
# path: /
# port: http
env:
{{- if .Values.mtls.enabled }}
- name: CERT_FILE
value: /etc/mtls/client-cert.pem
- name: KEY_FILE
value: /etc/mtls/client-key.pem
- name: CA_FILE
value: /etc/mtls/ca-cert.pem
- name: ENABLE_MTLS_NATS
value: "true"
{{- end }}
- name: NATS_TOKEN
{{- if and .Values.nats.enabled .Values.nats.auth.enabled .Values.nats.auth.token }}
value: {{ .Values.nats.auth.token }}
Expand Down Expand Up @@ -169,6 +185,12 @@ spec:
value : {{ .Values.consumer.kuberhealthyconsumer }}
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- if .Values.mtls.enabled }}
volumes:
- name: mtls
secret:
secretName: {{ .Values.mtls.secret.name }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
19 changes: 18 additions & 1 deletion charts/client/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,15 @@ nats:
# secret:
# name: ""
# key: ""
tls: {}
# secret:
# name:
# ca: ""
# cert: ""
# key: ""
# verify: true
# verify_and_map: true

nats:
jetstream:
enabled: true
Expand Down Expand Up @@ -188,4 +197,12 @@ consumer:
trivyconsumer: "TRIVY_CONSUMER"
trivyimageconsumer: "TRIVY_IMAGE_CONSUMER"
trivysbomconsumer: "TRIVY_SBOM_CONSUMER"
kuberhealthyconsumer: "KUBERHEALTHY_CONSUMER"
kuberhealthyconsumer: "KUBERHEALTHY_CONSUMER"


mtls:
enabled: false
secret:
name:


Loading