Skip to content

Commit fd54e0f

Browse files
authored
update OLM's manifest/bases/csv generation to use ControllerName (#506)
Issue #, if available: - Relates: aws-controllers-k8s/community#2019 Description of changes: Recently `ControllerName` was introduced to allow controllers to have a custom, more user friendly name. This change caused the `/config/manifest/bases/<SPN>.yaml` to be written to disk incorrectly for controllers that use the new `ControllerName` value. This change switches the `/config/manifest/bases/<CN>.yaml` to be written to disk so that OLM file/package generation can complete successfully and all of the proper values injected into the final `/bundle`. By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent d3ac622 commit fd54e0f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

pkg/generate/olm/olm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func BundleAssets(
8888

8989
csvBaseOutPath := fmt.Sprintf(
9090
"config/manifests/bases/ack-%s-controller.clusterserviceversion.yaml",
91-
m.MetaVars().ServicePackageName)
91+
m.MetaVars().ControllerName)
9292
if err := ts.Add(csvBaseOutPath, "config/manifests/bases/clusterserviceversion.yaml.tpl", olmVars); err != nil {
9393
return nil, err
9494
}

0 commit comments

Comments
 (0)