Skip to content

Conversation

@saschagrunert
Copy link
Member

What type of PR is this?

/kind documentation

What this PR does / why we need it:

Before:

VERSION:
   1.30.2
Version:        1.30.2
GitCommit:      unknown
GitCommitDate:  unknown
GitTreeState:   clean
BuildDate:      1980-01-01T00:00:00Z
GoVersion:      go1.22.3
Compiler:       gc
Platform:       linux/amd64
Linkmode:       dynamic
BuildTags:
  apparmor
  seccomp
  selinux
  containers_image_openpgp
  containers_image_ostree_stub
LDFlags:          unknown
SeccompEnabled:   true
AppArmorEnabled:  false

DESCRIPTION:
   OCI-based implementation of Kubernetes Container Runtime Interface

After:

VERSION:
   Version:        1.31.0
   GitCommit:      f68b12ced5b49799aaa42097540def6a67dc6643
   GitCommitDate:  2024-07-02T10:59:18Z
   GitTreeState:   clean
   BuildDate:      1980-01-01T00:00:00Z
   GoVersion:      go1.22.3
   Compiler:       gc
   Platform:       linux/amd64
   Linkmode:       dynamic
   BuildTags:
     containers_image_ostree_stub
     apparmor
     containers_image_openpgp
     seccomp
     selinux
     exclude_graphdriver_devicemapper
   LDFlags:          unknown
   SeccompEnabled:   true
   AppArmorEnabled:  false

DESCRIPTION:
   OCI-based implementation of Kubernetes Container Runtime Interface

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

None

Does this PR introduce a user-facing change?

Fixed version output formatting in `crio -h`.

Before:
```
VERSION:
   1.30.2
Version:        1.30.2
GitCommit:      unknown
GitCommitDate:  unknown
GitTreeState:   clean
BuildDate:      1980-01-01T00:00:00Z
GoVersion:      go1.22.3
Compiler:       gc
Platform:       linux/amd64
Linkmode:       dynamic
BuildTags:
  apparmor
  seccomp
  selinux
  containers_image_openpgp
  containers_image_ostree_stub
LDFlags:          unknown
SeccompEnabled:   true
AppArmorEnabled:  false

DESCRIPTION:
   OCI-based implementation of Kubernetes Container Runtime Interface
```

After:
```
VERSION:
   Version:        1.31.0
   GitCommit:      f68b12ced5b49799aaa42097540def6a67dc6643
   GitCommitDate:  2024-07-02T10:59:18Z
   GitTreeState:   clean
   BuildDate:      1980-01-01T00:00:00Z
   GoVersion:      go1.22.3
   Compiler:       gc
   Platform:       linux/amd64
   Linkmode:       dynamic
   BuildTags:
     containers_image_ostree_stub
     apparmor
     containers_image_openpgp
     seccomp
     selinux
     exclude_graphdriver_devicemapper
   LDFlags:          unknown
   SeccompEnabled:   true
   AppArmorEnabled:  false

DESCRIPTION:
   OCI-based implementation of Kubernetes Container Runtime Interface
```

Signed-off-by: Sascha Grunert <[email protected]>
@saschagrunert saschagrunert requested a review from mrunalp as a code owner July 2, 2024 11:01
@openshift-ci openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/documentation Categorizes issue or PR as related to documentation. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Jul 2, 2024
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 2, 2024
@codecov
Copy link

codecov bot commented Jul 2, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 49.52%. Comparing base (c8ea300) to head (a7f9375).
Report is 8 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #8337      +/-   ##
==========================================
- Coverage   49.53%   49.52%   -0.01%     
==========================================
  Files         153      153              
  Lines       17069    17069              
==========================================
- Hits         8455     8454       -1     
- Misses       7551     7552       +1     
  Partials     1063     1063              

@saschagrunert
Copy link
Member Author

/retest

@kwilczynski
Copy link
Contributor

Sure, looks better.

I wish we also normalised crio version vs crio --version (not sure why the former seems to be starting CRI-O?).

@kwilczynski
Copy link
Contributor

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 3, 2024
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 3, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kwilczynski, saschagrunert

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:

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

@saschagrunert
Copy link
Member Author

/retest

@saschagrunert
Copy link
Member Author

/test e2e-aws-ovn

@saschagrunert
Copy link
Member Author

/retest

@openshift-merge-bot openshift-merge-bot bot merged commit f1bc4a5 into cri-o:main Jul 4, 2024
@saschagrunert saschagrunert deleted the version-help branch July 4, 2024 16:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. kind/documentation Categorizes issue or PR as related to documentation. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants