Merge pull request #744 from abhinavdahiya/pr-717-fix

asset/manifests: fix filepath for ingress crd
openshift · Nov 28, 2018 · f648d34 · f648d34
2 parents 92f97f3 + aeeeb83
commit f648d34
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/asset/manifests/ingress.go b/pkg/asset/manifests/ingress.go
@@ -73,7 +73,7 @@ func (ing *Ingress) Generate(dependencies asset.Parents) error {
 
 	ing.FileList = []*asset.File{
 		{
-			Filename: filepath.Join(content.TemplateDir, ingCrdFilename),
+			Filename: filepath.Join(manifestDir, ingCrdFilename),
 			Data:     []byte(crdData),
 		},
 		{
@@ -92,7 +92,7 @@ func (ing *Ingress) Files() []*asset.File {
 
 // Load loads the already-rendered files back from disk.
 func (ing *Ingress) Load(f asset.FileFetcher) (bool, error) {
-	crdFile, err := f.FetchByName(ingCrdFilename)
+	crdFile, err := f.FetchByName(filepath.Join(manifestDir, ingCrdFilename))
 	if err != nil {
 		if os.IsNotExist(err) {
 			return false, nil