Skip to content

Commit e3299b1

Browse files
committed
Create enduro-am-secret with secretGenerator
1 parent 3f3b559 commit e3299b1

File tree

4 files changed

+27
-3
lines changed

4 files changed

+27
-3
lines changed

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
/covreport
33
/dist
44
/.tilt.env
5-
/*.secret
5+
*.secret

enduro.toml

+1
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ transferDeadline = "1h"
113113

114114
[am.sftp]
115115
host = "" # The Archivematica Storage Service hostname.
116+
port = ""
116117
user = ""
117118
knownHostsFile = ""
118119
remoteDir = "/transfer_source"

hack/kube/overlays/dev-am/enduro-am.yaml

+17-2
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,30 @@ spec:
8181
secretKeyRef:
8282
name: enduro-am-secret
8383
key: sftp_host
84+
- name: ENDURO_AM_SFTP_PORT
85+
valueFrom:
86+
secretKeyRef:
87+
name: enduro-am-secret
88+
key: sftp_port
8489
- name: ENDURO_AM_SFTP_USER
8590
valueFrom:
8691
secretKeyRef:
8792
name: enduro-am-secret
8893
key: sftp_user
94+
- name: ENDURO_AM_SFTP_REMOTEDIR
95+
valueFrom:
96+
secretKeyRef:
97+
name: enduro-am-secret
98+
key: sftp_remote_dir
8999
- name: ENDURO_AM_SFTP_KNOWNHOSTSFILE
90100
value: "/etc/ssh/known_hosts"
91101
- name: ENDURO_AM_SFTP_PRIVATEKEY_PATH
92102
value: "/etc/ssh/id_ed25519"
103+
- name: ENDURO_AM_SFTP_PRIVATEKEY_PASSPHRASE
104+
valueFrom:
105+
secretKeyRef:
106+
name: enduro-am-secret
107+
key: sftp_private_key_passphrase
93108
volumeMounts:
94109
- name: ssh-volume
95110
mountPath: "/etc/ssh"
@@ -99,9 +114,9 @@ spec:
99114
secret:
100115
secretName: enduro-am-secret
101116
items:
102-
- key: id_ed25519
117+
- key: .id_ed25519.secret
103118
defaultMode: 0600
104119
path: id_ed25519
105-
- key: known_hosts
120+
- key: .known_hosts.secret
106121
defaultMode: 0644
107122
path: known_hosts

hack/kube/overlays/dev-am/kustomization.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,11 @@ patches:
2424
kind: Deployment
2525
name: enduro
2626
path: enduro-patch.yaml
27+
secretGenerator:
28+
- name: enduro-am-secret
29+
behavior: replace
30+
envs:
31+
- .am.secret
32+
files:
33+
- .id_ed25519.secret
34+
- .known_hosts.secret

0 commit comments

Comments
 (0)