Upgrade support modules to go1.21 #243

thepetk · 2024-05-29T15:41:10Z

Please specify the area for this PR

/server
/generator
/tests
/registry-library

What does does this PR do / why we need it:

Upgrades the go version for the index/server, index/generator, registry-library & tests/integration from v1.19 to v1.21

Which issue(s) this PR fixes:

Fixes devfile/api#1562

PR acceptance criteria:

Test Coverage
- Are your changes sufficiently tested, and are any applicable test cases added or updated to cover your changes?

Documentation (WIP)

Does the REST API doc need to be updated with your changes?
Does the registry library doc need to be updated with your changes?

How to test changes / Special notes to the reviewer:

thepetk · 2024-05-29T15:42:20Z

WIP because I'd like to test it with a local deployment of the registry. Not sure if we should vendor the tests/integration dir

thepetk · 2024-05-29T16:08:02Z

WIP because I'd like to test it with a local deployment of the registry. Not sure if we should vendor the tests/integration dir

Decided not to include vendor files for test/integration. Also tested locally and both viewer & server look working :)

michael-valdron

Changes to the modules looks good, few change requests:

Note: In addition to needing the open seperate PR(s) for bumping the devfile/api version (and k8s indirect dependencies) to resolve the issue completely, this also contributes to resolving devfile/api#1557.

thepetk · 2024-05-31T12:25:51Z

Changes to the modules looks good, few change requests:

You'll need to update Go version in the CI workflow files:

https://github.com/thepetk/devfile-registry-support/blob/59fca64828c9e0977a4b56ebe24624b53ac0d59d/.github/workflows/ci.yaml#L24

https://github.com/thepetk/devfile-registry-support/blob/59fca64828c9e0977a4b56ebe24624b53ac0d59d/.github/workflows/codecov.yaml#L31

https://github.com/thepetk/devfile-registry-support/blob/59fca64828c9e0977a4b56ebe24624b53ac0d59d/.github/workflows/pushimage-next.yaml#L33

You'll need to update the Go version in the Dockerfiles:

https://github.com/thepetk/devfile-registry-support/blob/59fca64828c9e0977a4b56ebe24624b53ac0d59d/.ci/Dockerfile#L15

https://github.com/thepetk/devfile-registry-support/blob/59fca64828c9e0977a4b56ebe24624b53ac0d59d/tests/integration/Dockerfile#L15

https://github.com/thepetk/devfile-registry-support/blob/59fca64828c9e0977a4b56ebe24624b53ac0d59d/index/server/Dockerfile#L17

Note: In addition to needing the open seperate PR(s) for bumping the devfile/api version (and k8s indirect dependencies) to resolve the issue completely, this also contributes to resolving devfile/api#1557.

