Skip to content

Commit

Permalink
migration KSMCore to feature pattern (#430)
Browse files Browse the repository at this point in the history 
* feat: refactor the KSM core with the feature factory

* Add unit-test fwk for Feature

* apply code review recommendations

* Add RequiredComponents struct in feature fwk

the RequiredComponents allows Feature to expose which components
they need, and also optionaly which containers.
  • Loading branch information
@clamoriniere
clamoriniere committed May 6, 2022
1 parent 3fe793b commit 620df0a
Show file tree
Hide file tree
Showing 37 changed files with 1,336 additions and 564 deletions.
22 changes: 22 additions & 0 deletions apis/datadoghq/common/v1/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,3 +63,25 @@ type KubeletConfig struct {
// +optional
AgentCAPath string `json:"agentCAPath,omitempty"`
}

// AgentContainerName is the name of a container inside an Agent component
type AgentContainerName string

const (
// CoreAgentContainerName is the name of the Core Agent container
CoreAgentContainerName AgentContainerName = "agent"
// TraceAgentContainerName is the name of the Trace Agent container
TraceAgentContainerName AgentContainerName = "trace-agent"
// ProcessAgentContainerName is the name of the Process Agent container
ProcessAgentContainerName AgentContainerName = "process-agent"
// SecurityAgentContainerName is the name of the Security Agent container
SecurityAgentContainerName AgentContainerName = "security-agent"
// SystemProbeContainerName is the name of the System Probe container
SystemProbeContainerName AgentContainerName = "system-probe"

// ClusterAgentContainerName is the name of the Cluster Agent container
ClusterAgentContainerName AgentContainerName = "cluster-agent"

// ClusterChecksRunnersContainerName is the name of the Agent container in Cluster Checks Runners
ClusterChecksRunnersContainerName AgentContainerName = "agent"
)
15 changes: 0 additions & 15 deletions apis/datadoghq/v1alpha1/const.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,19 +191,4 @@ const (
KubeServicesListener = "kube_services"
KubeEndpointsListener = "kube_endpoints"
KubeServicesAndEndpointsListeners = "kube_services kube_endpoints"

// Resource names

DatadogTokenResourceName = "datadogtoken"
DatadogLeaderElectionResourceName = "datadog-leader-election"
DatadogCustomMetricsResourceName = "datadog-custom-metrics"
DatadogClusterIDResourceName = "datadog-cluster-id"
ExtensionAPIServerAuthResourceName = "extension-apiserver-authentication"
KubeSystemResourceName = "kube-system"

// Rbac resource kinds

ClusterRoleKind = "ClusterRole"
RoleKind = "Role"
ServiceAccountKind = "ServiceAccount"
)
4 changes: 2 additions & 2 deletions apis/datadoghq/v1alpha1/datadogagent_conversion.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,13 @@ func getV2TemplateOverride(dst *v2alpha1.DatadogAgentSpec, component v2alpha1.Co
return override
}

func getV2Container(comp *v2alpha1.DatadogAgentComponentOverride, containerName v2alpha1.AgentContainerName) *v2alpha1.DatadogAgentGenericContainer {
func getV2Container(comp *v2alpha1.DatadogAgentComponentOverride, containerName commonv1.AgentContainerName) *v2alpha1.DatadogAgentGenericContainer {
if cont := comp.Containers[containerName]; cont != nil {
return cont
}

if comp.Containers == nil {
comp.Containers = make(map[v2alpha1.AgentContainerName]*v2alpha1.DatadogAgentGenericContainer)
comp.Containers = make(map[commonv1.AgentContainerName]*v2alpha1.DatadogAgentGenericContainer)
}

cont := &v2alpha1.DatadogAgentGenericContainer{}
Expand Down
62 changes: 31 additions & 31 deletions apis/datadoghq/v1alpha1/datadogagent_conversion_agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,39 +62,39 @@ func convertDatadogAgentSpec(src *DatadogAgentSpecAgentSpec, dst *v2alpha1.Datad
}

if src.Config.Env != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.CoreAgentContainerName).Env = src.Config.Env
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.CoreAgentContainerName).Env = src.Config.Env
}

if src.Config.Volumes != nil {
getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName).Volumes = src.Config.Volumes
}

if src.Config.VolumeMounts != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.CoreAgentContainerName).VolumeMounts = src.Config.VolumeMounts
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.CoreAgentContainerName).VolumeMounts = src.Config.VolumeMounts
}

if src.Config.Resources != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.CoreAgentContainerName).Resources = src.Config.Resources
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.CoreAgentContainerName).Resources = src.Config.Resources
}

if src.Config.Command != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.CoreAgentContainerName).Command = src.Config.Command
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.CoreAgentContainerName).Command = src.Config.Command
}

if src.Config.Args != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.CoreAgentContainerName).Args = src.Config.Args
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.CoreAgentContainerName).Args = src.Config.Args
}

if src.Config.LivenessProbe != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.CoreAgentContainerName).LivenessProbe = src.Config.LivenessProbe
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.CoreAgentContainerName).LivenessProbe = src.Config.LivenessProbe
}

if src.Config.ReadinessProbe != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.CoreAgentContainerName).ReadinessProbe = src.Config.ReadinessProbe
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.CoreAgentContainerName).ReadinessProbe = src.Config.ReadinessProbe
}

if src.Config.HealthPort != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.CoreAgentContainerName).HealthPort = src.Config.HealthPort
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.CoreAgentContainerName).HealthPort = src.Config.HealthPort
}

if src.Config.CriSocket != nil {
Expand Down Expand Up @@ -224,27 +224,27 @@ func convertAPMSpec(src *APMSpec, dst *v2alpha1.DatadogAgent) {
}

if src.Env != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.TraceAgentContainerName).Env = src.Env
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.TraceAgentContainerName).Env = src.Env
}

if src.VolumeMounts != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.TraceAgentContainerName).VolumeMounts = src.VolumeMounts
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.TraceAgentContainerName).VolumeMounts = src.VolumeMounts
}

if src.Resources != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.TraceAgentContainerName).Resources = src.Resources
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.TraceAgentContainerName).Resources = src.Resources
}

if src.Command != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.TraceAgentContainerName).Command = src.Command
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.TraceAgentContainerName).Command = src.Command
}

if src.Args != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.TraceAgentContainerName).Args = src.Args
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.TraceAgentContainerName).Args = src.Args
}

if src.LivenessProbe != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.TraceAgentContainerName).LivenessProbe = src.LivenessProbe
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.TraceAgentContainerName).LivenessProbe = src.LivenessProbe
}
}

Expand Down Expand Up @@ -297,23 +297,23 @@ func convertProcessSpec(src *ProcessSpec, dst *v2alpha1.DatadogAgent) {
features.LiveContainerCollection.Enabled = src.Enabled

if src.Env != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.ProcessAgentContainerName).Env = src.Env
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.ProcessAgentContainerName).Env = src.Env
}

if src.VolumeMounts != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.ProcessAgentContainerName).VolumeMounts = src.VolumeMounts
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.ProcessAgentContainerName).VolumeMounts = src.VolumeMounts
}

if src.Resources != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.ProcessAgentContainerName).Resources = src.Resources
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.ProcessAgentContainerName).Resources = src.Resources
}

if src.Command != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.ProcessAgentContainerName).Command = src.Command
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.ProcessAgentContainerName).Command = src.Command
}

if src.Args != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.ProcessAgentContainerName).Args = src.Args
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.ProcessAgentContainerName).Args = src.Args
}
}

Expand Down Expand Up @@ -346,23 +346,23 @@ func convertSystemProbeSpec(src *SystemProbeSpec, dst *v2alpha1.DatadogAgent) {
}

if src.Env != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.SystemProbeContainerName).Env = src.Env
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.SystemProbeContainerName).Env = src.Env
}

