Merge pull request #240 from philbrookes/templates-in-docker-container

openshift-merge-robot · web-flow · commit c7f7aa68cfef · 2019-11-28T16:52:14.000+01:00
add template path for docker container
diff --git a/pkg/controller/installation/products/monitoring/templateHelper.go b/pkg/controller/installation/products/monitoring/templateHelper.go
@@ -36,7 +36,10 @@ func NewTemplateHelper(extraParams map[string]string) *TemplateHelper {
 	if _, err := os.Stat(templatePath); os.IsNotExist(err) {
 		templatePath = "../../../../../templates/monitoring"
 		if _, err := os.Stat(templatePath); os.IsNotExist(err) {
-			panic("cannot find templates")
+			templatePath = "/usr/local/bin/templates/monitoring"
+			if _, err := os.Stat(templatePath); os.IsNotExist(err) {
+				panic("cannot find templates")
+			}
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,10 @@ func NewTemplateHelper(extraParams map[string]string) *TemplateHelper {`
`36`	`36`	`if _, err := os.Stat(templatePath); os.IsNotExist(err) {`
`37`	`37`	`templatePath = "../../../../../templates/monitoring"`
`38`	`38`	`if _, err := os.Stat(templatePath); os.IsNotExist(err) {`
`39`		`- panic("cannot find templates")`
	`39`	`+ templatePath = "/usr/local/bin/templates/monitoring"`
	`40`	`+ if _, err := os.Stat(templatePath); os.IsNotExist(err) {`
	`41`	`+ panic("cannot find templates")`
	`42`	`+ }`
`40`	`43`	`}`
`41`	`44`	`}`
`42`	`45`