feat: Add Version to Kyma.Spec.Modules #1694

ruanxin · 2024-07-17T16:59:16Z

related issue: #1589

…xtend-kyma-crd # Conflicts: # internal/descriptor/provider/provider_test.go

* remove parameter for NewCachedDescriptorProvider * fix dead link * adjust unit test coverage * fix flaky test

…-kyma-crd # Conflicts: # internal/descriptor/provider/provider_test.go

…ogue-improvements' into extend-kyma-crd # Conflicts: # internal/descriptor/provider/provider_test.go

ruanxin · 2024-07-19T08:48:45Z

api/v1beta2/kyma_types.go

@@ -211,14 +219,6 @@ type PartialMeta struct {

 const DefaultChannel = "regular"

-func PartialMetaFromObject(object apimetav1.Object) PartialMeta {


To reviewer:

the reason to remove this function is make the Generation assignment trackable by IDE, with this Object as general input, we lost track of when the generation get assigned here

ruanxin · 2024-07-19T08:49:53Z

internal/controller/kyma/controller.go

-	templates := lookup.GetRegularTemplates(ctx, kyma)
-	for _, template := range templates {
-		if template.Err != nil {
-			r.Event.Warning(kyma, moduleReconciliationError, template.Err)


To reviewer:
this event makes no sense.

…ogue-improvements' into extend-kyma-crd # Conflicts: # internal/descriptor/cache/key.go # pkg/module/sync/runner_test.go # pkg/templatelookup/regular.go # pkg/templatelookup/regular_test.go # unit-test-coverage.yaml

Tomasz-Smelcerz-SAP · 2024-07-26T05:32:26Z

config/crd/bases/operator.kyma-project.io_kymas.yaml

@@ -64,6 +64,7 @@ spec:
                      description: |-
                        Channel is the desired channel of the Module. If this changes or is set, it will be used to resolve a new
                        ModuleTemplate based on the new resolved resources.
+                        The Version and Channel are mutually exclusive options.


Why is the version v1beta1 extended?

because most v1beta1 fields are from v1beta2 if they are consistent.

tests/integration/controller/kyma/kyma_module_channel_test.go

tests/integration/controller/kyma/kyma_module_version_test.go

Co-authored-by: Tomasz Smelcerz <tomasz.smelcerz@sap.com>

* add version to kyma.spec.modules list * add missing manifest update base on moduletemplate generation change. * remove parameter for NewCachedDescriptorProvider * fix dead link * adjust unit test coverage * fix flaky test * chore: Refactor NewCachedDescriptorProvider (kyma-project#1695) * remove parameter for NewCachedDescriptorProvider * fix dead link * adjust unit test coverage * fix flaky test * refactor FilterTemplate * add integration test * Update tests/integration/controller/kyma/kyma_module_channel_test.go Co-authored-by: Tomasz Smelcerz <tomasz.smelcerz@sap.com> * Update tests/integration/controller/kyma/kyma_module_version_test.go Co-authored-by: Tomasz Smelcerz <tomasz.smelcerz@sap.com> * fix existing test --------- Co-authored-by: Tomasz Smelcerz <tomasz.smelcerz@sap.com>

* Add explicit version attribute * Add test * Add test * Fix lint * Fix test * review fix * Fix compilation errors * Update api/v1beta2/moduletemplate_types.go Co-authored-by: Christoph Schwägerl <acc.pius@mailbox.org> * ignore new fields in version comparison --------- Co-authored-by: Christoph Schwägerl <acc.pius@mailbox.org> chore: Sync main to feature branch (kyma-project#1718) * chore: Refactor NewCachedDescriptorProvider (kyma-project#1695) * remove parameter for NewCachedDescriptorProvider * fix dead link * adjust unit test coverage * fix flaky test * docs: Update KLM Local Test Setup Guide (kyma-project#1680) fix errors in local test setup documentation add version info * feat: Drop multiple ways to reference modules in Kyma CR (kyma-project#1672) * remove module reference by namespace/name * remove module reference by objectmeta name * remove module reference by FQDN * add initial test structure * add test cases for different module reference scenarios * fix tests * update documentation * address review comments * address more review comments * fix linting issues * rearrange imports * adjust documentation * chore: Configure different requeue intervals for Manifest reconciliation (kyma-project#1690) * Add different requeue intervals for Manifest reconciliation * Empty-Commit * code review comments * chore: Bump k8s deps (kyma-project#1703) * chore: Bump k8s deps * retrigger jobs * bump api folder as well --------- Co-authored-by: Nesma Badr <Nesma.badr@sap.com> * fix: Manifest CR should update by moduletemplate generation changes (kyma-project#1702) * when moduletemplate generation updated, then manifest CR should also updated. * refactor regular_test.go --------- Co-authored-by: Benjamin Lindner <50365642+lindnerby@users.noreply.github.com> * fix bug due to modified ModuleName --------- Co-authored-by: Amritanshu Sikdar <amritanshu.sikdar@sap.com> Co-authored-by: Amritanshu Sikdar <amritanshu.sikdar@gmail.com> Co-authored-by: Nesma Badr <Nesma.badr@sap.com> Co-authored-by: Benjamin Lindner <50365642+lindnerby@users.noreply.github.com> feat: Add Version to Kyma.Spec.Modules (kyma-project#1694) * add version to kyma.spec.modules list * add missing manifest update base on moduletemplate generation change. * remove parameter for NewCachedDescriptorProvider * fix dead link * adjust unit test coverage * fix flaky test * chore: Refactor NewCachedDescriptorProvider (kyma-project#1695) * remove parameter for NewCachedDescriptorProvider * fix dead link * adjust unit test coverage * fix flaky test * refactor FilterTemplate * add integration test * Update tests/integration/controller/kyma/kyma_module_channel_test.go Co-authored-by: Tomasz Smelcerz <tomasz.smelcerz@sap.com> * Update tests/integration/controller/kyma/kyma_module_version_test.go Co-authored-by: Tomasz Smelcerz <tomasz.smelcerz@sap.com> * fix existing test --------- Co-authored-by: Tomasz Smelcerz <tomasz.smelcerz@sap.com> chore: Update branch to main (kyma-project#1753) * update base branch to main * update base branch to main feat: Module catalog improvements implementation (kyma-project#1748) * Implement changes in module catalog handling * review fix * review fix * review fix * remove test * fix lint * review fix feat: Remove kyma.spec.modules[].version from api (kyma-project#1837) * remove kyma.spec.modules[n].version from api * Skip test * disable test * skip test * Skip test * Update api/v1beta2/kyma_types.go Co-authored-by: Christoph Schwägerl <acc.pius@mailbox.org> --------- Co-authored-by: Christoph Schwägerl <acc.pius@mailbox.org> wip wip wip review fix

chore: Sync main to feature branch (kyma-project#1718) chore: Refactor NewCachedDescriptorProvider (kyma-project#1695) docs: Update KLM Local Test Setup Guide (kyma-project#1680) chore: Configure different requeue intervals for Manifest reconciliation (kyma-project#1690) feat: Drop multiple ways to reference modules in Kyma CR (kyma-project#1672) chore: Bump k8s deps (kyma-project#1703) fix: Manifest CR should update by moduletemplate generation changes (kyma-project#1702) feat: Add Version to Kyma.Spec.Modules (kyma-project#1694) chore: Refactor NewCachedDescriptorProvider (kyma-project#1695) chore: Update branch to main (kyma-project#1753) feat: Module catalog improvements implementation (kyma-project#1748) feat: Remove kyma.spec.modules[].version from api (kyma-project#1837) --------- Co-authored-by: Christoph Schwägerl <acc.pius@mailbox.org> Co-authored-by: Nesma Badr <Nesma.badr@sap.com> Co-authored-by: Benjamin Lindner <50365642+lindnerby@users.noreply.github.com> Co-authored-by: Tomasz Smelcerz <tomasz.smelcerz@sap.com>

* feat: Explicit version for module template (#1699) chore: Sync main to feature branch (#1718) chore: Refactor NewCachedDescriptorProvider (#1695) docs: Update KLM Local Test Setup Guide (#1680) chore: Configure different requeue intervals for Manifest reconciliation (#1690) feat: Drop multiple ways to reference modules in Kyma CR (#1672) chore: Bump k8s deps (#1703) fix: Manifest CR should update by moduletemplate generation changes (#1702) feat: Add Version to Kyma.Spec.Modules (#1694) chore: Refactor NewCachedDescriptorProvider (#1695) chore: Update branch to main (#1753) feat: Module catalog improvements implementation (#1748) feat: Remove kyma.spec.modules[].version from api (#1837) --------- Co-authored-by: Christoph Schwägerl <acc.pius@mailbox.org> Co-authored-by: Nesma Badr <Nesma.badr@sap.com> Co-authored-by: Benjamin Lindner <50365642+lindnerby@users.noreply.github.com> Co-authored-by: Tomasz Smelcerz <tomasz.smelcerz@sap.com> * review fix --------- Co-authored-by: Christoph Schwägerl <acc.pius@mailbox.org> Co-authored-by: Nesma Badr <Nesma.badr@sap.com> Co-authored-by: Benjamin Lindner <50365642+lindnerby@users.noreply.github.com>

add version to kyma.spec.modules list

8fda014

ruanxin requested a review from a team as a code owner July 17, 2024 16:59

kyma-bot added cla: yes Indicates the PR's author has signed the CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 17, 2024

ruanxin changed the title ~~Add Version to Kyma.Spec.Modules~~ feat: Add Version to Kyma.Spec.Modules Jul 17, 2024

add missing manifest update base on moduletemplate generation change.

630c49b

kyma-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jul 17, 2024

ruanxin added 5 commits July 17, 2024 21:10

remove parameter for NewCachedDescriptorProvider

6817370

fix dead link

9d298da

adjust unit test coverage

5815acf

fix flaky test

f402b5e

Merge branch 'refs/heads/refactor-NewCachedDescriptorProvider' into e…

ddc7f15

…xtend-kyma-crd # Conflicts: # internal/descriptor/provider/provider_test.go

ruanxin requested a review from a team as a code owner July 18, 2024 13:04

ruanxin added 3 commits July 18, 2024 16:00

chore: Refactor NewCachedDescriptorProvider (kyma-project#1695)

618673e

* remove parameter for NewCachedDescriptorProvider * fix dead link * adjust unit test coverage * fix flaky test

Merge remote-tracking branch 'refs/remotes/upstream/main' into extend…

1ca6f5f

…-kyma-crd # Conflicts: # internal/descriptor/provider/provider_test.go

Merge remote-tracking branch 'refs/remotes/upstream/feat/module-catal…

23128a3

…ogue-improvements' into extend-kyma-crd # Conflicts: # internal/descriptor/provider/provider_test.go

ruanxin commented Jul 19, 2024

View reviewed changes

refactor FilterTemplate

5bd4aa3

ruanxin force-pushed the extend-kyma-crd branch from fc4a9bd to 3661a4a Compare July 22, 2024 14:38

add integration test

918c5b2

ruanxin force-pushed the extend-kyma-crd branch from 3661a4a to 918c5b2 Compare July 22, 2024 14:58

Tomasz-Smelcerz-SAP reviewed Jul 26, 2024

View reviewed changes

tests/integration/controller/kyma/kyma_module_channel_test.go Outdated Show resolved Hide resolved

Tomasz-Smelcerz-SAP reviewed Jul 26, 2024

View reviewed changes

tests/integration/controller/kyma/kyma_module_version_test.go Outdated Show resolved Hide resolved

ruanxin and others added 3 commits July 26, 2024 13:01

Update tests/integration/controller/kyma/kyma_module_channel_test.go

22d5ce0

Co-authored-by: Tomasz Smelcerz <tomasz.smelcerz@sap.com>

Update tests/integration/controller/kyma/kyma_module_version_test.go

cf40161

Co-authored-by: Tomasz Smelcerz <tomasz.smelcerz@sap.com>

fix existing test

7624b11

Tomasz-Smelcerz-SAP approved these changes Jul 29, 2024

View reviewed changes

kyma-bot assigned Tomasz-Smelcerz-SAP Jul 29, 2024

kyma-bot added the lgtm Looks good to me! label Jul 29, 2024

kyma-bot merged commit d2b4f3f into kyma-project:feat/module-catalogue-improvements Jul 29, 2024
36 checks passed

Tomasz-Smelcerz-SAP mentioned this pull request Sep 25, 2024

feat: Module catalogue improvements #1892

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Add Version to Kyma.Spec.Modules #1694

feat: Add Version to Kyma.Spec.Modules #1694

ruanxin commented Jul 17, 2024

ruanxin Jul 19, 2024

ruanxin Jul 19, 2024

Tomasz-Smelcerz-SAP Jul 26, 2024

ruanxin Jul 26, 2024

		@@ -211,14 +219,6 @@ type PartialMeta struct {

		const DefaultChannel = "regular"

		func PartialMetaFromObject(object apimetav1.Object) PartialMeta {

feat: Add Version to Kyma.Spec.Modules #1694

feat: Add Version to Kyma.Spec.Modules #1694

Conversation

ruanxin commented Jul 17, 2024

ruanxin Jul 19, 2024

Choose a reason for hiding this comment

ruanxin Jul 19, 2024

Choose a reason for hiding this comment

Tomasz-Smelcerz-SAP Jul 26, 2024

Choose a reason for hiding this comment

ruanxin Jul 26, 2024

Choose a reason for hiding this comment