fix: update generate_versions.go #2252

slashpai · 2024-01-31T10:42:54Z

Follow-up of rhobs/syncbot#72

I added CHANGELOG entry for this change.
[ x] No user facing changes, so no entry in CHANGELOG was needed.

Signed-off-by: Jayapriya Pai <janantha@redhat.com>

simonpasquier

/lgtm

simonpasquier · 2024-01-31T12:48:07Z

/label acknowledge-critical-fixes-only

jan--f · 2024-01-31T13:49:04Z

/lgtm
/retest

openshift-ci · 2024-01-31T13:54:54Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jan--f, simonpasquier, slashpai

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~~ [jan--f,simonpasquier,slashpai]

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

machine424 · 2024-02-01T10:30:22Z

hack/go/generate_versions.go

@@ -181,7 +181,7 @@ func getVersion(repo, ref string) (string, error) {
 	baseURL := fmt.Sprintf("https://raw.githubusercontent.com/%s/%s", repo, ref)
 	link := fmt.Sprintf("%s/VERSION", baseURL)
 	if repo == metricsServerRepo {
-		link = fmt.Sprintf("%s/manifests/release/kustomization.yaml", baseURL)
+		link = fmt.Sprintf("%s/manifests/components/release/kustomization.yaml", baseURL)


I'm afraid we'll have to branch as before v0.7.0, the file was in fact at /manifests/release/kustomization.yaml: https://github.com/kubernetes-sigs/metrics-server/blob/v0.6.4/manifests/release/kustomization.yaml

we started using v0.7.0 in 4.16, so we can branch on that.
Or fallback to the other path on a 404, as you want :)

I didn't check, but maybe we could add a VERSION file in our downstream?
syncbot should know the tag, we could just ask to put it there...

Ah! That makes sense, I missed this! This will definitely break jobs on <4.16 PRs, true. This sounds like a good long-term approach, but would adding a conditional for checking both paths suffice here?

Yes let's branch to unblock the CI, we'll try the other approach later.

Just to confirm, if https://github.com/openshift/release/blob/master/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.16.yaml and https://github.com/openshift/release/blob/master/ci-operator/config/openshift/cluster-monitoring-operator/openshift-cluster-monitoring-operator-release-4.15.yaml are sourced from the respective branches instead of master, wouldn't that automatically fix things for us?

(since this commit won't go into 4.15 as it's out, and only 4.16 will be up-to-date with master?)

But with the code from master we fetch versions for 4.14 and 4.17, so it should be compatible with both.

Right, I was confused by that. Could you elaborate a bit on the branching approach, since we already have branches till 4.17 on both (I'm not sure what exactly the "branching" entails here)? I'd also like to reiterate the idea of having a conditional that checks both /manifests/release/kustomization.yaml and /manifests/components/release/kustomization.yaml for a 200, and goes with that, which would fix things on both fronts. We can drop the older path once the CMO versions using them correspond to EOL releases. WDYT?

Sorry, I wasn't explicit, by branching I mean "conditional branching": adding a condition on the version (we're talking about the same thing :))

machine424 · 2024-02-01T10:34:24Z

/hold

rexagod · 2024-03-13T11:44:21Z

JFYI This needs make versions generate.

openshift-bot · 2024-06-12T01:01:17Z

Issues go stale after 90d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle stale.
Stale issues rot after an additional 30d of inactivity and eventually close.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle stale

openshift-merge-robot · 2024-06-12T01:01:35Z

PR needs rebase.

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.

slashpai · 2024-06-12T05:00:30Z

/close this is already taken care in another PR

openshift-ci · 2024-07-01T18:42:30Z

@slashpai: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/versions	`cc696af`	link	false	`/test versions`
ci/prow/e2e-hypershift-conformance	`cc696af`	link	true	`/test e2e-hypershift-conformance`

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.

openshift-bot · 2024-08-01T00:30:30Z

Stale issues rot after 30d of inactivity.

Mark the issue as fresh by commenting /remove-lifecycle rotten.
Rotten issues close after an additional 30d of inactivity.
Exclude this issue from closing by commenting /lifecycle frozen.

If this issue is safe to close now please do so with /close.

