Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
redis-operator
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
OT-CONTAINER-KIT
redis-operator
Commits
c86c35a4
Unverified
Commit
c86c35a4
authored
Jun 28, 2022
by
Acto Team
Committed by
GitHub
Jun 28, 2022
Browse files
Options
Downloads
Patches
Plain Diff
fix: panic if resources is not present (#294)
Signed-off-by:
hoyhbx
<
hoyhbx@gmail.com
>
parent
44a4c251
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
k8sutils/statefulset.go
+0
-2
0 additions, 2 deletions
k8sutils/statefulset.go
with
0 additions
and
2 deletions
k8sutils/statefulset.go
+
0
−
2
View file @
c86c35a4
...
@@ -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
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment