Merge pull request #832 from tariq1890/vpa_bug_fix

add nil guard checks when querying VPA objects
kubernetes · Jul 18, 2019 · 6513ae2 · 6513ae2
2 parents 66ac307 + 47f19a7
commit 6513ae2
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/internal/store/verticalpodautoscaler.go b/internal/store/verticalpodautoscaler.go
@@ -60,7 +60,7 @@ var (
 			GenerateFunc: wrapVPAFunc(func(a *autoscaling.VerticalPodAutoscaler) *metric.Family {
 				ms := []*metric.Metric{}
 
-				if a.Spec.UpdatePolicy.UpdateMode == nil {
+				if a.Spec.UpdatePolicy == nil || a.Spec.UpdatePolicy.UpdateMode == nil {
 					return &metric.Family{
 						Metrics: ms,
 					}
@@ -96,6 +96,12 @@ var (
 			Help: "Minimum resources the VerticalPodAutoscaler can set for containers matching the name.",
 			GenerateFunc: wrapVPAFunc(func(a *autoscaling.VerticalPodAutoscaler) *metric.Family {
 				ms := []*metric.Metric{}
+				if a.Spec.ResourcePolicy == nil || a.Spec.ResourcePolicy.ContainerPolicies == nil {
+					return &metric.Family{
+						Metrics: ms,
+					}
+				}
+
 				for _, c := range a.Spec.ResourcePolicy.ContainerPolicies {
 					ms = append(ms, vpaResourcesToMetrics(c.ContainerName, c.MinAllowed)...)
 
@@ -111,6 +117,12 @@ var (
 			Help: "Maximum resources the VerticalPodAutoscaler can set for containers matching the name.",
 			GenerateFunc: wrapVPAFunc(func(a *autoscaling.VerticalPodAutoscaler) *metric.Family {
 				ms := []*metric.Metric{}
+				if a.Spec.ResourcePolicy == nil || a.Spec.ResourcePolicy.ContainerPolicies == nil {
+					return &metric.Family{
+						Metrics: ms,
+					}
+				}
+
 				for _, c := range a.Spec.ResourcePolicy.ContainerPolicies {
 					ms = append(ms, vpaResourcesToMetrics(c.ContainerName, c.MaxAllowed)...)
 				}