if src.VolumeMounts != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.SystemProbeContainerName).VolumeMounts = src.VolumeMounts
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.SystemProbeContainerName).VolumeMounts = src.VolumeMounts
}

if src.Resources != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.SystemProbeContainerName).Resources = src.Resources
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.SystemProbeContainerName).Resources = src.Resources
}

if src.Command != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.SystemProbeContainerName).Command = src.Command
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.SystemProbeContainerName).Command = src.Command
}

if src.Args != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.SystemProbeContainerName).Args = src.Args
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.SystemProbeContainerName).Args = src.Args
}

// System-probe specific fields
Expand All @@ -383,7 +383,7 @@ func convertSystemProbeSpec(src *SystemProbeSpec, dst *v2alpha1.DatadogAgent) {
}

if src.AppArmorProfileName != "" {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.SystemProbeContainerName).AppArmorProfileName = &src.AppArmorProfileName
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.SystemProbeContainerName).AppArmorProfileName = &src.AppArmorProfileName
}

if src.CustomConfig != nil {
Expand All @@ -396,7 +396,7 @@ func convertSystemProbeSpec(src *SystemProbeSpec, dst *v2alpha1.DatadogAgent) {
}

if src.SecurityContext != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.SystemProbeContainerName).SecurityContext = src.SecurityContext
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.SystemProbeContainerName).SecurityContext = src.SecurityContext
}
}

Expand Down Expand Up @@ -434,22 +434,22 @@ func convertSecurityAgentSpec(src *SecuritySpec, dst *v2alpha1.DatadogAgent) {
}

if src.Env != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.SecurityAgentContainerName).Env = src.Env
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.SecurityAgentContainerName).Env = src.Env
}

if src.VolumeMounts != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.SecurityAgentContainerName).VolumeMounts = src.VolumeMounts
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.SecurityAgentContainerName).VolumeMounts = src.VolumeMounts
}

if src.Resources != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.SecurityAgentContainerName).Resources = src.Resources
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.SecurityAgentContainerName).Resources = src.Resources
}

if src.Command != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.SecurityAgentContainerName).Command = src.Command
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.SecurityAgentContainerName).Command = src.Command
}

if src.Args != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), v2alpha1.SecurityAgentContainerName).Args = src.Args
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.NodeAgentComponentName), commonv1.SecurityAgentContainerName).Args = src.Args
}
}
15 changes: 8 additions & 7 deletions apis/datadoghq/v1alpha1/datadogagent_conversion_ccr.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package v1alpha1

import (
commonv1 "github.com/DataDog/datadog-operator/apis/datadoghq/common/v1"
"github.com/DataDog/datadog-operator/apis/datadoghq/v2alpha1"
)

Expand Down Expand Up @@ -33,39 +34,39 @@ func convertCCRSpec(src *DatadogAgentSpecClusterChecksRunnerSpec, dst *v2alpha1.

if src.Config != nil {
if src.Config.LogLevel != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterChecksRunnerComponentName), v2alpha1.ClusterChecksRunnersContainerName).LogLevel = src.Config.LogLevel
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterChecksRunnerComponentName), commonv1.ClusterChecksRunnersContainerName).LogLevel = src.Config.LogLevel
}

if src.Config.SecurityContext != nil {
getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterChecksRunnerComponentName).SecurityContext = src.Config.SecurityContext
}

if src.Config.Resources != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterChecksRunnerComponentName), v2alpha1.ClusterChecksRunnersContainerName).Resources = src.Config.Resources
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterChecksRunnerComponentName), commonv1.ClusterChecksRunnersContainerName).Resources = src.Config.Resources
}

if src.Config.Command != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterChecksRunnerComponentName), v2alpha1.ClusterChecksRunnersContainerName).Command = src.Config.Command
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterChecksRunnerComponentName), commonv1.ClusterChecksRunnersContainerName).Command = src.Config.Command
}

