Skip to content

annotation for mount secret volume with custom CA certificate #165

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

annotation for mount secret volume with custom CA certificate #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae7bf91
annotation ydb.tech/ca-bundle-secret for mount secret volume with cus…
kobzonega Nov 14, 2023
1b6893f
fix code format
kobzonega Nov 14, 2023
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
1 change: 1 addition & 0 deletions api/v1alpha1/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ const (
AnnotationDataCenter = "ydb.tech/data-center"
AnnotationNodeHost = "ydb.tech/node-host"
AnnotationNodeDomain = "ydb.tech/node-domain"
AnnotationCABundleSecret = "ydb.tech/ca-bundle-secret"

AnnotationValueTrue = "true"

Expand Down
17 changes: 17 additions & 0 deletions internal/resources/database_statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,17 @@ func (b *DatabaseStatefulSetBuilder) buildVolumes() []corev1.Volume {
EmptyDir: &corev1.EmptyDirVolumeSource{},
},
})
} else if value, ok := b.ObjectMeta.Annotations[v1alpha1.AnnotationCABundleSecret]; ok {
volumes = append(volumes, corev1.Volume{
Name: caCertificatesVolumeName,
VolumeSource: corev1.VolumeSource{
Secret: &corev1.SecretVolumeSource{
SecretName: value,
DefaultMode: ptr.Int32(0o644),
Optional: ptr.Bool(false),
},
},
})
}

return volumes
Expand Down Expand Up @@ -472,6 +483,12 @@ func (b *DatabaseStatefulSetBuilder) buildVolumeMounts() []corev1.VolumeMount {
Name: systemCertsVolumeName,
MountPath: systemCertsDir,
})
} else if _, ok := b.ObjectMeta.Annotations[v1alpha1.AnnotationCABundleSecret]; ok {
volumeMounts = append(volumeMounts, corev1.VolumeMount{
Name: caCertificatesVolumeName,
MountPath: systemCertsDir,
ReadOnly: true,
})
}

for _, secret := range b.Spec.Secrets {
Expand Down
20 changes: 19 additions & 1 deletion internal/resources/storage_statefulset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ import (
)

const (
configVolumeName = "ydb-config"
configVolumeName = "ydb-config"
caCertificatesVolumeName = "ca-certificates"
)

type StorageStatefulSetBuilder struct {
Expand Down Expand Up @@ -229,6 +230,17 @@ func (b *StorageStatefulSetBuilder) buildVolumes() []corev1.Volume {
EmptyDir: &corev1.EmptyDirVolumeSource{},
},
})
} else if value, ok := b.ObjectMeta.Annotations[v1alpha1.AnnotationCABundleSecret]; ok {
volumes = append(volumes, corev1.Volume{
Name: caCertificatesVolumeName,
VolumeSource: corev1.VolumeSource{
Secret: &corev1.SecretVolumeSource{
SecretName: value,
DefaultMode: ptr.Int32(0o644),
Optional: ptr.Bool(false),
},
},
})
}

return volumes
Expand Down Expand Up @@ -402,6 +414,12 @@ func (b *StorageStatefulSetBuilder) buildVolumeMounts() []corev1.VolumeMount {
Name: systemCertsVolumeName,
MountPath: systemCertsDir,
})
} else if _, ok := b.ObjectMeta.Annotations[v1alpha1.AnnotationCABundleSecret]; ok {
volumeMounts = append(volumeMounts, corev1.VolumeMount{
Name: caCertificatesVolumeName,
MountPath: systemCertsDir,
ReadOnly: true,
})
}

for _, secret := range b.Spec.Secrets {
Expand Down