This repository has been archived by the owner on Jun 22, 2023. It is now read-only.
feat(validation): Add catalog entry validation in controller #5
Conversation
This file contains 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 is based on the CE api defined in commit (6f259d6) and is subject to change. Please hold from reviewing as this is not complete yet. |
varshaprasad96
added
the
do-not-merge/hold
|
If you don't mind, please pause working on this until we have solidified the API. Thanks! |
dinhxuanvu
force-pushed
the
hack/cotalog-controller
branch
from
106c7b4
to
7ee76a1
Compare
dinhxuanvu
changed the title
dinhxuanvu
changed the title
dinhxuanvu
force-pushed
the
hack/cotalog-controller
branch
from
5215e6b
to
0af5f63
Compare
dinhxuanvu
force-pushed
the
hack/cotalog-controller
branch
3 times, most recently
from
b488298
to
0b17ed1
Compare
dinhxuanvu
changed the title
dinhxuanvu
removed
the
do-not-merge/hold
1. Validate export references in entry spec 2. Aggregate PermissionClaims and API resources info from referenced APIExport to entry status Signed-off-by: Vu Dinh <[email protected]>
dinhxuanvu
force-pushed
the
hack/cotalog-controller
branch
from
0b17ed1
to
a953022
Compare
Signed-off-by: Vu Dinh <[email protected]>
dinhxuanvu
force-pushed
the
hack/cotalog-controller
branch
from
a953022
to
70824d8
Compare
Signed-off-by: Vu Dinh <[email protected]>
varshaprasad96
force-pushed
the
hack/cotalog-controller
branch
from
1f2341d
to
6e38f56
Compare
Signed-off-by: Vu Dinh <[email protected]>
Signed-off-by: Vu Dinh <[email protected]>
Signed-off-by: Vu Dinh <[email protected]>
Signed-off-by: Vu Dinh <[email protected]>
Signed-off-by: Vu Dinh <[email protected]>
ncdc
suggested changes
Nov 30, 2022
| exportPermissionClaims := []apisv1alpha1.PermissionClaim{} | ||
| invalidExports := []string{} | ||
| for _, exportRef := range catalogEntry.Spec.Exports { | ||
| // TODO: verify if path contains the entire heirarchy or just the clusterName. |
There was a problem hiding this comment.
Path should be the full hierachy/absolute path
| ) | ||
| logger.V(2).Info("reconciling CatalogEntry") | ||
| export := apisv1alpha1.APIExport{} | ||
| err := r.Get(logicalcluster.WithCluster(ctx, logicalcluster.New(path)), types.NamespacedName{Name: name, Namespace: req.Namespace}, &export) |
There was a problem hiding this comment.
Suggested change
| err := r.Get(logicalcluster.WithCluster(ctx, logicalcluster.New(path)), types.NamespacedName{Name: name, Namespace: req.Namespace}, &export) | |
| err := r.Get(logicalcluster.WithCluster(ctx, logicalcluster.New(path)), types.NamespacedName{Name: name}, &export) |
Comment on lines
+113
to
+115
| // Error reading the object - requeue the request. | ||
| logger.Error(err, "failed to get resource") | ||
| continue |
There was a problem hiding this comment.
This doesn't actually requeue like the comment says
Comment on lines
+139
to
+145
| cond := conditionsapi.Condition{ | ||
| Type: catalogv1alpha1.APIExportValidType, | ||
| Status: corev1.ConditionTrue, | ||
| Severity: conditionsapi.ConditionSeverityNone, | ||
| LastTransitionTime: metav1.Now(), | ||
| } | ||
| conditions.Set(catalogEntry, &cond) |
There was a problem hiding this comment.
You should be able to use conditions.MarkTrue() here
Comment on lines
+147
to
+155
| message := fmt.Sprintf("invalid export(s): %s", strings.Join(invalidExports, " ,")) | ||
| invalidCond := conditionsapi.Condition{ | ||
| Type: catalogv1alpha1.APIExportValidType, | ||
| Status: corev1.ConditionFalse, | ||
| Severity: conditionsapi.ConditionSeverityError, | ||
| LastTransitionTime: metav1.Now(), | ||
| Message: message, | ||
| } | ||
| conditions.Set(catalogEntry, &invalidCond) |
There was a problem hiding this comment.
You should be able to use conditions.MarkFalse() here
| return nil, fmt.Errorf("could not create CatalogEntry %q|%q: %v", workspaceCluster, entryName, err) | ||
| } | ||
|
|
||
| t.Logf("waiting for CatalogEntry %q|%q to be found", workspaceCluster, entryName) |
There was a problem hiding this comment.
Suggested change
| t.Logf("waiting for CatalogEntry %q|%q to be found", workspaceCluster, entryName) | |
| t.Logf("waiting for CatalogEntry %q|%q to have APIExportValid condition", workspaceCluster, entryName) |
| } | ||
| return true, nil | ||
| }); err != nil { | ||
| return nil, fmt.Errorf("CatalogEntry %q|%q not found: %v", workspaceCluster, entryName, err) |
There was a problem hiding this comment.
Suggested change
| return nil, fmt.Errorf("CatalogEntry %q|%q not found: %v", workspaceCluster, entryName, err) | |
| return nil, fmt.Errorf("error waiting for CatalogEntry %q|%q status: %v", workspaceCluster, entryName, err) |
|
|
||
| t.Logf("waiting for CatalogEntry %q|%q to be found", workspaceCluster, entryName) | ||
| var catalogEntry catalogv1alpha1.CatalogEntry | ||
| if err := wait.PollImmediate(100*time.Millisecond, wait.ForeverTestTimeout, func() (done bool, err error) { |
There was a problem hiding this comment.
I would move this into the Test() functions themselves
| if err != nil { | ||
| t.Fatalf("unable to create CatalogEntry: %v", err) | ||
| } | ||
|
|
There was a problem hiding this comment.
Insert polling loop to get entry and expect conditions.IsTrue(entry, catalogv1alpha1.APIExportValidType)
| if err != nil { | ||
| t.Fatalf("catalogEntry %q failed to be reconciled in cluster %q: %v", entry.GetName(), workspaceCluster, err) | ||
| } | ||
|
|
|
@varshaprasad96: PR needs rebase. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
openshift-merge-robot
added
the
needs-rebase
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
referenced APIExport to entry status
Signed-off-by: Vu Dinh [email protected]