@@ -8,19 +8,22 @@ import (
88 "strings"
99 "text/template"
1010
11+ "github.com/openshift/api/config"
12+ "github.com/openshift/library-go/pkg/manifest"
1113 "github.com/pkg/errors"
12-
14+ "k8s.io/apimachinery/pkg/runtime/schema"
1315 utilerrors "k8s.io/apimachinery/pkg/util/errors"
1416 "k8s.io/apimachinery/pkg/util/sets"
1517)
1618
1719// Render renders critical manifests from /manifests to outputDir.
1820func Render (outputDir , releaseImage , clusterProfile string ) error {
1921 var (
20- manifestsDir = filepath .Join (DefaultPayloadDir , CVOManifestDir )
21- oManifestsDir = filepath .Join (outputDir , "manifests" )
22- bootstrapDir = "/bootstrap"
23- oBootstrapDir = filepath .Join (outputDir , "bootstrap" )
22+ manifestsDir = filepath .Join (DefaultPayloadDir , CVOManifestDir )
23+ releaseManifestsDir = filepath .Join (DefaultPayloadDir , ReleaseManifestDir )
24+ oManifestsDir = filepath .Join (outputDir , "manifests" )
25+ bootstrapDir = "/bootstrap"
26+ oBootstrapDir = filepath .Join (outputDir , "bootstrap" )
2427
2528 renderConfig = manifestRenderConfig {
2629 ReleaseImage : releaseImage ,
@@ -29,26 +32,36 @@ func Render(outputDir, releaseImage, clusterProfile string) error {
2932 )
3033
3134 tasks := []struct {
32- idir string
33- odir string
34- skipFiles sets.Set [string ]
35+ idir string
36+ odir string
37+ processTemplate bool
38+ skipFiles sets.Set [string ]
39+ filterGroupKind sets.Set [schema.GroupKind ]
3540 }{{
36- idir : manifestsDir ,
37- odir : oManifestsDir ,
41+ idir : manifestsDir ,
42+ odir : oManifestsDir ,
43+ processTemplate : true ,
3844 skipFiles : sets .New [string ](
39- "image-references" ,
4045 "0000_90_cluster-version-operator_00_prometheusrole.yaml" ,
4146 "0000_90_cluster-version-operator_01_prometheusrolebinding.yaml" ,
4247 "0000_90_cluster-version-operator_02_servicemonitor.yaml" ,
4348 ),
4449 }, {
45- idir : bootstrapDir ,
46- odir : oBootstrapDir ,
47- skipFiles : sets.Set [string ]{},
50+ idir : releaseManifestsDir ,
51+ odir : oManifestsDir ,
52+ filterGroupKind : sets .New [schema.GroupKind ](
53+ schema.GroupKind {Group : config .GroupName , Kind : "ClusterImagePolicy" },
54+ schema.GroupKind {Group : config .GroupName , Kind : "ImagePolicy" },
55+ ),
56+ }, {
57+ idir : bootstrapDir ,
58+ odir : oBootstrapDir ,
59+ processTemplate : true ,
60+ skipFiles : sets.Set [string ]{},
4861 }}
4962 var errs []error
5063 for _ , task := range tasks {
51- if err := renderDir (renderConfig , task .idir , task .odir , task .skipFiles ); err != nil {
64+ if err := renderDir (renderConfig , task .idir , task .odir , task .processTemplate , task . skipFiles , task . filterGroupKind ); err != nil {
5265 errs = append (errs , err )
5366 }
5467 }
@@ -60,7 +73,7 @@ func Render(outputDir, releaseImage, clusterProfile string) error {
6073 return nil
6174}
6275
63- func renderDir (renderConfig manifestRenderConfig , idir , odir string , skipFiles sets.Set [string ]) error {
76+ func renderDir (renderConfig manifestRenderConfig , idir , odir string , processTemplate bool , skipFiles sets.Set [string ], filterGroupKind sets. Set [schema. GroupKind ]) error {
6477 if err := os .MkdirAll (odir , 0666 ); err != nil {
6578 return err
6679 }
@@ -73,6 +86,10 @@ func renderDir(renderConfig manifestRenderConfig, idir, odir string, skipFiles s
7386 if file .IsDir () {
7487 continue
7588 }
89+ if ! hasManifestExtension (file .Name ()) {
90+ continue
91+ }
92+
7693 if skipFiles .Has (file .Name ()) {
7794 continue
7895 }
@@ -90,10 +107,40 @@ func renderDir(renderConfig manifestRenderConfig, idir, odir string, skipFiles s
90107 continue
91108 }
92109
93- rraw , err := renderManifest (renderConfig , iraw )
94- if err != nil {
95- errs = append (errs , err )
96- continue
110+ var rraw []byte
111+ if processTemplate {
112+ rraw , err = renderManifest (renderConfig , iraw )
113+ if err != nil {
114+ errs = append (errs , fmt .Errorf ("render template %s from %s: %w" , file .Name (), idir , err ))
115+ continue
116+ }
117+ } else {
118+ rraw = iraw
119+ }
120+
121+ if len (filterGroupKind ) > 0 {
122+ manifests , err := manifest .ParseManifests (bytes .NewReader (rraw ))
123+ if err != nil {
124+ errs = append (errs , fmt .Errorf ("parse manifest %s from %s: %w" , file .Name (), idir , err ))
125+ continue
126+ }
127+
128+ filteredManifests := make ([]string , 0 , len (manifests ))
129+ for _ , manifest := range manifests {
130+ if filterGroupKind .Has (manifest .GVK .GroupKind ()) {
131+ filteredManifests = append (filteredManifests , string (manifest .Raw ))
132+ }
133+ }
134+
135+ if len (filteredManifests ) == 0 {
136+ continue
137+ }
138+
139+ if len (filteredManifests ) == 1 {
140+ rraw = []byte (filteredManifests [0 ])
141+ } else {
142+ rraw = []byte (strings .Join (filteredManifests , "\n ---\n " ))
143+ }
97144 }
98145
99146 opath := filepath .Join (odir , file .Name ())
0 commit comments