feat(catalog): add catalog status block updates #419
Conversation
syncCatalogSources now updates the status block of synced catalogs to include an up-to-date ConfigMapResource and LastSync field.
njhale
changed the title
| @@ -129,6 +129,10 @@ func TestCreateInstallPlanManualApproval(t *testing.T) { | |||
| }, | |||
| } | |||
|
|
|||
| // Attempt to get the catalog source before creating install plan | |||
| _, err = fetchCatalogSource(t, crc, ocsConfigMap, testNamespace, catalogSourceSynced) | |||
There was a problem hiding this comment.
after these changes, the test installplan didn't have a source and sourceNamespace in the spec anymore
There was a problem hiding this comment.
It looks like the source and sourceNamespace are not in master either.
| } | ||
|
|
||
| // Create a new in-mem registry | ||
| src, err := registry.NewInMemoryFromConfigMap(o.OpClient, out.GetNamespace(), out.Spec.ConfigMap) |
There was a problem hiding this comment.
it would be nice if we only parsed this into memory when it's changed
| return builder.String() | ||
| } | ||
|
|
||
| func cleanupOLM(t *testing.T, namespace string) { |
There was a problem hiding this comment.
the frustrating thing about using this everywhere is that it clears out the state of the test when you defer a call to it. it sort of defeats the purpose of keeping the test namespace around when the tests fail (there's nothing to inspect).
can we check for when the test has failed and only clear things out if it's succeeded?
It's probably just
func cleanupOLM(t *testing.T, namespace string) {
if t.Failed {
t.Log("skipping cleanup")
return
}
//...the default is 2Gi which was causing problems in our tests
ecordell
force-pushed
the
catalog-status
branch
from
a169206 to
c10676d
Compare
- adds deferred cleanup of all OLM resources - adds skip cleanup global field to avoid cleanup when any test fails
| } | ||
|
|
||
| // Check for config map changes | ||
| if catsrc.Status.ConfigMapResource == nil || catsrc.Status.ConfigMapResource.Name != configMap.GetName() || catsrc.Status.ConfigMapResource.ResourceVersion != configMap.GetResourceVersion() { |
There was a problem hiding this comment.
check the opposite condition here and return early?
| @@ -4,12 +4,25 @@ import ( | |||
| "errors" | |||
| "testing" | |||
|
|
|||
| "github.com/ghodss/yaml" | |||
|
|
|||
| for _, step := range installPlan.Status.Plan { | ||
| if step.Resource.Kind == v1alpha1.ClusterServiceVersionKind { | ||
| if err := crc.OperatorsV1alpha1().ClusterServiceVersions(namespace).Delete(step.Resource.Name, &metav1.DeleteOptions{}); err != nil { | ||
| if err := crc.OperatorsV1alpha1().ClusterServiceVersions(namespace).Delete(step.Resource.Name, deleteOptions); err != nil { |
There was a problem hiding this comment.
our fetch<..> functions take a *testing.T, maybe the build<...>CleanupFunc functions should too; then you could assert and fail when cleanup fails (which might be helpful since that's been a source of errors).
| @@ -28,10 +30,23 @@ import ( | |||
| const ( | |||
| pollInterval = 1 * time.Second | |||
| pollDuration = 5 * time.Minute | |||
|
|
|||
| etcdVersion = "3.2.13" | |||
| prometheusVersion = "v1.7.0" | |||
feat(catalog): add catalog status block updates
feat(catalog): add catalog status block updates
Description
Enables the status subresource for catalog sources.