Yeah my bad forgot to push my latest changes :( I've also re-created the PR as I needed to rebase a lot of stuff. I think now is completed.

I feel we can include the bump up of the devfile/api in the current PR. We just need to complete devfile/api#1567 I guess and then bump up the version to v2.3.0

thepetk · 2024-05-31T13:13:14Z

@michael-valdron a question here is should we go to 2.3.0-alpha instead of 2.3.0?

thepetk · 2024-05-31T15:15:27Z

@michael-valdron a question here is should we go to 2.3.0-alpha instead of 2.3.0?

After discussion we'll go with 2.3.0.

FYI I've opened devfile/api#1571 in order to release devfile/api version 2.3.0. Post merge I'll update the current PR for registry-library to use the latest api version.

thepetk · 2024-06-03T16:14:36Z

@michael-valdron a question here is should we go to 2.3.0-alpha instead of 2.3.0?

After discussion we'll go with 2.3.0.

FYI I've opened devfile/api#1571 in order to release devfile/api version 2.3.0. Post merge I'll update the current PR for registry-library to use the latest api version.

@michael-valdron the devfile/api 2.3.0 is now released. I've included the bump up of devfile/api in server and generator in this PR. Once I've fixed the status failures, If I'm not wrong we need a separate PR to update the generator dependency on server & registry-library right?

thepetk · 2024-06-04T14:15:29Z

WIP: Because we need to fix the issue brought from code gen and updates the import of the index generator schema:

registry-support/index/server/pkg/server/types.gen.go

Line 20 in ecdf943

"sigs.k8s.io/structured-merge-diff/v4/schema"

michael-valdron · 2024-06-04T14:23:57Z

@michael-valdron a question here is should we go to 2.3.0-alpha instead of 2.3.0?

After discussion we'll go with 2.3.0.
FYI I've opened devfile/api#1571 in order to release devfile/api version 2.3.0. Post merge I'll update the current PR for registry-library to use the latest api version.

@michael-valdron the devfile/api 2.3.0 is now released. I've included the bump up of devfile/api in server and generator in this PR. Once I've fixed the status failures, If I'm not wrong we need a separate PR to update the generator dependency on server & registry-library right?

@thepetk server should be fine to update now as it references the local generator with replace and builds with it, in the case of registry-library despite the replace it should be updated in a separate PR because it can be shipped by itself and will need the revision updated.

Signed-off-by: thepetk <thepetk@gmail.com>

thepetk · 2024-06-07T14:37:07Z

I've updated the PR by adding the package in the template inside index/server/config/types.yaml thanks to @michael-valdron

cc @Jdubrick

Signed-off-by: thepetk <thepetk@gmail.com>

.github/workflows/ci.yaml

Signed-off-by: thepetk <thepetk@gmail.com>

codecov · 2024-06-08T10:15:45Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 41.44%. Comparing base (c1f12da) to head (93dd0ea).

Additional details and impacted files

@@           Coverage Diff           @@
##             main     #243   +/-   ##
=======================================
  Coverage   41.44%   41.44%           
=======================================
  Files           9        9           
  Lines        3132     3132           
=======================================
  Hits         1298     1298           
  Misses       1643     1643           
  Partials      191      191

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

index/server/config/types.yaml

Jdubrick

/lgtm

michael-valdron

/lgtm

openshift-ci · 2024-06-10T18:33:23Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Jdubrick, michael-valdron, thepetk

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [Jdubrick,michael-valdron,thepetk]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci bot added the do-not-merge/work-in-progress label May 29, 2024

openshift-ci bot requested review from elsony and Jdubrick May 29, 2024 15:41

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 29, 2024

thepetk force-pushed the ft/bump_up_go_version branch from cb621ce to 59fca64 Compare May 29, 2024 15:47

thepetk changed the title ~~WIP: Upgrade support modules to go1.21~~ Upgrade support modules to go1.21 May 29, 2024

openshift-ci bot removed the do-not-merge/work-in-progress label May 29, 2024

thepetk requested a review from michael-valdron May 29, 2024 16:09

michael-valdron requested changes May 29, 2024

View reviewed changes

openshift-ci bot assigned michael-valdron May 29, 2024

openshift-merge-robot added needs-rebase and removed needs-rebase labels May 31, 2024

thepetk force-pushed the ft/bump_up_go_version branch from e6d05f2 to e45caab Compare May 31, 2024 12:07

openshift-merge-robot added the needs-rebase label May 31, 2024

thepetk force-pushed the ft/bump_up_go_version branch 2 times, most recently from 9b9d99c to d498d74 Compare May 31, 2024 12:17

openshift-merge-robot removed the needs-rebase label May 31, 2024

thepetk changed the title ~~Upgrade support modules to go1.21~~ [DO NOT MERGE] Upgrade support modules to go1.21 May 31, 2024

thepetk changed the title ~~[DO NOT MERGE] Upgrade support modules to go1.21~~ Upgrade support modules to go1.21 Jun 3, 2024

thepetk requested a review from michael-valdron June 4, 2024 13:42

thepetk changed the title ~~Upgrade support modules to go1.21~~ WIP: Upgrade support modules to go1.21 Jun 4, 2024

openshift-ci bot added the do-not-merge/work-in-progress label Jun 4, 2024

openshift-merge-robot added the needs-rebase label Jun 7, 2024

thepetk added 9 commits June 7, 2024 15:33

Bump up integration generator server and ci go version

f5516c7

Signed-off-by: thepetk <thepetk@gmail.com>

Update vendor dir

ed8a732

Signed-off-by: thepetk <thepetk@gmail.com>

Fix rebase issue

66544ba

Signed-off-by: thepetk <thepetk@gmail.com>

Update registry library

37b5841

Signed-off-by: thepetk <thepetk@gmail.com>

Fix sha in dockerfiles

cfb0dfe

Signed-off-by: thepetk <thepetk@gmail.com>

Update the generator api version

06dee90

Signed-off-by: thepetk <thepetk@gmail.com>

Update the server api version

86c46ea

Signed-off-by: thepetk <thepetk@gmail.com>

Add update for code generation

9819a1f

Signed-off-by: thepetk <thepetk@gmail.com>

Update types.yaml template

c6ef983

Signed-off-by: thepetk <thepetk@gmail.com>

thepetk force-pushed the ft/bump_up_go_version branch from 44e3a85 to c6ef983 Compare June 7, 2024 14:34

openshift-merge-robot removed the needs-rebase label Jun 7, 2024

thepetk changed the title ~~WIP: Upgrade support modules to go1.21~~ Upgrade support modules to go1.21 Jun 7, 2024

openshift-ci bot removed the do-not-merge/work-in-progress label Jun 7, 2024

Fix parents on test resources

091ccb1

Signed-off-by: thepetk <thepetk@gmail.com>

thepetk mentioned this pull request Jun 7, 2024

[Spike] Investigate open api configuration issue with x-go-types-import on index/server devfile/api#1595

Open

1 task

michael-valdron requested changes Jun 7, 2024

View reviewed changes

.github/workflows/ci.yaml Show resolved Hide resolved

michael-valdron mentioned this pull request Jun 7, 2024

Bump github.com/docker/docker from 25.0.1+incompatible to 25.0.5+incompatible in /tests/integration #228

Closed

Upgrade kubernetes version for test_minikube

93dd0ea

Signed-off-by: thepetk <thepetk@gmail.com>

Jdubrick reviewed Jun 10, 2024

View reviewed changes

index/server/config/types.yaml Show resolved Hide resolved

Jdubrick approved these changes Jun 10, 2024

View reviewed changes

openshift-ci bot assigned Jdubrick Jun 10, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 10, 2024

michael-valdron approved these changes Jun 10, 2024

View reviewed changes

thepetk merged commit ee1d190 into devfile:main Jun 10, 2024
10 checks passed

This was referenced Jun 12, 2024

Devfile Registry support service modules should be updated to support Go 1.21 devfile/api#1557

Closed

Bump up the helm chart version #247

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade support modules to go1.21 #243

Upgrade support modules to go1.21 #243

thepetk commented May 29, 2024 •

edited

Loading

thepetk commented May 29, 2024

thepetk commented May 29, 2024

michael-valdron left a comment

thepetk commented May 31, 2024 •

edited

Loading

thepetk commented May 31, 2024

thepetk commented May 31, 2024

thepetk commented Jun 3, 2024 •

edited

Loading

thepetk commented Jun 4, 2024 •

edited

Loading

michael-valdron commented Jun 4, 2024

thepetk commented Jun 7, 2024

codecov bot commented Jun 8, 2024

Jdubrick left a comment

michael-valdron left a comment

openshift-ci bot commented Jun 10, 2024

Upgrade support modules to go1.21 #243

Upgrade support modules to go1.21 #243

Conversation

thepetk commented May 29, 2024 • edited Loading

thepetk commented May 29, 2024

thepetk commented May 29, 2024

michael-valdron left a comment

Choose a reason for hiding this comment

thepetk commented May 31, 2024 • edited Loading

thepetk commented May 31, 2024

thepetk commented May 31, 2024

thepetk commented Jun 3, 2024 • edited Loading

thepetk commented Jun 4, 2024 • edited Loading

michael-valdron commented Jun 4, 2024

thepetk commented Jun 7, 2024

codecov bot commented Jun 8, 2024

Codecov Report

Jdubrick left a comment

Choose a reason for hiding this comment

michael-valdron left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Jun 10, 2024

thepetk commented May 29, 2024 •

edited

Loading

thepetk commented May 31, 2024 •

edited

Loading

thepetk commented Jun 3, 2024 •

edited

Loading

thepetk commented Jun 4, 2024 •

edited

Loading