change display versions

[kobayashi]

Description

Change display versions for Serving and Eventing for major/minor updates.

$ TAG=v1.2.0 hack/build.sh
🚒 Update
=== Update Deps for Golang
--- Go mod tidy and vendor
--- Removing unwanted vendor files
--- Updating licenses
--- Removing broken symlinks
🔍 Lint
 ️ License
📖 Docs
🚧 Compile
 Test
────────────────────────────────────────────
Version:      v1.2.0
Build Date:   2022-02-05 04:06:08
Git Revision: 6690a20e
Suppored APIs:
* Serving
  - serving.knative.dev/v1 (knative-serving v1.2.0)
* Eventing
  - sources.knative.dev/v1 (knative-eventing v1.2.0)
  - eventing.knative.dev/v1 (knative-eventing v1.2.0)

Changes

• Add conditional statement in hack/build-flags.sh to check patch number to Serving and Eventing versions
• Displayed versions are depends on client's patch version

Reference

Fixes #1542

[knative-prow-robot]

Welcome @kobayashi! It looks like this is your first PR to knative/client 🎉

[knative-prow-robot]

Hi @kobayashi. Thanks for your PR.

I'm waiting for a knative member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

[rhuss]

/ok-to-test

[rhuss]

The logic below would imply that for a version 1.2.0 you get a serving and eventing version 0.29.0, while for 1.2.1 you get 1.2.1 for eventing and serving (regardless of what the actual versions of eventing and serving are). This is not as it should work.

Instead, the algorithm should work like this:

• $version is ${TAG}
• For the serving version:
  • Take major.minor from ${version} (via e.g. cut -f1-2 -d.)
  • Take patch from the serving dependency in go.mod (e.g. echo $version_serving | cut -f3 -d. with $version_serving being the full version extracted from go.mod ad it is now)
  • Combine all of them to calculate the serving version (major.minor from ${version} + .patch from the go.mod dependency.

Same for eventing.

[dsimansk]

Personally, I'd prefer the logic to be executed withing version cmd. Keep providing go module version and transform it into 1.y.z.

https://github.com/knative/client/blob/main/pkg/kn/commands/version/version.go

[kobayashi]

Thanks @rhuss @dsimansk ,
I misunderstood the logic. I have updated my implementation in the shell script. Should I do it in version.go?

[dsimansk]

Thanks for the update. IMO it's fine to keep it in the script for now, given it's already very close to done.

@rhuss can you pls check the changes?

[dsimansk]

@kobayashi sorry for the delay. I have tested the changes locally and it produces desired results imo. Thanks for the fix!

[rhuss]

Thanks for the PR ! I added some comment about the algorithm, I think it currently does not work as expected.

[codecov]

Codecov Report

Merging #1601 (2ffeba4) into main (6690a20) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##             main    #1601   +/-   ##
=======================================
  Coverage   79.79%   79.79%           
=======================================
  Files         163      163           
  Lines        8820     8820           
=======================================
  Hits         7038     7038           
  Misses       1089     1089           
  Partials      693      693           

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6690a20...2ffeba4. Read the comment docs.

[dsimansk]

/approve
/lgtm

[knative-prow-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dsimansk, kobayashi

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 [dsimansk]

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