Skip to content

Commit 559b5d7

Browse files
committed
payload/render: update the bootstrap render to skip servicemonitor
the `manifests` directory on the bootstrap is used by the cluster-bootstrap to push to the cluster. `servicemonitor` for cvo was added by #214 `servicemonitor` api is created by the cluster-monitoring-operator and therefore this causes the bootstrapping to get stuck until we get the monitoring operator running. This skips the `servicemonitor` in the bootstrap render as it is not required for the bootstrap cvo pod.
1 parent a5f5007 commit 559b5d7

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

pkg/payload/render.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@ func Render(outputDir, releaseImage string) error {
3030
odir string
3131
skipFiles sets.String
3232
}{{
33-
idir: manifestsDir,
34-
odir: oManifestsDir,
35-
skipFiles: sets.NewString("image-references"),
33+
idir: manifestsDir,
34+
odir: oManifestsDir,
35+
skipFiles: sets.NewString(
36+
"image-references",
37+
"0000_90_cluster-version-operator_00_servicemonitor.yaml",
38+
),
3639
}, {
3740
idir: bootstrapDir,
3841
odir: oBootstrapDir,

0 commit comments

Comments
 (0)