Skip to content

Commit 4f03380

Browse files
committed
auto-generate ssh_key secret by default
1 parent aa787ba commit 4f03380

File tree

2 files changed

+12
-32
lines changed

2 files changed

+12
-32
lines changed

templates/secrets_ssh.yaml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
apiVersion: v1
88
kind: Secret
99
metadata:
10-
name: {{ .Release.Name }}-st2-ssh
10+
{{- $name := print .Release.Name "-st2-ssh" }}
11+
name: {{ $name }}
1112
annotations:
1213
description: StackStorm SSH secret key for 'stanley' user, used to run actions on remote machines
1314
labels:
@@ -20,4 +21,8 @@ metadata:
2021
type: Opaque
2122
data:
2223
# SSH private key for the 'stanley' system user ('system_user.ssh_key_file' in st2.conf).
23-
private_key: {{ required "Secret 'st2.ssh_key' is required for StackStorm system user!" .Values.st2.ssh_key | b64enc | quote }}
24+
{{- if .Release.IsUpgrade }}
25+
private_key: {{ index (lookup "v1" "Secret" .Release.Namespace $name).data "private_key" }}
26+
{{ else }}
27+
private_key: {{ default (genPrivateKey "rsa") .Values.st2.ssh_key | b64enc | quote }}
28+
{{ end }}

values.yaml

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -53,36 +53,11 @@ st2:
5353
# Warning! Replace with your own generated key!
5454
#datastore_crypto_key: {"hmacKey": {"hmacKeyString": "", "size": 256}, "size": 256, "aesKeyString": "", "mode": "CBC"}
5555
# SSH private key for the 'stanley' system user ('system_user.ssh_key_file' in st2.conf)
56-
# Warning! Replace with your own SSH key!
57-
# TODO: For prod/stable consider auto-generating if no key provided (#15)
58-
ssh_key: |-
59-
-----BEGIN RSA PRIVATE KEY-----
60-
MIIEowIBAAKCAQEAs73kblN3XfLR6tYsHRHyX/aQKx4amcNjT+E+2ufwqkiINDyA
61-
CGim0Z4WFOEO6UtZApeOlUehp2MEFGFpl2u8vUC1b7AsWaImB4ywMIPOFblqaEag
62-
DskrFp7FOggqZFWX7NwVZpm/KkvCw/fCehnxuv+za+hUtg4Qiv86qXShrlsn98B7
63-
64Aq27oxkvhRU2OkDUP/wPNQnXzIZxfFYSvS7rGzKrswdZfWysscIUor4a+7GahM
64-
yq8PGD6qp2wkiL7wFarZerS2Sq3M06Y89yzppCoPYI6kaEPuqrjSYZvh38CAVbGG
65-
SgPv3CFgR1N3BsBEAx7OF+40R58C+3ldH8e1tQIDAQABAoIBAQCN7137YR3Zqm3p
66-
q8aaDhn/fYzK/7KxyYEbCxu/cXiyfyRPW5cfDMTuso9tXWuQ/lcDnPqTF0WoEKCg
67-
F2xyjjk0mWytDcl33nt5areXF/4dWZWVUnACPQkxi57i/J+9K3oVKJYdtzsmAz2B
68-
0pxYHzSsHk9o3sZGHUUi/fks51TlgPNgOP8hf7/K9w9+FSE26geqjddqWwQbbStI
69-
rDc3ZPMcGI4E5DuGmnrxWf4omUqScTB+bvUgN+WC02v1Bj4HaAX7PlLCUZMuTk3S
70-
BcG4v7qiglxVYdBjtHNwtg1YAoVYh6sXckxqi1XudhoRXGlgYtyrcW0mWnnB4hIQ
71-
vy7//uABAoGBANw8H1h93U1HNsqfIa1Ys3u6qZdHByHvA8e7Jk6GEFUEOAQSyxZ+
72-
0RbFWC4knuQL+YklqeDNCXekwVEvVenf2lhZ4rHNbmv/9pWhq7sQcDOQPi5nVxJl
73-
bkQoQkeNGeH8KPF1E2RsfJ8uU3NfD00yMFrNaeBUIlY44ABMOQSJREq1AoGBANDu
74-
V0IV1BahqEW5mmnTdHLG6+tiSQdutrQv4hxBL59PhwyeMvpzFgwkNmymAZMLl40D
75-
Y/0wg2lVr7Fb+peCrLpiNMEPWv/a38IEVTDm7YcsHZayEsc1vdjdMoZ8k5VNi25F
76-
+lvQ/CxDNqJGTNEBBYmb5QHopBh8YowwIrT0yZ8BAoGAFYtAGbz+SA/+WSXl+noh
77-
3Kmu62CEXxptiT1Siv3sXRSzkhpwiXvQYmTdsm3cqTxOpc7sZlRIZ87TJmj2A5Hl
78-
Xx0z4ubQtXntmkedcAg0oaarnoh3aRJJDhvOGAfCj2vGaZBlXD6MllnGyhNzgL63
79-
IjrT76DrVvnrV7wdG8d9yb0CgYAuQFT4wDRPPkIuDURtoO3qarbXSM654nx3rxHz
80-
B0svjT9sP6kxYEDFN08FBkra7noCMXn1FsRAkUNvk9kJqVfresoK4wdWFHHsVWE2
81-
jiiO/+kc7xbRGsiINY91ziYtqxjutHcT1FO+yLJTghSHQB6ls+kiXwnUkdSPDCji
82-
vj3UAQKBgE19oSdfKbpKTyHu5rs+lN/KictDuMrqAriWODCygZ1/X1J1zpqvpUbt
83-
WE8BWLQ1vBV6c7V4Q0Wp6LuTnNnvu/lvVugJW/TbrzFw6CFe5fEISmIHAMnqVz8x
84-
OdOJyinSM1svoBGnYfyAqINKrqCSGSKmprlMo0Ma3erI7SuojWBS
85-
-----END RSA PRIVATE KEY-----
56+
# (auto-generated by default, preserved across upgrades)
57+
#ssh_key: |-
58+
# -----BEGIN RSA PRIVATE KEY-----
59+
# ...
60+
# -----END RSA PRIVATE KEY-----
8661

8762
# Custom StackStorm config (st2.user.conf) which will apply settings on top of default st2.conf
8863
config: |

0 commit comments

Comments
 (0)