Skip to content

[certificates] install to ch directory #32

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

Merged
notandy merged 1 commit into from
Dec 10, 2025
Merged

[certificates] install to ch directory #32

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
16 changes: 11 additions & 5 deletions charts/kvm-node-agent/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ spec:
operator: Exists
containers:
- args: {{- toYaml .Values.controllerManager.manager.args | nindent 8 }}
command:
- /manager
env:
- name: HOSTNAME
valueFrom:
Expand Down Expand Up @@ -86,13 +84,17 @@ spec:
name: pki-libvirt
- mountPath: /pki/qemu
name: pki-qemu
- mountPath: /pki/ch
name: pki-ch
initContainers:
- command:
- sh
- -c
- cd /host/etc/pki && for i in CA libvirt qemu; do if [ -L ${i} ]; then rm ${i};
fi; done && mkdir -p CA libvirt qemu && chown 42438:42438 CA libvirt qemu && chmod
0755 CA libvirt qemu
- cd /host && for i in etc/pki/CA etc/pki/libvirt etc/pki/qemu var/lib/libvirt/ch/pki;
do if [ -L ${i} ]; then rm ${i}; fi; done && mkdir -p etc/pki/CA etc/pki/libvirt
etc/pki/qemu var/lib/libvirt/ch/pki && chown 42438:42438 etc/pki/CA etc/pki/libvirt
etc/pki/qemu var/lib/libvirt/ch/pki && chmod 0755 etc/pki/CA etc/pki/libvirt etc/pki/qemu
var/lib/libvirt/ch/pki
env:
- name: KUBERNETES_CLUSTER_DOMAIN
value: {{ quote .Values.kubernetesClusterDomain }}
Expand Down Expand Up @@ -138,6 +140,10 @@ spec:
path: /etc/pki/qemu
type: DirectoryOrCreate
name: pki-qemu
- hostPath:
path: /var/lib/libvirt/ch/pki
type: DirectoryOrCreate
name: pki-ch
- hostPath:
path: /
name: host
12 changes: 8 additions & 4 deletions config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,12 @@ spec:
securityContext:
runAsUser: 0
image: busybox:1.28
command: ['sh', '-c', 'cd /host/etc/pki && for i in CA libvirt qemu; do if [ -L ${i} ]; then rm ${i}; fi; done && mkdir -p CA libvirt qemu && chown 42438:42438 CA libvirt qemu && chmod 0755 CA libvirt qemu']
command: ['sh', '-c', 'cd /host && for i in etc/pki/CA etc/pki/libvirt etc/pki/qemu var/lib/libvirt/ch/pki; do if [ -L ${i} ]; then rm ${i}; fi; done && mkdir -p etc/pki/CA etc/pki/libvirt etc/pki/qemu var/lib/libvirt/ch/pki && chown 42438:42438 etc/pki/CA etc/pki/libvirt etc/pki/qemu var/lib/libvirt/ch/pki && chmod 0755 etc/pki/CA etc/pki/libvirt etc/pki/qemu var/lib/libvirt/ch/pki']
volumeMounts:
- mountPath: /host
name: host
containers:
- command:
- /manager
args:
- args:
- --health-probe-bind-address=:8081
env:
- name: HOSTNAME
Expand Down Expand Up @@ -129,6 +127,8 @@ spec:
name: pki-libvirt
- mountPath: /pki/qemu
name: pki-qemu
- mountPath: /pki/ch
name: pki-ch
serviceAccountName: controller-manager
terminationGracePeriodSeconds: 10
volumes:
Expand Down Expand Up @@ -156,6 +156,10 @@ spec:
hostPath:
path: /etc/pki/qemu
type: DirectoryOrCreate
- name: pki-ch
hostPath:
path: /var/lib/libvirt/ch/pki
type: DirectoryOrCreate
- name: host
hostPath:
path: /
12 changes: 6 additions & 6 deletions internal/certificates/manage_libvirt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
)

func GetSecretAndCertName(host string) (secretName, certName string) {
return "tls-" + certName, "libvirt-" + host
return "tls-libvirt-" + host, "libvirt-" + host
}

var (
Expand Down Expand Up @@ -125,16 +125,16 @@ func EnsureCertificate(ctx context.Context, c client.Client, host string) error
}

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

var symLinkMap = map[string][]string{
"servercert.pem": {"libvirt/clientcert.pem"},
"serverkey.pem": {"libvirt/private/clientkey.pem"},
"server-cert.pem": {"qemu/client-cert.pem"},
"server-key.pem": {"qemu/client-key.pem"},
"server-cert.pem": {"qemu/client-cert.pem", "ch/client-cert.pem"},
"server-key.pem": {"qemu/client-key.pem", "ch/client-key.pem"},
}

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