Skip to content

Commit

Permalink
Merge pull request #827 from dinhxuanvu/missing-events
Browse files Browse the repository at this point in the history 
fix(olm): Fix the issue with missing events due to rate limit
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot authored May 1, 2019
2 parents a1e7603 + c4928e2 commit 48a1875
Show file tree
Hide file tree
Showing 2 changed files with 237 additions and 4 deletions.
8 changes: 4 additions & 4 deletions pkg/controller/operators/olm/operator.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -891,23 +891,23 @@ func (a *Operator) transitionCSVState(in v1alpha1.ClusterServiceVersion) (out *v

if !met {
logger.Info("requirements were not met")
out.SetPhaseWithEvent(v1alpha1.CSVPhasePending, v1alpha1.CSVReasonRequirementsNotMet, "one or more requirements couldn't be found", now, a.recorder)
out.SetPhaseWithEventIfChanged(v1alpha1.CSVPhasePending, v1alpha1.CSVReasonRequirementsNotMet, "one or more requirements couldn't be found", now, a.recorder)
syncError = ErrRequirementsNotMet
return
}

// Check for CRD ownership conflicts
if syncError = a.crdOwnerConflicts(out, a.csvSet(out.GetNamespace(), v1alpha1.CSVPhaseAny)); syncError != nil {
if syncError == ErrCRDOwnerConflict {
out.SetPhaseWithEventIfChanged(v1alpha1.CSVPhaseFailed, v1alpha1.CSVReasonOwnerConflict, syncError.Error(), now, a.recorder)
out.SetPhaseWithEvent(v1alpha1.CSVPhaseFailed, v1alpha1.CSVReasonOwnerConflict, syncError.Error(), now, a.recorder)
}
return
}

// Check for APIServices ownership conflicts
if syncError = a.apiServiceOwnerConflicts(out); syncError != nil {
if syncError == ErrAPIServiceOwnerConflict {
out.SetPhaseWithEventIfChanged(v1alpha1.CSVPhaseFailed, v1alpha1.CSVReasonOwnerConflict, syncError.Error(), now, a.recorder)
out.SetPhaseWithEvent(v1alpha1.CSVPhaseFailed, v1alpha1.CSVReasonOwnerConflict, syncError.Error(), now, a.recorder)
}
return
}
Expand Down Expand Up @@ -950,7 +950,7 @@ func (a *Operator) transitionCSVState(in v1alpha1.ClusterServiceVersion) (out *v
} else {
// Set phase to failed if it's been a long time since the last transition (5 minutes)
if metav1.Now().Sub(out.Status.LastTransitionTime.Time) >= 5*time.Minute {
out.SetPhaseWithEventIfChanged(v1alpha1.CSVPhaseFailed, v1alpha1.CSVReasonInstallCheckFailed, fmt.Sprintf("install timeout"), now, a.recorder)
out.SetPhaseWithEvent(v1alpha1.CSVPhaseFailed, v1alpha1.CSVReasonInstallCheckFailed, fmt.Sprintf("install timeout"), now, a.recorder)
}
}

Expand Down
233 changes: 233 additions & 0 deletions test/e2e/csv_e2e_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,22 @@ type cleanupFunc func()

var immediateDeleteGracePeriod int64 = 0

func findLastEvent(events *corev1.EventList) (event corev1.Event) {
var latestTime metav1.Time
var latestInd int
for i, item := range events.Items {
if i != 0 {
if latestTime.Before(&item.LastTimestamp) {
latestTime = item.LastTimestamp
latestInd = i
}
} else {
latestTime = item.LastTimestamp
}
}
return events.Items[latestInd]
}

func buildCSVCleanupFunc(t *testing.T, c operatorclient.ClientInterface, crc versioned.Interface, csv v1alpha1.ClusterServiceVersion, namespace string, deleteCRDs, deleteAPIServices bool) cleanupFunc {
return func() {
require.NoError(t, crc.OperatorsV1alpha1().ClusterServiceVersions(namespace).Delete(csv.GetName(), &metav1.DeleteOptions{}))
Expand Down Expand Up @@ -2720,4 +2736,221 @@ func TestUpdateCSVModifyDeploymentName(t *testing.T) {
require.NoError(t, err)
}

func TestCreateCSVRequirementsEvents(t *testing.T) {
defer cleaner.NotifyTestComplete(t, true)

c := newKubeClient(t)
crc := newCRClient(t)

sa := corev1.ServiceAccount{}
sa.SetName(genName("sa-"))
sa.SetNamespace(testNamespace)
_, err := c.CreateServiceAccount(&sa)
require.NoError(t, err, "could not create ServiceAccount")

permissions := []install.StrategyDeploymentPermissions{
{
ServiceAccountName: sa.GetName(),
Rules: []rbacv1.PolicyRule{
{
Verbs: []string{"create"},
APIGroups: []string{""},
Resources: []string{"deployment"},
},
{
Verbs: []string{"delete"},
APIGroups: []string{""},
Resources: []string{"deployment"},
},
},
},
}

clusterPermissions := []install.StrategyDeploymentPermissions{
{
ServiceAccountName: sa.GetName(),
Rules: []rbacv1.PolicyRule{
{
Verbs: []string{"get"},
APIGroups: []string{""},
Resources: []string{"deployment"},
},
},
},
}

depName := genName("dep-")
csv := v1alpha1.ClusterServiceVersion{
TypeMeta: metav1.TypeMeta{
Kind: v1alpha1.ClusterServiceVersionKind,
APIVersion: v1alpha1.ClusterServiceVersionAPIVersion,
},
ObjectMeta: metav1.ObjectMeta{
Name: genName("csv"),
},
Spec: v1alpha1.ClusterServiceVersionSpec{
MinKubeVersion: "0.0.0",
InstallModes: []v1alpha1.InstallMode{
{
Type: v1alpha1.InstallModeTypeOwnNamespace,
Supported: true,
},
{
Type: v1alpha1.InstallModeTypeSingleNamespace,
Supported: true,
},
{
Type: v1alpha1.InstallModeTypeMultiNamespace,
Supported: true,
},
{
Type: v1alpha1.InstallModeTypeAllNamespaces,
Supported: true,
},
},
InstallStrategy: newNginxInstallStrategy(depName, permissions, clusterPermissions),
// Cheating a little; this is an APIservice that will exist for the e2e tests
APIServiceDefinitions: v1alpha1.APIServiceDefinitions{
Required: []v1alpha1.APIServiceDescription{
{
Group: "packages.operators.coreos.com",
Version: "v1",
Kind: "PackageManifest",
DisplayName: "Package Manifest",
Description: "An apiservice that exists",
},
},
},
},
}

// Create Role/Cluster Roles and RoleBindings
role := rbacv1.Role{
Rules: []rbacv1.PolicyRule{
{
Verbs: []string{"create"},
APIGroups: []string{""},
Resources: []string{"deployment"},
},
{
Verbs: []string{"delete"},
APIGroups: []string{""},
Resources: []string{"deployment"},
},
},
}
role.SetName("test-role")
role.SetNamespace(testNamespace)
_, err = c.CreateRole(&role)
require.NoError(t, err, "could not create Role")

roleBinding := rbacv1.RoleBinding{
Subjects: []rbacv1.Subject{
{
Kind: "ServiceAccount",
APIGroup: "",
Name: sa.GetName(),
Namespace: sa.GetNamespace(),
},
},
RoleRef: rbacv1.RoleRef{
APIGroup: "rbac.authorization.k8s.io",
Kind: "Role",
Name: role.GetName(),
},
}
roleBinding.SetName(genName("dep-"))
roleBinding.SetNamespace(testNamespace)
_, err = c.CreateRoleBinding(&roleBinding)
require.NoError(t, err, "could not create RoleBinding")

clusterRole := rbacv1.ClusterRole{
Rules: []rbacv1.PolicyRule{
{
Verbs: []string{"get"},
APIGroups: []string{""},
Resources: []string{"deployment"},
},
},
}
clusterRole.SetName(genName("dep-"))
_, err = c.CreateClusterRole(&clusterRole)
require.NoError(t, err, "could not create ClusterRole")

clusterRoleBinding := rbacv1.ClusterRoleBinding{
Subjects: []rbacv1.Subject{
{
Kind: "ServiceAccount",
APIGroup: "",
Name: sa.GetName(),
Namespace: sa.GetNamespace(),
},
},
RoleRef: rbacv1.RoleRef{
APIGroup: "rbac.authorization.k8s.io",
Kind: "ClusterRole",
Name: clusterRole.GetName(),
},
}
clusterRoleBinding.SetName(genName("dep-"))
_, err = c.CreateClusterRoleBinding(&clusterRoleBinding)
require.NoError(t, err, "could not create ClusterRoleBinding")

cleanupCSV, err := createCSV(t, c, crc, csv, testNamespace, false, false)
require.NoError(t, err)
defer cleanupCSV()

_, err = fetchCSV(t, crc, csv.Name, testNamespace, csvSucceededChecker)
require.NoError(t, err)

listOptions := metav1.ListOptions{
FieldSelector: "involvedObject.kind=ClusterServiceVersion",
}

// Get events from test namespace for CSV
eventsList, err := c.KubernetesInterface().CoreV1().Events(testNamespace).List(listOptions)
require.NoError(t, err)
latestEvent := findLastEvent(eventsList)
require.Equal(t, string(latestEvent.Reason), "InstallSucceeded")

// Edit role
updatedRole := rbacv1.Role{
Rules: []rbacv1.PolicyRule{
{
Verbs: []string{"create"},
APIGroups: []string{""},
Resources: []string{"deployment"},
},
},
}
updatedRole.SetName("test-role")
updatedRole.SetNamespace(testNamespace)
_, err = c.UpdateRole(&updatedRole)
require.NoError(t, err)

// Check CSV status
_, err = fetchCSV(t, crc, csv.Name, testNamespace, csvPendingChecker)
require.NoError(t, err)

// Check event
eventsList, err = c.KubernetesInterface().CoreV1().Events(testNamespace).List(listOptions)
require.NoError(t, err)
latestEvent = findLastEvent(eventsList)
require.Equal(t, string(latestEvent.Reason), "RequirementsNotMet")

// Reverse the updated role
_, err = c.UpdateRole(&role)
require.NoError(t, err)

// Check CSV status
_, err = fetchCSV(t, crc, csv.Name, testNamespace, csvSucceededChecker)
require.NoError(t, err)

// Check event
eventsList, err = c.KubernetesInterface().CoreV1().Events(testNamespace).List(listOptions)
require.NoError(t, err)
latestEvent = findLastEvent(eventsList)
require.Equal(t, string(latestEvent.Reason), "InstallSucceeded")
}

// TODO: test behavior when replaces field doesn't point to existing CSV

0 comments on commit 48a1875

Please sign in to comment.