Skip to content
Snippets Groups Projects
Unverified Commit c86c35a4 authored by Acto Team's avatar Acto Team Committed by GitHub
Browse files

fix: panic if resources is not present (#294)


Signed-off-by: default avatarhoyhbx <hoyhbx@gmail.com>
parent 44a4c251
No related branches found
No related tags found
No related merge requests found
...@@ -224,7 +224,6 @@ func generateContainerDef(name string, containerParams containerParameters, enab ...@@ -224,7 +224,6 @@ func generateContainerDef(name string, containerParams containerParameters, enab
containerParams.RedisExporterEnv, containerParams.RedisExporterEnv,
containerParams.TLSConfig, containerParams.TLSConfig,
), ),
Resources: *containerParams.Resources,
ReadinessProbe: getProbeInfo(), ReadinessProbe: getProbeInfo(),
LivenessProbe: getProbeInfo(), LivenessProbe: getProbeInfo(),
VolumeMounts: getVolumeMount(name, containerParams.PersistenceEnabled, externalConfig, containerParams.TLSConfig), VolumeMounts: getVolumeMount(name, containerParams.PersistenceEnabled, externalConfig, containerParams.TLSConfig),
...@@ -318,7 +317,6 @@ func enableRedisMonitoring(params containerParameters) corev1.Container { ...@@ -318,7 +317,6 @@ func enableRedisMonitoring(params containerParameters) corev1.Container {
params.RedisExporterEnv, params.RedisExporterEnv,
params.TLSConfig, params.TLSConfig,
), ),
Resources: *params.RedisExporterResources,
VolumeMounts: getVolumeMount("", nil, nil, params.TLSConfig), // We need/want the tls-certs but we DON'T need the PVC (if one is available) VolumeMounts: getVolumeMount("", nil, nil, params.TLSConfig), // We need/want the tls-certs but we DON'T need the PVC (if one is available)
} }
if params.RedisExporterResources != nil { if params.RedisExporterResources != nil {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment