Skip to content

Refactor test-operator volumes code #361

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+467 −844
Open

Refactor test-operator volumes code #361

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
2 changes: 1 addition & 1 deletion pkg/ansibletest/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func Pod(
Image: containerImage,
Args: []string{},
Env: env.MergeEnvs([]corev1.EnvVar{}, envVars),
VolumeMounts: GetVolumeMounts(mountCerts, AnsibleTestPropagation, instance, externalWorkflowCounter),
VolumeMounts: GetVolumeMounts(instance, mountCerts, AnsibleTestPropagation, externalWorkflowCounter),
SecurityContext: &securityContext,
Resources: instance.Spec.Resources,
},
Expand Down
265 changes: 43 additions & 222 deletions pkg/ansibletest/volumes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ import (
corev1 "k8s.io/api/core/v1"
)

// GetVolumes -
const (
computeName = "compute-ssh-secret"
workloadName = "workload-ssh-secret"
)

// GetVolumes - returns a list of volumes for the test pod
func GetVolumes(
instance *testv1beta1.AnsibleTest,
logsPVCName string,
Expand All @@ -16,258 +21,74 @@ func GetVolumes(
externalWorkflowCounter int,
) []corev1.Volume {

var scriptsVolumeConfidentialMode int32 = 0420
var tlsCertificateMode int32 = 0444
var privateKeyMode int32 = 0600
var publicInfoMode int32 = 0744

//source_type := corev1.HostPathDirectoryOrCreate
volumes := []corev1.Volume{
{
Name: "openstack-config",
VolumeSource: corev1.VolumeSource{
ConfigMap: &corev1.ConfigMapVolumeSource{
DefaultMode: &scriptsVolumeConfidentialMode,
LocalObjectReference: corev1.LocalObjectReference{
Name: "openstack-config",
},
},
},
},
{
Name: "openstack-config-secret",
VolumeSource: corev1.VolumeSource{
Secret: &corev1.SecretVolumeSource{
DefaultMode: &tlsCertificateMode,
SecretName: "openstack-config-secret",
},
},
},
{
Name: "test-operator-logs",
VolumeSource: corev1.VolumeSource{
PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{
ClaimName: logsPVCName,
ReadOnly: false,
},
},
},
{
Name: util.TestOperatorEphemeralVolumeNameWorkdir,
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{},
},
},
{
Name: util.TestOperatorEphemeralVolumeNameTmp,
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{},
},
},
util.CreateOpenstackConfigMapVolume("openstack-config"),
util.CreateOpenstackConfigSecretVolume(),
util.CreateLogsPVCVolume(logsPVCName),
util.CreateWorkdirVolume(),
util.CreateTmpVolume(),
}

if mountCerts {
caCertsVolume := corev1.Volume{
Name: "ca-certs",
VolumeSource: corev1.VolumeSource{
Secret: &corev1.SecretVolumeSource{
DefaultMode: &scriptsVolumeConfidentialMode,
SecretName: "combined-ca-bundle",
},
},
}

volumes = append(volumes, caCertsVolume)
volumes = util.AppendCACertsVolume(volumes)
}

keysVolume := corev1.Volume{
Name: "compute-ssh-secret",
VolumeSource: corev1.VolumeSource{
Secret: &corev1.SecretVolumeSource{
SecretName: instance.Spec.ComputeSSHKeySecretName,
DefaultMode: &privateKeyMode,
},
},
}

volumes = append(volumes, keysVolume)
volumes = util.AppendSSHKeyVolume(volumes, computeName, instance.Spec.ComputeSSHKeySecretName)

if instance.Spec.WorkloadSSHKeySecretName != "" {
keysVolume = corev1.Volume{
Name: "workload-ssh-secret",
VolumeSource: corev1.VolumeSource{
Secret: &corev1.SecretVolumeSource{
SecretName: instance.Spec.WorkloadSSHKeySecretName,
DefaultMode: &privateKeyMode,
},
},
}

volumes = append(volumes, keysVolume)
volumes = util.AppendSSHKeyVolume(volumes, workloadName, instance.Spec.WorkloadSSHKeySecretName)
}

