Merge pull request #831 from autonomic-ai/fix-ingress-no-http-crash

Fix crash due to missing ingress http block
kubernetes · Jul 18, 2019 · e8bfc3e · e8bfc3e
2 parents 6513ae2 + 4d0d772
commit e8bfc3e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/internal/store/ingress.go b/internal/store/ingress.go
@@ -104,12 +104,14 @@ var (
 			GenerateFunc: wrapIngressFunc(func(i *v1beta1.Ingress) *metric.Family {
 				ms := []*metric.Metric{}
 				for _, rule := range i.Spec.Rules {
-					for _, path := range rule.HTTP.Paths {
-						ms = append(ms, &metric.Metric{
-							LabelKeys:   []string{"host", "path", "service_name", "service_port"},
-							LabelValues: []string{rule.Host, path.Path, path.Backend.ServiceName, path.Backend.ServicePort.String()},
-							Value:       1,
-						})
+					if rule.HTTP != nil {
+						for _, path := range rule.HTTP.Paths {
+							ms = append(ms, &metric.Metric{
+								LabelKeys:   []string{"host", "path", "service_name", "service_port"},
+								LabelValues: []string{rule.Host, path.Path, path.Backend.ServiceName, path.Backend.ServicePort.String()},
+								Value:       1,
+							})
+						}
 					}
 				}
 				return &metric.Family{

diff --git a/internal/store/ingress_test.go b/internal/store/ingress_test.go
@@ -139,6 +139,9 @@ func TestIngressStore(t *testing.T) {
 								},
 							},
 						},
+						{
+							Host: "somehost2",
+						},
 					},
 				},
 			},