Merge pull request #180 from stoneshi-yunify/master

fix s2i config

Author: stoneshi-yunify

cmd/manager/main.go

@@ -47,14 +47,9 @@ func main() {
 	flag.StringVar(&s2iRunJobTemplatePath, "s2irun-job-template", "/etc/template/job.yaml", "the s2irun job template file path")
 	flag.Parse()
 	log := ctrl.Log.WithName("entrypoint")
-
-	jobTemplateData, err := os.ReadFile(s2iRunJobTemplatePath)
-	if err != nil {
-		log.Error(err, "failed to read s2irun template file", "filename", s2iRunJobTemplatePath)
-		os.Exit(1)
-	}
+	
 	s2iConfig := &s2iconfig.Config{
-		S2IRunJobTemplate: jobTemplateData,
+		S2IRunJobTemplate: s2iRunJobTemplatePath,
 	}
 
 	// Get a config to talk to the apiserver

pkg/config/types.go

@@ -1,5 +1,5 @@
 package config
 
 type Config struct {
-	S2IRunJobTemplate []byte // the template file content
+	S2IRunJobTemplate string // template file path
 }

pkg/controller/s2irun/ksbuilder_jobs.go

@@ -162,11 +162,15 @@ func (r *ReconcileS2iRun) getJobTemplateData(instance *devopsv1alpha1.S2iRun) (*
 	return data, nil
 }
 
-func (r *ReconcileS2iRun) GenerateNewJob(instance *devopsv1alpha1.S2iRun, templateContent []byte) (*batchv1.Job, error) {
+func (r *ReconcileS2iRun) GenerateNewJob(instance *devopsv1alpha1.S2iRun, templatePath string) (*batchv1.Job, error) {
 	templateData, err := r.getJobTemplateData(instance)
 	if err != nil {
 		return nil, err
 	}
+	templateContent, err := os.ReadFile(templatePath)
+	if err != nil {
+		return nil, err
+	}
 	tmpl, err := template.New("job").Parse(string(templateContent))
 	if err != nil {
 		return nil, err