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.

Sign up for GitHub

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

Jump to bottom

Bump OSC version to 1.8.0, and document where version appears #466

Merged
merged 1 commit into from
Oct 9, 2024
Merged

Bump OSC version to 1.8.0, and document where version appears #466

merged 1 commit into from
Oct 9, 2024

Conversation

c3d
Copy link
Contributor

@c3d c3d commented Oct 4, 2024

Bump the version number of OSC to the upcoming release, 1.8.0, and document where the version number appears in the sources.

When starting a new version, many locations need to be updated (here shown with current version 1.5.2 on main branch):

Makefile:6:VERSION ?= 1.5.2
config/manager/kustomization.yaml:16:  newTag: 1.5.2
config/manifests/bases/sandboxed-containers-operator.clusterserviceversion.yaml:16:    olm.skipRange: '>=1.1.0 <1.5.2'
config/manifests/bases/sandboxed-containers-operator.clusterserviceversion.yaml:28:  name: sandboxed-containers-operator.v1.5.2
config/manifests/bases/sandboxed-containers-operator.clusterserviceversion.yaml:368:  version: 1.5.2
config/samples/deploy.yaml:9: image:  quay.io/openshift_sandboxed_containers/openshift-sandboxed-containers-operator-catalog:v1.5.2
config/samples/deploy.yaml:39:  startingCSV: sandboxed-containers-operator.v1.5.2
hack/aws-image-job.yaml:24:        image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9:1.5.2
hack/azure-image-job.yaml:23:        image: registry.redhat.io/openshift-sandboxed-containers/osc-podvm-payload-rhel9:1.5.2

The places needing change above have been labeled with OSC_VERSION. The reason is that version number 1.5.2 itself appears in places that are not related to OSC, for example:

go.sum:966:github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
go.sum:1760:github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
go.sum:1768:github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=

As we are migrating towards 1.8.0, there are even more places referring to a 1.8.0 version that is not related to OSC:

go.sum:43:cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
go.sum:66:cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
go.sum:837:github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
go.sum:1092:github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
go.sum:1293:github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4=
go.sum:1361:github.com/lib/pq v1.8.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
go.sum:1373:github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
go.sum:1557:github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
go.sum:1629:github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo=
go.sum:1890:github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
go.sum:2828:google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=

- Description of the problem which is fixed/What is the use case

- What I did

- How to verify it

- Description for the changelog

@openshift-ci openshift-ci bot requested review from bpradipt and snir911 October 4, 2024 14:47
@c3d
Copy link
Contributor Author

c3d commented Oct 7, 2024

/retest

@c3d
Copy link
Contributor Author

c3d commented Oct 7, 2024

@gkurz Not sure why the tests fail? I'm not familiar with this test suite, and the logs don't speak to me.

@gkurz
Copy link
Member

gkurz commented Oct 7, 2024

Hi @c3d !

When starting a new version, many locations need to be updated (here shown with current version 1.5.2 on main branch):

FYI we don't use the main branch anymore. Only 'devel' and release-X.Y branches.

Not sure why the tests fail? I'm not familiar with this test suite, and the logs don't speak to me.

ci/prow/check fails because make test is broken since #300. The test isn't required and can be safely ignored for now.

ci/prow/sandboxed-containers-operator-e2e has been broken forever AFAIK. It isn't required either and can be ignored as well.

gkurz
gkurz reviewed Oct 7, 2024
View reviewed changes
docs/DEVELOPMENT.md Outdated Show resolved Hide resolved
gkurz
gkurz reviewed Oct 7, 2024
View reviewed changes
Copy link
Member

@gkurz gkurz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All the version changes LGTM and I like the OSC_VERSION tags that will ease future updates.

I've added some comments. PTAL.

@gkurz
Copy link
Member

gkurz commented Oct 8, 2024

@c3d thanks to #464 and openshift/release#57546 , you should get an all green CI if you rebase 😄

@c3d c3d force-pushed the issue/465-version-number-bump-devel branch from f99daf6 to f192573 Compare October 9, 2024 08:53
@c3d
Copy link
Contributor Author

c3d commented Oct 9, 2024

@c3d thanks to #464 and openshift/release#57546 , you should get an all green CI if you rebase 😄

Rebased and took your other input into account, @gkurz. Please take another look.

@c3d
Bump OSC version to 1.8.0, and document where version appears
e2a4c34 
Bump the version number of OSC to the upcoming release, 1.8.0, and
document where the version number appears in the sources with a
special `OSC_VERSION` or `OSC_VERSION_BEFORE` tag in comments.

Rationale: When starting a new version, many locations need to be
updated, and searching them by version number is unrelibable.
On the now semi-obsolete `main` branch, `1.5.2` is found 12 times,
including 3 occurences in `go.sum` that should be ignored.
On `devel`, `1.7.0` is found 41 times, and most of them do not
actually refer to the current OSC version number.

Signed-off-by: Christophe de Dinechin <dinechin@redhat.com>
@c3d c3d force-pushed the issue/465-version-number-bump-devel branch from f192573 to e2a4c34 Compare October 9, 2024 09:00
gkurz
gkurz approved these changes Oct 9, 2024
View reviewed changes
Copy link
Member

@gkurz gkurz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

Thanks @c3d !

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 9, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Oct 9, 2024

@c3d: all tests passed!

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

bpradipt
bpradipt approved these changes Oct 9, 2024
View reviewed changes
Copy link
Contributor

@bpradipt bpradipt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
@c3d nice work on adding the OSC_VERSION tag. Will make it easier when updating the version

@gkurz gkurz merged commit d0632e5 into openshift:devel Oct 9, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bpradipt bpradipt bpradipt approved these changes

@gkurz gkurz gkurz approved these changes

@snir911 snir911 Awaiting requested review from snir911

Assignees

@gkurz gkurz

@bpradipt bpradipt

Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@c3d @gkurz @bpradipt