Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Sync main to feature branch #1718

Conversation

ruanxin
Copy link
Contributor

@ruanxin ruanxin commented Jul 25, 2024

this PR is not only sync branch, but also fixed an bug, check the commit

ruanxin and others added 8 commits July 18, 2024 16:00
* remove parameter for NewCachedDescriptorProvider

* fix dead link

* adjust unit test coverage

* fix flaky test
fix errors in local test setup documentation
add version info
…t#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
…ion (kyma-project#1690)

* Add different requeue intervals for Manifest reconciliation

* Empty-Commit

* code review comments
* chore: Bump k8s deps

* retrigger jobs

* bump api folder as well

---------

Co-authored-by: Nesma Badr <Nesma.badr@sap.com>
…yma-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>
@ruanxin ruanxin requested review from a team as code owners July 25, 2024 10:31
@kyma-bot kyma-bot added cla: yes Indicates the PR's author has signed the CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 25, 2024
@ruanxin ruanxin changed the title sync main to feature branch chore: Sync main to feature branch Jul 25, 2024
@kyma-bot kyma-bot added the lgtm Looks good to me! label Jul 25, 2024
@kyma-bot kyma-bot merged commit 2a4eb7a into kyma-project:feat/module-catalogue-improvements Jul 25, 2024
38 of 40 checks passed
Tomasz-Smelcerz-SAP pushed a commit to Tomasz-Smelcerz-SAP/lifecycle-manager that referenced this pull request Sep 17, 2024
* 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>
Tomasz-Smelcerz-SAP added a commit to Tomasz-Smelcerz-SAP/lifecycle-manager that referenced this pull request Sep 25, 2024
* 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
Tomasz-Smelcerz-SAP added a commit to Tomasz-Smelcerz-SAP/lifecycle-manager that referenced this pull request Sep 25, 2024
* 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
Tomasz-Smelcerz-SAP added a commit to Tomasz-Smelcerz-SAP/lifecycle-manager that referenced this pull request Sep 25, 2024
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>
Tomasz-Smelcerz-SAP added a commit to Tomasz-Smelcerz-SAP/lifecycle-manager that referenced this pull request Sep 26, 2024
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>
Tomasz-Smelcerz-SAP added a commit to Tomasz-Smelcerz-SAP/lifecycle-manager that referenced this pull request Sep 27, 2024
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>
ruanxin pushed a commit that referenced this pull request Sep 27, 2024
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes Indicates the PR's author has signed the CLA. lgtm Looks good to me! size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants