Skip to content

Commit ea6899a

Browse files
committed
pkg/cincinnati/cincinnati: Change "installed" -> "reconciling" for VersionNotFound
When you initiate an update from A -> B, if B is not found in the current channel, the cluster would start reporting VersionNotFound after it's first attempt to retrieve recommended updates for B. That usually happens before the update completes, and the old "currently installed version" wasn't a very accurate description of B mid-update. The new wording relaxes our claim about the cluster state (maybe it has been reconciled, maybe not) and just talks about the version we're attempting to reconcile. The addition of "cluster" is intended to be more explicit about which version we are discussing [1]. Personally I think the occurence within the CVO repo's docs and ClusterVersion condition messages is sufficient context, so I'm agnostic about the additional "cluster". [1]: #423 (comment)
1 parent ed864d6 commit ea6899a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

docs/user/status.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,9 @@ It could also be caused by response corruption, e.g. if the configured `upstream
117117

118118
### VersionNotFound
119119

120-
The currently installed version was not found in the configured `channel`.
120+
The currently reconciling cluster version was not found in the configured `channel`.
121121

122-
This usually means that the configured `channel` is known to Cincinnati, but the cluster's current version is not found in that channel's graph.
122+
This usually means that the configured `channel` is known to Cincinnati, but the version the cluster is currently applying is not found in that channel's graph.
123123
Fix by setting `channel` to [a valid value][channels], e.g. `stable-4.3`.
124124

125125
If this error occurs because you forced an update to a release that is not in any channel, fix by updating back to a release that occurs in a channel, although you are on your own to determine a safe update path.

pkg/cincinnati/cincinnati.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ func (c Client) GetUpdates(ctx context.Context, uri *url.URL, arch string, chann
126126
if !found {
127127
return current, nil, &Error{
128128
Reason: "VersionNotFound",
129-
Message: fmt.Sprintf("currently installed version %s not found in the %q channel", version, channel),
129+
Message: fmt.Sprintf("currently reconciling cluster version %s not found in the %q channel", version, channel),
130130
}
131131
}
132132

pkg/cincinnati/cincinnati_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func TestGetUpdates(t *testing.T) {
5454
name: "unknown version",
5555
version: "4.0.0-3",
5656
expectedQuery: "arch=test-arch&channel=test-channel&id=01234567-0123-0123-0123-0123456789ab&version=4.0.0-3",
57-
err: "VersionNotFound: currently installed version 4.0.0-3 not found in the \"test-channel\" channel",
57+
err: "VersionNotFound: currently reconciling cluster version 4.0.0-3 not found in the \"test-channel\" channel",
5858
}}
5959
for _, test := range tests {
6060
t.Run(test.name, func(t *testing.T) {

0 commit comments

Comments
 (0)