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

Roll metal-api on cert changes. #115

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Roll metal-api on cert changes. #115

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/metal-control-plane/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for deploying the metal control plane in K8s
name: metal-control-plane
version: 0.4.7
version: 0.4.9
49 changes: 49 additions & 0 deletions charts/metal-control-plane/templates/metal-api-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
---
apiVersion: v1
kind: Secret
metadata:
labels:
app: metal-api
name: metal-api
type: Opaque
stringData:
view_key: {{ .Values.metal_api.view_key }}
edit_key: {{ .Values.metal_api.edit_key }}
admin_key: {{ .Values.metal_api.admin_key }}
---
apiVersion: v1
kind: Secret
metadata:
labels:
app: metal-api-grpc
name: metal-api-grpc
data:
server_key.pem: {{ .Values.metal_api.grpc.tls.server_key_enc }}
server.pem: {{ .Values.metal_api.grpc.tls.server_cert_enc }}
ca.pem: {{ .Values.metal_api.grpc.tls.ca_cert_enc }}
{{- if .Values.metal_api.bmc.superuser.enabled }}
---
apiVersion: v1
kind: Secret
metadata:
labels:
app: metal-api-bmc
name: metal-api-bmc
data:
superuser.pwd: {{ .Values.metal_api.bmc.superuser.pwd_enc }}
{{- end }}
{{- if .Values.metal_api.s3.enabled }}
---
apiVersion: v1
kind: Secret
metadata:
labels:
app: metal-api-s3
name: metal-api-s3
type: Opaque
stringData:
s3_address: {{ .Values.metal_api.s3.address }}
s3_key: {{ .Values.metal_api.s3.key }}
s3_secret: {{ .Values.metal_api.s3.secret }}
s3_firmware_bucket: {{ .Values.metal_api.s3.firmware_bucket }}
{{- end }}
55 changes: 6 additions & 49 deletions charts/metal-control-plane/templates/metal-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,4 @@
---
apiVersion: v1
kind: Secret
metadata:
labels:
app: metal-api
name: metal-api
type: Opaque
stringData:
view_key: {{ .Values.metal_api.view_key }}
edit_key: {{ .Values.metal_api.edit_key }}
admin_key: {{ .Values.metal_api.admin_key }}
---
apiVersion: v1
kind: Secret
metadata:
labels:
app: metal-api-grpc
name: metal-api-grpc
data:
server_key.pem: {{ .Values.metal_api.grpc.tls.server_key_enc }}
server.pem: {{ .Values.metal_api.grpc.tls.server_cert_enc }}
ca.pem: {{ .Values.metal_api.grpc.tls.ca_cert_enc }}
{{- if .Values.metal_api.bmc.superuser.enabled }}
---
apiVersion: v1
kind: Secret
metadata:
labels:
app: metal-api-bmc
name: metal-api-bmc
data:
superuser.pwd: {{ .Values.metal_api.bmc.superuser.pwd_enc }}
{{- end }}
{{- if .Values.metal_api.s3.enabled }}
---
apiVersion: v1
kind: Secret
metadata:
labels:
app: metal-api-s3
name: metal-api-s3
type: Opaque
stringData:
s3_address: {{ .Values.metal_api.s3.address }}
s3_key: {{ .Values.metal_api.s3.key }}
s3_secret: {{ .Values.metal_api.s3.secret }}
s3_firmware_bucket: {{ .Values.metal_api.s3.firmware_bucket }}
{{- end }}
---
apiVersion: apps/v1
kind: Deployment
metadata:
Expand All @@ -63,6 +14,12 @@ spec:
metadata:
labels:
app: metal-api
annotations:
checksum/config: {{ include (print $.Template.BasePath "/metal-api-config.yaml") . | sha256sum }}
checksum/masterdata-api-config: {{ include (print $.Template.BasePath "/masterdata-api-config.yaml") . | sha256sum }}
{{- if .Values.metal_api.nsq.tls.enabled }}
checksum/nsqd-tls-config: {{ .Values.metal_api.nsq.tls.checksum }}
{{- end }}
spec:
restartPolicy: Always
# it's better to disable the service links as the default args do not work properly otherwise (metal#64)
Expand Down
1 change: 1 addition & 0 deletions charts/metal-control-plane/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ metal_api:
tls:
enabled: false
secret_name: ""
checksum: ""
grpc:
tls:
enabled: false
Expand Down
Loading