Skip to content
This repository has been archived by the owner on Apr 17, 2024. It is now read-only.

helm: add option to use an existing secret for rgw credentials #54

Merged
merged 1 commit into from
Oct 11, 2023
Merged

helm: add option to use an existing secret for rgw credentials #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/extended-ceph-exporter/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.2.8
version: 1.3.0

# 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
6 changes: 5 additions & 1 deletion charts/extended-ceph-exporter/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

A Helm chart for deploying the extended-ceph-exporter to Kubernetes

![Version: 1.2.8](https://img.shields.io/badge/Version-1.2.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.2](https://img.shields.io/badge/AppVersion-v1.0.2-informational?style=flat-square)
![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.0.2](https://img.shields.io/badge/AppVersion-v1.0.2-informational?style=flat-square)

## Get Repo Info

Expand Down Expand Up @@ -56,6 +56,10 @@ _See [helm uninstall](https://helm.sh/docs/helm/helm_uninstall/) for command doc
| affinity | object | `{}` | [Affinity](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity) |
| autoscaling | object | `{"enabled":false,"maxReplicas":100,"minReplicas":1,"targetCPUUtilizationPercentage":80}` | Autoscaling configuration |
| config.rgw.accessKey | string | Randomly generated | RGW admin access key |
| config.rgw.existingSecret | object | `{"keys":{"access":"access","secret":"secret"},"name":""}` | Existing RGW admin credentials secret config |
| config.rgw.existingSecret.keys.access | string | `"access"` | Access key secret key name |
| config.rgw.existingSecret.keys.secret | string | `"secret"` | Secret key secret key name |
| config.rgw.existingSecret.name | string | `""` | Name of the existing RGW admin credentials secret |
| config.rgw.host | string | First detected RGW endpoint | The Ceph RGW endpoint as a URL, e.g. "https://your-ceph-rgw-endpoint-here:8443" |
| config.rgw.secretKey | string | Randomly generated | RGW admin secret key |
| fullnameOverride | string | `""` | Override fully-qualified app name |
Expand Down
13 changes: 13 additions & 0 deletions charts/extended-ceph-exporter/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,19 @@ spec:
envFrom:
- secretRef:
name: {{ include "extended-ceph-exporter.fullname" . }}
{{- if .Values.config.rgw.existingSecret.name }}
env:
- name: CEPH_METRICS_RGW_ACCESS_KEY
valueFrom:
secretKeyRef:
name: {{ .Values.config.rgw.existingSecret.name | quote }}
key: {{ .Values.config.rgw.existingSecret.keys.access | quote }}
- name: CEPH_METRICS_RGW_SECRET_KEY
valueFrom:
secretKeyRef:
name: {{ .Values.config.rgw.existingSecret.name | quote }}
key: {{ .Values.config.rgw.existingSecret.keys.secret | quote }}
{{- end }}
ports:
- name: http-metrics
containerPort: 9138
Expand Down
22 changes: 16 additions & 6 deletions charts/extended-ceph-exporter/templates/post-install-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,18 +89,28 @@ spec:
- name: CEPH_METRICS_RGW_HOST
valueFrom:
secretKeyRef:
name: {{ include "extended-ceph-exporter.fullname" . }}
key: CEPH_METRICS_RGW_HOST
name: {{ include "extended-ceph-exporter.fullname" . }}
key: CEPH_METRICS_RGW_HOST
- name: RGW_ACCESS_KEY
valueFrom:
secretKeyRef:
name: {{ include "extended-ceph-exporter.fullname" . }}
key: CEPH_METRICS_RGW_ACCESS_KEY
{{- if .Values.config.rgw.existingSecret.name }}
name: {{ .Values.config.rgw.existingSecret.name | quote }}
key: {{ .Values.config.rgw.existingSecret.keys.access | quote }}
{{ else }}
name: {{ include "extended-ceph-exporter.fullname" . }}
key: CEPH_METRICS_RGW_ACCESS_KEY
{{- end }}
- name: RGW_SECRET_KEY
valueFrom:
secretKeyRef:
name: {{ include "extended-ceph-exporter.fullname" . }}
key: CEPH_METRICS_RGW_SECRET_KEY
{{- if .Values.config.rgw.existingSecret.name }}
name: {{ .Values.config.rgw.existingSecret.name | quote }}
key: {{ .Values.config.rgw.existingSecret.keys.secret | quote }}
{{ else }}
name: {{ include "extended-ceph-exporter.fullname" . }}
key: CEPH_METRICS_RGW_SECRET_KEY
{{- end }}
command:
- /bin/bash
- -c
Expand Down
2 changes: 2 additions & 0 deletions charts/extended-ceph-exporter/templates/secrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ metadata:
{{- include "extended-ceph-exporter.labels" . | nindent 4 }}
data:
CEPH_METRICS_RGW_HOST: {{ include "extended-ceph-exporter.rgwHost" . | b64enc }}
{{- if not .Values.config.rgw.existingSecret.name }}
CEPH_METRICS_RGW_ACCESS_KEY: {{ .Values.config.rgw.accessKey | default (randAlphaNum 20) | b64enc }}
CEPH_METRICS_RGW_SECRET_KEY: {{ .Values.config.rgw.secretKey | default (randAlphaNum 40) | b64enc }}
{{- end }}
{{- range $k, $v := .Values.additionalEnv }}
{{ $k }}: {{ $v | b64enc }}
{{- end }}
9 changes: 9 additions & 0 deletions charts/extended-ceph-exporter/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,15 @@ config:
# -- The Ceph RGW endpoint as a URL, e.g. "https://your-ceph-rgw-endpoint-here:8443"
# @default -- First detected RGW endpoint
host: ""
# -- Existing RGW admin credentials secret config
existingSecret:
# -- Name of the existing RGW admin credentials secret
name: ""
keys:
# -- Access key secret key name
access: "access"
# -- Secret key secret key name
secret: "secret"
# -- RGW admin access key
# @default -- Randomly generated
accessKey: null
Expand Down