Skip to content

Commit 981361e

Browse files
committed
pkg/payload/render: Add OKD feature set logic
1 parent 9d362fb commit 981361e

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

pkg/payload/render.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,11 @@ func renderDir(renderConfig manifestRenderConfig, idir, odir string, requiredFea
126126
if skipFiles.Has(file.Name()) {
127127
continue
128128
}
129-
if strings.Contains(file.Name(), "CustomNoUpgrade") || strings.Contains(file.Name(), "TechPreviewNoUpgrade") || strings.Contains(file.Name(), "DevPreviewNoUpgrade") {
130-
// CustomNoUpgrade, TechPreviewNoUpgrade and DevPreviewNoUpgrade may add features to manifests like the ClusterVersion CRD,
129+
if strings.Contains(file.Name(), "CustomNoUpgrade") ||
130+
strings.Contains(file.Name(), "TechPreviewNoUpgrade") ||
131+
strings.Contains(file.Name(), "DevPreviewNoUpgrade") ||
132+
strings.Contains(file.Name(), "OKD") {
133+
// CustomNoUpgrade, TechPreviewNoUpgrade, DevPreviewNoUpgrade, and OKD may add features to manifests like the ClusterVersion CRD,
131134
// but we do not need those features during bootstrap-render time. In those clusters, the production
132135
// CVO will be along shortly to update the manifests and deliver the gated features.
133136
// fixme: now that we have requiredFeatureSet, use it to do Manifest.Include() filtering here instead of making filename assumptions

0 commit comments

Comments
 (0)