Skip to content

Commit fda47f9

Browse files
committed
fix: version in CRD files correspond to CRD spec version, not API version
Fixes #115 Signed-off-by: Chris Laprun <[email protected]>
1 parent 26840be commit fda47f9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Diff for: pkg/quarkus/v1alpha/api.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func (p *createAPISubcommand) PostScaffold() error {
9191
func (p *createAPISubcommand) Scaffold(fs machinery.Filesystem) error {
9292
scaffolder := scaffolds.NewCreateAPIScaffolder(p.config, *p.resource)
9393

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())
9595
foundLine := findOldFilesForReplacement(filePath, s)
9696

9797
if !foundLine {
@@ -109,7 +109,7 @@ func (p *createAPISubcommand) Scaffold(fs machinery.Filesystem) error {
109109
projectName = strings.ToLower(filepath.Base(dir))
110110
}
111111

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()))...)
113113

114114
makefileBytes = append([]byte(fmt.Sprintf(makefileBundleImageFragement, p.config.GetDomain(), projectName)), makefileBytes...)
115115

@@ -208,7 +208,7 @@ func findOldFilesForReplacement(path, newfile string) bool {
208208
}
209209

210210
const (
211-
makefileBundleCRDFile = `target/kubernetes/%[1]s.%[2]s-%[3]s.yml`
211+
makefileBundleCRDFile = `target/kubernetes/%[1]s.%[2]s-v1.yml`
212212
)
213213

214214
const (
@@ -217,7 +217,7 @@ const (
217217
.PHONY: bundle
218218
bundle: ## Generate bundle manifests and metadata, then validate generated files.
219219
## 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)
221221
operator-sdk bundle validate ./bundle
222222
223223
.PHONY: bundle-build

0 commit comments

Comments
 (0)