for _, exv := range instance.Spec.ExtraMounts {
for _, vol := range exv.Propagate(svc) {
for _, v := range vol.Volumes {
volumeSource, _ := v.ToCoreVolumeSource()
convertedVolume := corev1.Volume{
Name: v.Name,
VolumeSource: *volumeSource,
}
volumes = append(volumes, convertedVolume)
}
}
}

for _, vol := range instance.Spec.ExtraConfigmapsMounts {
extraVol := corev1.Volume{
Name: vol.Name,
VolumeSource: corev1.VolumeSource{
ConfigMap: &corev1.ConfigMapVolumeSource{
DefaultMode: &publicInfoMode,
LocalObjectReference: corev1.LocalObjectReference{
Name: vol.Name,
},
},
},
}
volumes = util.AppendExtraMountsVolumes(volumes, instance.Spec.ExtraMounts, svc)
volumes = util.AppendExtraConfigmapsVolumes(volumes, instance.Spec.ExtraConfigmapsMounts, util.ScriptsVolumeDefaultMode)

volumes = append(volumes, extraVol)
cmMounts := instance.Spec.Workflow[externalWorkflowCounter].ExtraConfigmapsMounts
if len(instance.Spec.Workflow) > 0 && cmMounts != nil {
volumes = util.AppendExtraConfigmapsVolumes(volumes, *cmMounts, util.ScriptsVolumeDefaultMode)
}

if len(instance.Spec.Workflow) > 0 && instance.Spec.Workflow[externalWorkflowCounter].ExtraConfigmapsMounts != nil {
for _, vol := range *instance.Spec.Workflow[externalWorkflowCounter].ExtraConfigmapsMounts {
extraWorkflowVol := corev1.Volume{
Name: vol.Name,
VolumeSource: corev1.VolumeSource{
ConfigMap: &corev1.ConfigMapVolumeSource{
DefaultMode: &publicInfoMode,
LocalObjectReference: corev1.LocalObjectReference{
Name: vol.Name,
},
},
},
}

volumes = append(volumes, extraWorkflowVol)
}
}
return volumes
}

