add labels and annotations to rollouts api #3832
Merged
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
natasha41575
force-pushed
the
rootsyncmeta
branch
from
cad96be
to
a4e4300
Compare
natasha41575
force-pushed
the
rootsyncmeta
branch
from
a4e4300
to
10990ad
Compare
natasha41575
changed the title
droot
reviewed
Feb 21, 2023
droot
approved these changes
Feb 22, 2023
| @@ -276,6 +277,14 @@ func (r *RolloutReconciler) getPackageDiscoveryClient(rolloutNamespacedName type | |||
| func (r *RolloutReconciler) reconcileRollout(ctx context.Context, rollout *gitopsv1alpha1.Rollout, strategy *gitopsv1alpha1.ProgressiveRolloutStrategy, packageDiscoveryClient *packagediscovery.PackageDiscovery) error { | |||
| logger := klog.FromContext(ctx) | |||
|
|
|||
| if rollout != nil && rollout.Spec.SyncTemplate != nil { | |||
| if rollout.Spec.SyncTemplate.Type == gitopsv1alpha1.TemplateTypeRepoSync { | |||
| err := fmt.Errorf("reposync is not yet supported") | |||
There was a problem hiding this comment.
just a note for us: we will have to start capturing these as errors as conditions in the status part of the API to surface it to the end users. Today, one has to look at the error logs of the controller :)
| if pkg.Revision != rrs.Spec.Template.Spec.Git.Revision { | ||
| if pkg.Revision != rrs.Spec.Template.Spec.Git.Revision || | ||
| !reflect.DeepEqual(rollout.Spec.SyncTemplate.RootSync.Metadata, | ||
| rrs.Spec.Template.Metadata) { |
There was a problem hiding this comment.
Note for us: I can see this logic evolving, so would be good to extract it out as a function and have unit tests around it. Something along the lines of:
func DoesPkgNeedUpdate(rollout, pkg, rrs) (bool) {
}
I can see we are not comparing other bits of the template such as git secret ref etc. Can you file another issue for tracking this bug. I think this seems more critical to be addressed.
natasha41575
force-pushed
the
rootsyncmeta
branch
from
c7b1b04
to
72cd9b8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Should resolve #3797.
This PR adds labels and annotations to the rollouts api under
syncTemplate.For example:
The specified annotations and labels get added to spec of
RemoteRootSyncobjects that the rollout creates. TheRemoteRootSyncobjects add them to the metadata ofRootSyncobjects that they create.