Skip to content

Commit a7c5ada

Browse files
committed
[certificates] install to ch directory
1 parent 2e963ae commit a7c5ada

3 files changed

Lines changed: 17 additions & 5 deletions

File tree

charts/kvm-node-agent/templates/daemonset.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ spec:
8686
name: pki-libvirt
8787
- mountPath: /pki/qemu
8888
name: pki-qemu
89+
- mountPath: /pki/ch
90+
name: pki-ch
8991
initContainers:
9092
- command:
9193
- sh
@@ -138,6 +140,10 @@ spec:
138140
path: /etc/pki/qemu
139141
type: DirectoryOrCreate
140142
name: pki-qemu
143+
- hostPath:
144+
path: /var/lib/libvirt/pki/ch
145+
type: DirectoryOrCreate
146+
name: pki-ch
141147
- hostPath:
142148
path: /
143149
name: host

config/manager/manager.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ spec:
129129
name: pki-libvirt
130130
- mountPath: /pki/qemu
131131
name: pki-qemu
132+
- mountPath: /pki/ch
133+
name: pki-ch
132134
serviceAccountName: controller-manager
133135
terminationGracePeriodSeconds: 10
134136
volumes:
@@ -156,6 +158,10 @@ spec:
156158
hostPath:
157159
path: /etc/pki/qemu
158160
type: DirectoryOrCreate
161+
- name: pki-ch
162+
hostPath:
163+
path: /var/lib/libvirt/pki/ch
164+
type: DirectoryOrCreate
159165
- name: host
160166
hostPath:
161167
path: /

internal/certificates/manage_libvirt.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,16 +125,16 @@ func EnsureCertificate(ctx context.Context, c client.Client, host string) error
125125
}
126126

127127
var secretToFileMap = map[string][]string{
128-
"ca.crt": {"CA/cacert.pem", "qemu/ca-cert.pem"},
129-
"tls.crt": {"libvirt/servercert.pem", "qemu/server-cert.pem"},
130-
"tls.key": {"libvirt/private/serverkey.pem", "qemu/server-key.pem"},
128+
"ca.crt": {"CA/cacert.pem", "qemu/ca-cert.pem", "ch/ca-cert.pem"},
129+
"tls.crt": {"libvirt/servercert.pem", "qemu/server-cert.pem", "ch/server-cert.pem"},
130+
"tls.key": {"libvirt/private/serverkey.pem", "qemu/server-key.pem", "ch/server-key.pem"},
131131
}
132132

133133
var symLinkMap = map[string][]string{
134134
"servercert.pem": {"libvirt/clientcert.pem"},
135135
"serverkey.pem": {"libvirt/private/clientkey.pem"},
136-
"server-cert.pem": {"qemu/client-cert.pem"},
137-
"server-key.pem": {"qemu/client-key.pem"},
136+
"server-cert.pem": {"qemu/client-cert.pem", "ch/client-cert.pem"},
137+
"server-key.pem": {"qemu/client-key.pem", "ch/client-key.pem"},
138138
}
139139

140140
func UpdateTLSCertificate(ctx context.Context, data map[string][]byte) error {

0 commit comments

Comments
 (0)