@@ -91,7 +91,7 @@ func (p *createAPISubcommand) PostScaffold() error {
91
91
func (p * createAPISubcommand ) Scaffold (fs machinery.Filesystem ) error {
92
92
scaffolder := scaffolds .NewCreateAPIScaffolder (p .config , * p .resource )
93
93
94
- var s = fmt .Sprintf (makefileBundleCRDFile , p .resource .Plural , p .resource .QualifiedGroup (), p . resource . Version )
94
+ var s = fmt .Sprintf (makefileBundleCRDFile , p .resource .Plural , p .resource .QualifiedGroup ())
95
95
foundLine := findOldFilesForReplacement (filePath , s )
96
96
97
97
if ! foundLine {
@@ -109,7 +109,7 @@ func (p *createAPISubcommand) Scaffold(fs machinery.Filesystem) error {
109
109
projectName = strings .ToLower (filepath .Base (dir ))
110
110
}
111
111
112
- makefileBytes = append (makefileBytes , []byte (fmt .Sprintf (makefileBundleVarFragment , p .resource .Plural , p .resource .QualifiedGroup (), p . resource . Version ))... )
112
+ makefileBytes = append (makefileBytes , []byte (fmt .Sprintf (makefileBundleVarFragment , p .resource .Plural , p .resource .QualifiedGroup ()))... )
113
113
114
114
makefileBytes = append ([]byte (fmt .Sprintf (makefileBundleImageFragement , p .config .GetDomain (), projectName )), makefileBytes ... )
115
115
@@ -208,7 +208,7 @@ func findOldFilesForReplacement(path, newfile string) bool {
208
208
}
209
209
210
210
const (
211
- makefileBundleCRDFile = `target/kubernetes/%[1]s.%[2]s-%[3]s .yml`
211
+ makefileBundleCRDFile = `target/kubernetes/%[1]s.%[2]s-v1 .yml`
212
212
)
213
213
214
214
const (
@@ -217,7 +217,7 @@ const (
217
217
.PHONY: bundle
218
218
bundle: ## Generate bundle manifests and metadata, then validate generated files.
219
219
## marker
220
- cat target/kubernetes/%[1]s.%[2]s-%[3]s .yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
220
+ cat target/kubernetes/%[1]s.%[2]s-v1 .yml target/kubernetes/kubernetes.yml | operator-sdk generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
221
221
operator-sdk bundle validate ./bundle
222
222
223
223
.PHONY: bundle-build
0 commit comments