diff --git a/pkg/cmd/version.go b/pkg/cmd/version.go index 4cc93085c3..1f635209d7 100644 --- a/pkg/cmd/version.go +++ b/pkg/cmd/version.go @@ -153,9 +153,9 @@ func operatorInfo(ctx context.Context, c client.Client, namespace string) (map[s return nil, err } if catalog != nil { - infos["Camel Quarkus version"] = catalog.CamelCatalogSpec.Runtime.Metadata["camel-quarkus.version"] - infos["Camel version"] = catalog.CamelCatalogSpec.Runtime.Metadata["camel.version"] - infos["Quarkus version"] = catalog.CamelCatalogSpec.Runtime.Metadata["quarkus.version"] + infos["Camel Quarkus version"] = catalog.CamelCatalogSpec.GetCamelQuarkusVersion() + infos["Camel version"] = catalog.CamelCatalogSpec.GetCamelVersion() + infos["Quarkus version"] = catalog.CamelCatalogSpec.GetQuarkusVersion() } return infos, nil diff --git a/pkg/cmd/version_test.go b/pkg/cmd/version_test.go index 053e0dae8a..e911e12d37 100644 --- a/pkg/cmd/version_test.go +++ b/pkg/cmd/version_test.go @@ -101,9 +101,9 @@ func TestOperatorVersionVerbose(t *testing.T) { assert.Nil(t, err) assert.Equal(t, true, versionCmdOptions.Verbose) assert.Contains(t, output, fmt.Sprintf("Camel K Operator %s\n", defaults.Version)) - assert.Contains(t, output, fmt.Sprintf("Camel version: %s\n", catalog.Spec.Runtime.Metadata["camel.version"])) - assert.Contains(t, output, fmt.Sprintf("Camel Quarkus version: %s\n", catalog.Spec.Runtime.Metadata["camel-quarkus.version"])) - assert.Contains(t, output, fmt.Sprintf("Quarkus version: %s\n", catalog.Spec.Runtime.Metadata["quarkus.version"])) + assert.Contains(t, output, fmt.Sprintf("Camel version: %s\n", catalog.Spec.GetCamelVersion())) + assert.Contains(t, output, fmt.Sprintf("Camel Quarkus version: %s\n", catalog.Spec.GetCamelQuarkusVersion())) + assert.Contains(t, output, fmt.Sprintf("Quarkus version: %s\n", catalog.Spec.GetQuarkusVersion())) } func TestCompatibleVersions(t *testing.T) {