Skip to content

Bug 1827000: Pod Config Deployment Hash Error #1566

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

Merged
merged 1 commit into from
Jul 11, 2020
Merged

Bug 1827000: Pod Config Deployment Hash Error #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/controller/install/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ func IsErrorUnrecoverable(err error) bool {
if err == nil {
return false
}
_, ok := unrecoverableErrors[reasonForError(err)]
_, ok := unrecoverableErrors[ReasonForError(err)]
return ok
}

func reasonForError(err error) string {
func ReasonForError(err error) string {
Copy link
Member

Choose a reason for hiding this comment

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

Not related to the PR, but this function is confusing. Since we own the StrategyError we should be consistent in using either the error type or a pointer. Checking for both seems a little off.

switch t := err.(type) {
case StrategyError:
return t.Reason
Expand Down
6 changes: 5 additions & 1 deletion pkg/controller/operators/olm/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1617,7 +1617,11 @@ func (a *Operator) updateInstallStatus(csv *v1alpha1.ClusterServiceVersion, inst
}

if strategyErr != nil {
csv.SetPhaseWithEventIfChanged(requeuePhase, requeueConditionReason, fmt.Sprintf("installing: %s", strategyErr), now, a.recorder)
if install.ReasonForError(strategyErr) == install.StrategyErrDeploymentUpdated {
csv.SetPhaseWithEventIfChanged(v1alpha1.CSVPhaseInstallReady, requeueConditionReason, fmt.Sprintf("installing: %s", strategyErr), now, a.recorder)
Copy link
Member

Choose a reason for hiding this comment

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

Cloud you please add a comment about the implication of changing phase to CSVinstallReady? Thank you!

Copy link
Member

Choose a reason for hiding this comment

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

should we change the log message to be different - from installing:... in both cases to redeploying:... in the case where the deployment was updated?

} else {
csv.SetPhaseWithEventIfChanged(requeuePhase, requeueConditionReason, fmt.Sprintf("installing: %s", strategyErr), now, a.recorder)
}
if err := a.csvQueueSet.Requeue(csv.GetNamespace(), csv.GetName()); err != nil {
a.logger.Warn(err.Error())
}
Expand Down
33 changes: 31 additions & 2 deletions pkg/controller/operators/olm/operator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"crypto/x509"
"crypto/x509/pkix"
"fmt"
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/queueinformer"
"math"
"math/big"
"reflect"
Expand Down Expand Up @@ -60,6 +59,7 @@ import (
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorlister"
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/ownerutil"
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/queueinformer"
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/scoped"
)

Expand Down Expand Up @@ -258,7 +258,7 @@ func NewFakeOperator(ctx context.Context, options ...fakeOperatorOption) (*Opera
// Apply options to default config
config := &fakeOperatorConfig{
operatorConfig: &operatorConfig{
resyncPeriod: queueinformer.ResyncWithJitter(5 * time.Minute, 0.1),
resyncPeriod: queueinformer.ResyncWithJitter(5*time.Minute, 0.1),
operatorNamespace: "default",
watchedNamespaces: []string{metav1.NamespaceAll},
clock: &utilclock.RealClock{},
Expand Down Expand Up @@ -2243,6 +2243,35 @@ func TestTransitionCSV(t *testing.T) {
},
},
},
{
name: "SingleCSVInstallingToInstallReady",
initial: initial{
csvs: []runtime.Object{
csvWithAnnotations(csv("csv1",
namespace,
"0.0.0",
"",
installStrategy("csv1-dep1", nil, nil),
[]*v1beta1.CustomResourceDefinition{},
[]*v1beta1.CustomResourceDefinition{},
v1alpha1.CSVPhaseInstalling,
), defaultTemplateAnnotations),
},
clientObjs: []runtime.Object{defaultOperatorGroup},
crds: []runtime.Object{},
objs: []runtime.Object{
withLabels(
deployment("csv1-dep1", namespace, "sa", defaultTemplateAnnotations),
map[string]string{install.DeploymentSpecHashLabelKey: "BadHash"},
),
},
},
expected: expected{
csvStates: map[string]csvState{
"csv1": {exists: true, phase: v1alpha1.CSVPhaseInstallReady, reason: "InstallWaiting"},
},
},
},
{
name: "SingleCSVSucceededToSucceeded/UnmanagedDeploymentInNamespace",
initial: initial{
Expand Down
4 changes: 0 additions & 4 deletions test/e2e/subscription_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1353,10 +1353,6 @@ func TestCreateNewSubscriptionWithPodConfig(t *testing.T) {
require.NotNil(t, subscription)

csv, err := fetchCSV(t, crClient, subscription.Status.CurrentCSV, testNamespace, buildCSVConditionChecker(v1alpha1.CSVPhaseSucceeded))
if err != nil {
// TODO: If OLM doesn't have the subscription in its cache when it initially creates the deployment, the CSV will hang on "Installing" until it reaches the five-minute timeout, then succeed on a retry. It should be possible to skip the wait and retry immediately, but in the meantime, giving this test a little extra patience should mitigate flakes.
csv, err = fetchCSV(t, crClient, subscription.Status.CurrentCSV, testNamespace, buildCSVConditionChecker(v1alpha1.CSVPhaseSucceeded))
}
require.NoError(t, err)

proxyEnv := proxyEnvVarFunc(t, config)
Expand Down