Ota 1966 b #1382
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -108,7 +108,7 @@ func TestOperator_syncFailingStatus(t *testing.T) { | |
| Desired: configv1.Release{ | ||
| Version: "4.0.1", | ||
| Image: "image/image:v4.0.1", | ||
| URL: "https://example.com/v4.0.1", | ||
| }, | ||
| VersionHash: "", | ||
| Conditions: []configv1.ClusterOperatorStatusCondition{ | ||
|
|
@@ -149,7 +149,7 @@ func TestOperator_syncFailingStatus(t *testing.T) { | |
| Desired: configv1.Release{ | ||
| Version: "4.0.1", | ||
| Image: "image/image:v4.0.1", | ||
| URL: "https://example.com/v4.0.1", | ||
| }, | ||
| VersionHash: "", | ||
| Conditions: []configv1.ClusterOperatorStatusCondition{ | ||
|
|
@@ -206,6 +206,7 @@ type fakeRiFlags struct { | |
| statusReleaseArchitecture bool | ||
| cvoConfiguration bool | ||
| acceptRisks bool | ||
| proposal bool | ||
| } | ||
|
|
||
| func (f fakeRiFlags) DesiredVersion() string { | ||
|
|
@@ -228,6 +229,10 @@ func (f fakeRiFlags) AcceptRisks() bool { | |
| return f.acceptRisks | ||
| } | ||
|
|
||
| func (f fakeRiFlags) Proposal() bool { | ||
| return f.proposal | ||
| } | ||
|
|
||
| func TestUpdateClusterVersionStatus_FilteringMultipleErrorsForFailingCondition(t *testing.T) { | ||
| ignoreLastTransitionTime := cmpopts.IgnoreFields(configv1.ClusterOperatorStatusCondition{}, "LastTransitionTime") | ||
| type args struct { | ||
|
|
@@ -1084,7 +1089,7 @@ func Test_conditionalUpdateWithRiskNamesAndRiskConditions(t *testing.T) { | |
| desiredImage: "not-important", | ||
| availableUpdates: &availableUpdates{ | ||
| RiskConditions: map[string][]metav1.Condition{ | ||
| "TestAlert": {{ | ||
| Type: "Applies", | ||
| Status: "True", | ||
| Reason: "Alert:firing", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -98,6 +98,7 @@ func TestTechPreviewChangeStopper(t *testing.T) { | |
| fg.Status = configv1.FeatureGateStatus{} | ||
| tt.startingCvoFeatureGates = CvoGates{unknownVersion: true} | ||
| } | ||
| tt.startingCvoFeatureGates.proposal = fg.Spec.FeatureSet == configv1.TechPreviewNoUpgrade | ||
|
|
||
| client := fakeconfigv1client.NewClientset(fg) | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,6 +45,9 @@ type CvoGateChecker interface { | |
|
|
||
| // AcceptRisks controls whether the CVO reconciles spec.desiredUpdate.acceptRisks. | ||
| AcceptRisks() bool | ||
|
|
||
| // Proposal controls whether the CVO makes proposals for updates. | ||
| Proposal() bool | ||
| } | ||
|
|
||
| // CvoGates contains flags that control CVO functionality gated by product feature gates. The | ||
|
|
@@ -60,6 +63,7 @@ type CvoGates struct { | |
| statusReleaseArchitecture bool | ||
| cvoConfiguration bool | ||
| acceptRisks bool | ||
| proposal bool | ||
| } | ||
|
|
||
| func (c CvoGates) DesiredVersion() string { | ||
|
|
@@ -82,6 +86,10 @@ func (c CvoGates) AcceptRisks() bool { | |
| return c.acceptRisks | ||
| } | ||
|
|
||
| func (c CvoGates) Proposal() bool { | ||
| return c.proposal | ||
| } | ||
|
|
||
| // DefaultCvoGates apply when actual features for given version are unknown | ||
| func DefaultCvoGates(version string) CvoGates { | ||
| return CvoGates{ | ||
|
|
@@ -90,6 +98,7 @@ func DefaultCvoGates(version string) CvoGates { | |
| statusReleaseArchitecture: false, | ||
| cvoConfiguration: false, | ||
| acceptRisks: false, | ||
| proposal: false, | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -98,6 +107,9 @@ func DefaultCvoGates(version string) CvoGates { | |
| func CvoGatesFromFeatureGate(gate *configv1.FeatureGate, version string) CvoGates { | ||
| enabledGates := DefaultCvoGates(version) | ||
|
|
||
| // We do not have a specific gate for the Proposal feature and use the TechPreviewNoUpgrade instead | ||
| enabledGates.proposal = gate.Spec.FeatureSet == configv1.TechPreviewNoUpgrade | ||
|
|
||
| for _, g := range gate.Status.FeatureGates { | ||
|
|
||
| if g.Version != version { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Swap the ConfigMap callback parameters before prompt lookups break.
pkg/proposal/controller.gocalls this getter as(namespace, name), but this callback interprets the arguments as(name, namespace)and then doesConfigMaps(namespace).Get(name). In practice that inverts the lookup and the proposal controller will fail to fetch its promptConfigMap.🐛 Minimal fix
📝 Committable suggestion
🤖 Prompt for AI Agents