Skip to content

Commit

Permalink
Merge pull request #79 from RenePinnow/main
Browse files Browse the repository at this point in the history
feat: add capability to mount a custom ca
  • Loading branch information
blind-oracle authored Nov 4, 2024
2 parents f5da965 + 098ed69 commit 7b3718a
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 13 deletions.
2 changes: 1 addition & 1 deletion deploy/k8s/chart/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
description: A Helm Chart for cortex-tenant
name: cortex-tenant
version: 0.7.0 # This is the chart version
version: 0.8.0 # This is the chart version
appVersion: 1.13.0 # version number of the application being deployed.
type: application
sources:
Expand Down
11 changes: 11 additions & 0 deletions deploy/k8s/chart/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,23 @@ spec:
volumeMounts:
- mountPath: /data/
name: config-file
{{- if .Values.customCA }}
- mountPath: /etc/ssl/certs/ca-bundle.crt
name: ca-bundle
subPath: {{ .Values.customCA.subPath | default "ca.crt" }}
{{- end }}
securityContext:
{{- toYaml .Values.podSecurityContext | nindent 8 }}
volumes:
- configMap:
name: {{ include "cortex-tenant.fullname" . }}-configmap
name: config-file
{{- if .Values.customCA }}
- name: ca-bundle
secret:
defaultMode: 420
secretName: {{ .Values.customCA.secretName | default "ca-bundle" }}
{{- end }}
{{- if .Values.priorityClassName }}
priorityClassName: {{ .Values.priorityClassName }}
{{- end }}
Expand Down
6 changes: 6 additions & 0 deletions deploy/k8s/chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -253,3 +253,9 @@ serviceMonitor:
additionalLabels: {}
# namespace:
rules: []

# -- Optionally specify an custom ca if cortex endpoint is running in a private environment with a self signed ca
# customCA: {}
# secretName: ca-bundle
# subPath: ca.crt

Binary file added docs/cortex-tenant-0.8.0.tgz
Binary file not shown.
36 changes: 24 additions & 12 deletions docs/index.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,19 @@ entries:
cortex-tenant:
- apiVersion: v2
appVersion: 1.13.0
created: "2024-10-18T12:00:21.933807+02:00"
created: "2024-11-04T15:10:04.93614Z"
description: A Helm Chart for cortex-tenant
digest: 9a4589cf0aca3c614d832152d7755fa988aa49f0167557e7648213d4e7823e2d
name: cortex-tenant
sources:
- https://github.com/blind-oracle/cortex-tenant
type: application
urls:
- cortex-tenant-0.8.0.tgz
version: 0.8.0
- apiVersion: v2
appVersion: 1.13.0
created: "2024-11-04T15:10:04.935709Z"
description: A Helm Chart for cortex-tenant
digest: 5c8329d569b12900b6343443f43b8ffa976e23b0c2175dcaeade51cb11ae881d
name: cortex-tenant
Expand All @@ -15,7 +27,7 @@ entries:
version: 0.7.0
- apiVersion: v2
appVersion: 1.13.0
created: "2024-10-18T12:00:21.933422+02:00"
created: "2024-11-04T15:10:04.935285Z"
description: A Helm Chart for cortex-tenant
digest: b2025be4ae67a5b460dca8529adc6a7bc5b3dda1864e12cff759283ad6aa5f3d
name: cortex-tenant
Expand All @@ -27,7 +39,7 @@ entries:
version: 0.6.0
- apiVersion: v2
appVersion: 1.13.0
created: "2024-10-18T12:00:21.933054+02:00"
created: "2024-11-04T15:10:04.934702Z"
description: A Helm Chart for cortex-tenant
digest: f55d2d0927459b1d30aa55ac280319896daf5aa63b48cc2f4664e7649ac2c76c
name: cortex-tenant
Expand All @@ -39,7 +51,7 @@ entries:
version: 0.5.0
- apiVersion: v2
appVersion: 1.13.0
created: "2024-10-18T12:00:21.93254+02:00"
created: "2024-11-04T15:10:04.9341Z"
description: A Helm Chart for cortex-tenant
digest: f2b3499377fd5a34c6893e67ab79854c5c8c835b229a7cc7a67e0666cca9ab29
name: cortex-tenant
Expand All @@ -51,7 +63,7 @@ entries:
version: 0.4.2
- apiVersion: v2
appVersion: 1.11.0
created: "2024-10-18T12:00:21.931263+02:00"
created: "2024-11-04T15:10:04.933521Z"
description: A Helm Chart for cortex-tenant
digest: 60131d246dca1ead2fea8a2c188f25a5fe3c4d90368ba091a4bd0e4e8e6dcceb
name: cortex-tenant
Expand All @@ -63,7 +75,7 @@ entries:
version: 0.4.0
- apiVersion: v2
appVersion: 1.11.0
created: "2024-10-18T12:00:21.930956+02:00"
created: "2024-11-04T15:10:04.932951Z"
description: A Helm Chart for cortex-tenant
digest: 56abb06ce3f646b94932d36b0d4ed5e5386ec390ebfd7d9110036291086d6f39
name: cortex-tenant
Expand All @@ -73,7 +85,7 @@ entries:
version: 0.3.2
- apiVersion: v2
appVersion: 1.11.0
created: "2024-10-18T12:00:21.930723+02:00"
created: "2024-11-04T15:10:04.932502Z"
description: A Helm Chart for cortex-tenant
digest: 834b006e449ae97219799bfa3b7bd274aa386978802dbd49279258f534cc4da5
name: cortex-tenant
Expand All @@ -83,7 +95,7 @@ entries:
version: 0.3.1
- apiVersion: v2
appVersion: 1.11.0
created: "2024-10-18T12:00:21.930485+02:00"
created: "2024-11-04T15:10:04.931282Z"
description: A Helm Chart for cortex-tenant
digest: cf12ab22dd0973e94e15d8246f66ae35738dadfc489952f919ed326a1f7eed5a
name: cortex-tenant
Expand All @@ -93,7 +105,7 @@ entries:
version: 0.3.0
- apiVersion: v2
appVersion: 1.11.0
created: "2024-10-18T12:00:21.930234+02:00"
created: "2024-11-04T15:10:04.9307Z"
description: A Helm Chart for cortex-tenant
digest: c967d4dea6ff8ae827133876f588d22bfa51d10168e4bca57f161b7ab6097c7c
name: cortex-tenant
Expand All @@ -103,7 +115,7 @@ entries:
version: 0.2.1
- apiVersion: v2
appVersion: 1.11.0
created: "2024-10-18T12:00:21.930023+02:00"
created: "2024-11-04T15:10:04.930309Z"
description: A Helm Chart for cortex-tenant
digest: 8b9caea0e1774a6c8f3e627a63386f532498ca5f410927c702380692e5d20b61
name: cortex-tenant
Expand All @@ -113,12 +125,12 @@ entries:
version: 0.2.0
- apiVersion: v2
appVersion: 1.10.1
created: "2024-10-18T12:00:21.929794+02:00"
created: "2024-11-04T15:10:04.929865Z"
description: A Helm Chart for cortex-tenant
digest: eabef3ad16e555543e32d9308994f76679e5fa54371cccd3957112f33a28a59e
name: cortex-tenant
type: application
urls:
- cortex-tenant-0.1.0.tgz
version: 0.1.0
generated: "2024-10-18T12:00:21.92949+02:00"
generated: "2024-11-04T15:10:04.929137Z"

0 comments on commit 7b3718a

Please sign in to comment.