if src.Config.Args != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterChecksRunnerComponentName), v2alpha1.ClusterChecksRunnersContainerName).Args = src.Config.Args
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterChecksRunnerComponentName), commonv1.ClusterChecksRunnersContainerName).Args = src.Config.Args
}

if src.Config.Env != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterChecksRunnerComponentName), v2alpha1.ClusterChecksRunnersContainerName).Env = src.Config.Env
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterChecksRunnerComponentName), commonv1.ClusterChecksRunnersContainerName).Env = src.Config.Env
}

if src.Config.VolumeMounts != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterChecksRunnerComponentName), v2alpha1.ClusterChecksRunnersContainerName).VolumeMounts = src.Config.VolumeMounts
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterChecksRunnerComponentName), commonv1.ClusterChecksRunnersContainerName).VolumeMounts = src.Config.VolumeMounts
}

if src.Config.Volumes != nil {
getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterChecksRunnerComponentName).Volumes = src.Config.Volumes
}

if src.Config.HealthPort != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterChecksRunnerComponentName), v2alpha1.ClusterChecksRunnersContainerName).HealthPort = src.Config.HealthPort
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterChecksRunnerComponentName), commonv1.ClusterChecksRunnersContainerName).HealthPort = src.Config.HealthPort
}
}

Expand Down
15 changes: 8 additions & 7 deletions apis/datadoghq/v1alpha1/datadogagent_conversion_dca.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
package v1alpha1

import (
commonv1 "github.com/DataDog/datadog-operator/apis/datadoghq/common/v1"
"github.com/DataDog/datadog-operator/apis/datadoghq/v2alpha1"
)

Expand Down Expand Up @@ -51,39 +52,39 @@ func convertClusterAgentSpec(src *DatadogAgentSpecClusterAgentSpec, dst *v2alpha
}

if src.Config.LogLevel != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterAgentComponentName), v2alpha1.ClusterAgentContainerName).LogLevel = src.Config.LogLevel
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterAgentComponentName), commonv1.ClusterAgentContainerName).LogLevel = src.Config.LogLevel
}

if src.Config.Resources != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterAgentComponentName), v2alpha1.ClusterAgentContainerName).Resources = src.Config.Resources
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterAgentComponentName), commonv1.ClusterAgentContainerName).Resources = src.Config.Resources
}

if src.Config.Command != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterAgentComponentName), v2alpha1.ClusterAgentContainerName).Command = src.Config.Command
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterAgentComponentName), commonv1.ClusterAgentContainerName).Command = src.Config.Command
}

if src.Config.Args != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterAgentComponentName), v2alpha1.ClusterAgentContainerName).Args = src.Config.Args
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterAgentComponentName), commonv1.ClusterAgentContainerName).Args = src.Config.Args
}

if src.Config.Confd != nil {
getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterAgentComponentName).ExtraConfd = convertConfigDirSpec(src.Config.Confd)
}

if src.Config.Env != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterAgentComponentName), v2alpha1.ClusterAgentContainerName).Env = src.Config.Env
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterAgentComponentName), commonv1.ClusterAgentContainerName).Env = src.Config.Env
}

if src.Config.VolumeMounts != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterAgentComponentName), v2alpha1.ClusterAgentContainerName).VolumeMounts = src.Config.VolumeMounts
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterAgentComponentName), commonv1.ClusterAgentContainerName).VolumeMounts = src.Config.VolumeMounts
}

if src.Config.Volumes != nil {
getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterAgentComponentName).Volumes = src.Config.Volumes
}

if src.Config.HealthPort != nil {
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterAgentComponentName), v2alpha1.ClusterAgentContainerName).HealthPort = src.Config.HealthPort
getV2Container(getV2TemplateOverride(&dst.Spec, v2alpha1.ClusterAgentComponentName), commonv1.ClusterAgentContainerName).HealthPort = src.Config.HealthPort
}
}

Expand Down
Loading

0 comments on commit 620df0a

Please sign in to comment.