/lifecycle rotten
/remove-lifecycle stale

slashpai · 2024-08-01T04:44:21Z

/close

openshift-ci · 2024-08-01T04:44:30Z

@slashpai: Closed this PR.

In response to this:

/close

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.

fix: update generate_versions.go

cc696af

Signed-off-by: Jayapriya Pai <janantha@redhat.com>

openshift-ci bot requested review from jan--f and simonpasquier January 31, 2024 10:44

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

simonpasquier reviewed Jan 31, 2024

View reviewed changes

openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Jan 31, 2024

openshift-ci bot assigned simonpasquier Jan 31, 2024

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

openshift-ci bot assigned jan--f Jan 31, 2024

machine424 reviewed Feb 1, 2024

View reviewed changes

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 1, 2024

rexagod mentioned this pull request Mar 13, 2024

chore: fix metrics-server path for /test versions #2285

Closed

2 tasks

machine424 mentioned this pull request Apr 10, 2024

feat: add a step to inject the VERSION file from the upstream tag ver… rhobs/syncbot#76

Merged

openshift-ci bot added the lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. label Jun 12, 2024

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 12, 2024

openshift-ci bot added lifecycle/rotten Denotes an issue or PR that has aged beyond stale and will be auto-closed. and removed lifecycle/stale Denotes an issue or PR has remained open with no activity and has become stale. labels Aug 1, 2024

openshift-ci bot closed this Aug 1, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: update generate_versions.go #2252

fix: update generate_versions.go #2252

slashpai commented Jan 31, 2024

simonpasquier left a comment

simonpasquier commented Jan 31, 2024

jan--f commented Jan 31, 2024

openshift-ci bot commented Jan 31, 2024

machine424 Feb 1, 2024

machine424 Feb 1, 2024

rexagod Mar 13, 2024 •

edited

Loading

machine424 Mar 13, 2024

rexagod Mar 13, 2024

rexagod Mar 13, 2024

machine424 Mar 13, 2024

rexagod Mar 13, 2024 •

edited

Loading

machine424 Mar 13, 2024 •

edited

Loading

machine424 commented Feb 1, 2024

rexagod commented Mar 13, 2024 •

edited

Loading

openshift-bot commented Jun 12, 2024

openshift-merge-robot commented Jun 12, 2024

slashpai commented Jun 12, 2024

openshift-ci bot commented Jul 1, 2024

openshift-bot commented Aug 1, 2024

slashpai commented Aug 1, 2024

openshift-ci bot commented Aug 1, 2024

fix: update generate_versions.go #2252

fix: update generate_versions.go #2252

Conversation

slashpai commented Jan 31, 2024

simonpasquier left a comment

Choose a reason for hiding this comment

simonpasquier commented Jan 31, 2024

jan--f commented Jan 31, 2024

openshift-ci bot commented Jan 31, 2024

machine424 Feb 1, 2024

Choose a reason for hiding this comment

machine424 Feb 1, 2024

Choose a reason for hiding this comment

rexagod Mar 13, 2024 • edited Loading

Choose a reason for hiding this comment

machine424 Mar 13, 2024

Choose a reason for hiding this comment

rexagod Mar 13, 2024

Choose a reason for hiding this comment

rexagod Mar 13, 2024

Choose a reason for hiding this comment

machine424 Mar 13, 2024

Choose a reason for hiding this comment

rexagod Mar 13, 2024 • edited Loading

Choose a reason for hiding this comment

machine424 Mar 13, 2024 • edited Loading

Choose a reason for hiding this comment

machine424 commented Feb 1, 2024

rexagod commented Mar 13, 2024 • edited Loading

openshift-bot commented Jun 12, 2024

openshift-merge-robot commented Jun 12, 2024

slashpai commented Jun 12, 2024

openshift-ci bot commented Jul 1, 2024

openshift-bot commented Aug 1, 2024

slashpai commented Aug 1, 2024

openshift-ci bot commented Aug 1, 2024

rexagod Mar 13, 2024 •

edited

Loading

rexagod Mar 13, 2024 •

edited

Loading

machine424 Mar 13, 2024 •

edited

Loading

rexagod commented Mar 13, 2024 •

edited

Loading