// GetVolumeMounts -
// GetVolumeMounts - returns a list of volume mounts for the test container
func GetVolumeMounts(
instance *testv1beta1.AnsibleTest,
mountCerts bool,
svc []storage.PropagationType,
instance *testv1beta1.AnsibleTest,
externalWorkflowCounter int,
) []corev1.VolumeMount {
volumeMounts := []corev1.VolumeMount{
{
Name: util.TestOperatorEphemeralVolumeNameWorkdir,
MountPath: "/var/lib/ansible",
ReadOnly: false,
},
{
Name: util.TestOperatorEphemeralVolumeNameTmp,
MountPath: "/tmp",
ReadOnly: false,
},
{
Name: "test-operator-logs",
MountPath: "/var/lib/AnsibleTests/external_files",
ReadOnly: false,
},
{
Name: "openstack-config",
MountPath: "/etc/openstack/clouds.yaml",
SubPath: "clouds.yaml",
ReadOnly: true,
},
{
Name: "openstack-config",
MountPath: "/var/lib/ansible/.config/openstack/clouds.yaml",
SubPath: "clouds.yaml",
ReadOnly: true,
},
{
Name: "openstack-config-secret",
MountPath: "/var/lib/ansible/.config/openstack/secure.yaml",
ReadOnly: false,
SubPath: "secure.yaml",
},
util.CreateVolumeMount(util.TestOperatorEphemeralVolumeNameWorkdir, "/var/lib/ansible", false),
util.CreateVolumeMount(util.TestOperatorEphemeralVolumeNameTmp, "/tmp", false),
util.CreateVolumeMount(util.TestOperatorLogsVolumeName, "/var/lib/AnsibleTests/external_files", false),
util.CreateOpenstackConfigVolumeMount("/etc/openstack/clouds.yaml"),
util.CreateOpenstackConfigVolumeMount("/var/lib/ansible/.config/openstack/clouds.yaml"),
util.CreateOpenstackConfigSecretVolumeMount("/var/lib/ansible/.config/openstack/secure.yaml"),
}

if mountCerts {
caCertVolumeMount := corev1.VolumeMount{
Name: "ca-certs",
MountPath: "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem",
ReadOnly: true,
SubPath: "tls-ca-bundle.pem",
}

volumeMounts = append(volumeMounts, caCertVolumeMount)

caCertVolumeMount = corev1.VolumeMount{
Name: "ca-certs",
MountPath: "/etc/pki/tls/certs/ca-bundle.trust.crt",
ReadOnly: true,
SubPath: "tls-ca-bundle.pem",
}

volumeMounts = append(volumeMounts, caCertVolumeMount)
}

if instance.Spec.WorkloadSSHKeySecretName != "" {
workloadSSHKeyMount := corev1.VolumeMount{
Name: "workload-ssh-secret",
MountPath: "/var/lib/ansible/test_keypair.key",
SubPath: "ssh-privatekey",
ReadOnly: true,
}

volumeMounts = append(volumeMounts, workloadSSHKeyMount)
}

computeSSHKeyMount := corev1.VolumeMount{
Name: "compute-ssh-secret",
MountPath: "/var/lib/ansible/.ssh/compute_id",
SubPath: "ssh-privatekey",
ReadOnly: true,
}

volumeMounts = append(volumeMounts, computeSSHKeyMount)

for _, exv := range instance.Spec.ExtraMounts {
for _, vol := range exv.Propagate(svc) {
volumeMounts = append(volumeMounts, vol.Mounts...)
}
volumeMounts = append(volumeMounts,
util.CreateCACertVolumeMount("/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem"),
util.CreateCACertVolumeMount("/etc/pki/tls/certs/ca-bundle.trust.crt"),
)
}

for _, vol := range instance.Spec.ExtraConfigmapsMounts {
volumeMounts = append(volumeMounts,
util.CreateVolumeMountWithSubPath(computeName, "/var/lib/ansible/.ssh/compute_id", "ssh-privatekey", true),
)

extraConfigmapsMounts := corev1.VolumeMount{
Name: vol.Name,
MountPath: vol.MountPath,
SubPath: vol.SubPath,
ReadOnly: true,
}

volumeMounts = append(volumeMounts, extraConfigmapsMounts)
if instance.Spec.WorkloadSSHKeySecretName != "" {
volumeMounts = append(volumeMounts,
util.CreateVolumeMountWithSubPath(workloadName, "/var/lib/ansible/test_keypair.key", "ssh-privatekey", true),
)
}

if len(instance.Spec.Workflow) > 0 && instance.Spec.Workflow[externalWorkflowCounter].ExtraConfigmapsMounts != nil {
for _, vol := range *instance.Spec.Workflow[externalWorkflowCounter].ExtraConfigmapsMounts {

extraConfigmapsMounts := corev1.VolumeMount{
Name: vol.Name,
MountPath: vol.MountPath,
SubPath: vol.SubPath,
ReadOnly: true,
}
volumeMounts = util.AppendExtraMountsVolumeMounts(volumeMounts, instance.Spec.ExtraMounts, svc)
volumeMounts = util.AppendExtraConfigmapsVolumeMounts(volumeMounts, instance.Spec.ExtraConfigmapsMounts)

volumeMounts = append(volumeMounts, extraConfigmapsMounts)
}
cmMounts := instance.Spec.Workflow[externalWorkflowCounter].ExtraConfigmapsMounts
if len(instance.Spec.Workflow) > 0 && cmMounts != nil {
volumeMounts = util.AppendExtraConfigmapsVolumeMounts(volumeMounts, *cmMounts)
}

return volumeMounts
Expand Down
2 changes: 1 addition & 1 deletion pkg/horizontest/pod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func Pod(
Image: containerImage,
Args: []string{},
Env: env.MergeEnvs([]corev1.EnvVar{}, envVars),
VolumeMounts: GetVolumeMounts(mountCerts, mountKubeconfig, HorizonTestPropagation, instance),
VolumeMounts: GetVolumeMounts(instance, mountCerts, mountKubeconfig, HorizonTestPropagation),
SecurityContext: &securityContext,
Resources: instance.Spec.Resources,
},
Expand Down
Loading