Skip to content
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

Jump to bottom

Podmon container reordering #230

Merged
merged 1 commit into from
May 17, 2023
Merged

Podmon container reordering #230

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
24 changes: 12 additions & 12 deletions pkg/modules/resiliency.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,14 @@ func getResiliencyApplyCR(cr csmv1.ContainerStorageModule, op utils.OperatorConf

// ResiliencyInjectDeployment - inject resiliency into deployment
func ResiliencyInjectDeployment(dp applyv1.DeploymentApplyConfiguration, cr csmv1.ContainerStorageModule, op utils.OperatorConfig, driverType string) (*applyv1.DeploymentApplyConfiguration, error) {
resiliencyModule, containerPtr, err := getResiliencyApplyCR(cr, op, driverType, "controller")
resiliencyModule, podmonPtr, err := getResiliencyApplyCR(cr, op, driverType, "controller")
if err != nil {
return nil, err
}
container := *containerPtr

dp.Spec.Template.Spec.Containers = append(dp.Spec.Template.Spec.Containers, container)
podmon := *podmonPtr
utils.UpdateSideCarApply(resiliencyModule.Components, &podmon)
// prepend podmon container in controller-pod
dp.Spec.Template.Spec.Containers = append([]acorev1.ContainerApplyConfiguration{podmon}, dp.Spec.Template.Spec.Containers...)

if driverType == string(csmv1.PowerScale) {
driverType = string(csmv1.PowerScaleName)
Expand All @@ -205,7 +206,7 @@ func ResiliencyInjectDeployment(dp applyv1.DeploymentApplyConfiguration, cr csmv
for i, cnt := range dp.Spec.Template.Spec.Containers {
if *cnt.Name == "driver" {
podmonAPIPort := getResiliencyEnv(*resiliencyModule, cr.Spec.Driver.CSIDriverType)
podmonArrayConnectivityPollRate := getPollRateFromArgs(container.Args)
podmonArrayConnectivityPollRate := getPollRateFromArgs(podmon.Args)
enabled := "true"
dp.Spec.Template.Spec.Containers[i].Env = append(dp.Spec.Template.Spec.Containers[i].Env,
acorev1.EnvVarApplyConfiguration{Name: &XCSIPodmonEnabled, Value: &enabled},
Expand All @@ -229,20 +230,19 @@ func ResiliencyInjectDeployment(dp applyv1.DeploymentApplyConfiguration, cr csmv

// ResiliencyInjectDaemonset - inject resiliency into daemonset
func ResiliencyInjectDaemonset(ds applyv1.DaemonSetApplyConfiguration, cr csmv1.ContainerStorageModule, op utils.OperatorConfig, driverType string) (*applyv1.DaemonSetApplyConfiguration, error) {
resiliencyModule, containerPtr, err := getResiliencyApplyCR(cr, op, driverType, "node")
resiliencyModule, podmonPtr, err := getResiliencyApplyCR(cr, op, driverType, "node")
if err != nil {
return nil, err
}

container := *containerPtr
utils.UpdateSideCarApply(resiliencyModule.Components, &container)
// Get the controller arguments

ds.Spec.Template.Spec.Containers = append(ds.Spec.Template.Spec.Containers, container)
podmon := *podmonPtr
utils.UpdateSideCarApply(resiliencyModule.Components, &podmon)
// prepend podmon container in node-pod
ds.Spec.Template.Spec.Containers = append([]acorev1.ContainerApplyConfiguration{podmon}, ds.Spec.Template.Spec.Containers...)

podmonAPIPort := getResiliencyEnv(*resiliencyModule, cr.Spec.Driver.CSIDriverType)
enabled := "true"
podmonArrayConnectivityPollRate := getPollRateFromArgs(container.Args)
podmonArrayConnectivityPollRate := getPollRateFromArgs(podmon.Args)
for i, cnt := range ds.Spec.Template.Spec.Containers {
if *cnt.Name == "driver" {
ds.Spec.Template.Spec.Containers[i].Env = append(ds.Spec.Template.Spec.Containers[i].Env,
Expand Down