-
Notifications
You must be signed in to change notification settings - Fork 14
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.
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
Use ignoreDifferences in AWSMachineTemplate.Spec to avoid out-of-sync baseclusters #251
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
Rohitrajak1807
requested review from
cruizen,
bcle,
jayanth-tjvrr and
ShaunakJoshi1407
September 29, 2022 09:37
The PR is still in Draft mode. Was that intentional? |
bcle
reviewed
Sep 29, 2022
Yes. It is in draft mode because testing was interrupted due to resource
limits we faced. The testing will be over soon at which point I'll mark it
ready for review.
…On Thu, Sep 29, 2022, 22:22 Bich C. Le ***@***.***> wrote:
The PR is still in Draft mode. Was that intentional?
—
Reply to this email directly, view it on GitHub
<#251 (comment)>, or
unsubscribe
<https://github.com/notifications/unsubscribe-auth/AJNJ3UQQNNMDWBREYI65RUTWAXCLFANCNFSM6AAAAAAQYSSCZY>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
Yes, we did. Also the error message clearly stated it as well.
…On Thu, Sep 29, 2022, 22:22 Bich C. Le ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In pkg/cluster/cluster_app.go
<#251 (comment)>:
> @@ -83,10 +83,22 @@ func constructClusterApp(
Kind: "AWSManagedControlPlane",
JSONPointers: []string{"/spec/version"},
})
+
+ ignoreDiffs = append(ignoreDiffs, argoappv1.ResourceIgnoreDifferences{
+ Group: "infrastructure.cluster.x-k8s.io",
+ Kind: "AWSMachineTemplate",
+ JSONPointers: []string{"/spec"},
Did you confirm that the entire spec is immutable?
------------------------------
In pkg/cluster/cluster_app.go
<#251 (comment)>:
> app.Spec.IgnoreDifferences = ignoreDiffs
app.Spec.Source.Kustomize = &argoappv1.ApplicationSourceKustomize{
NamePrefix: clusterName + "-",
}
+ app.Spec.SyncPolicy = &argoappv1.SyncPolicy{
+ Automated: &argoappv1.SyncPolicyAutomated{
+ Prune: true,
+ },
+ SyncOptions: []string{"Prune=true", "RespectIgnoreDifferences=true"},
Did you confirm that with this option, sync now succeeds on existing
clusters?
—
Reply to this email directly, view it on GitHub
<#251 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AJNJ3UWHUJAQ3ZOH6GGS5HLWAXCMPANCNFSM6AAAAAAQYSSCZY>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
bcle
approved these changes
Sep 30, 2022
It's under observation for now. Testing was delayed due to resource crunch
on AWS.
…On Thu, Sep 29, 2022, 22:24 Rohit Rajak ***@***.***> wrote:
Yes, we did. Also the error message clearly stated it as well.
On Thu, Sep 29, 2022, 22:22 Bich C. Le ***@***.***> wrote:
> ***@***.**** commented on this pull request.
> ------------------------------
>
> In pkg/cluster/cluster_app.go
> <#251 (comment)>:
>
> > @@ -83,10 +83,22 @@ func constructClusterApp(
> Kind: "AWSManagedControlPlane",
> JSONPointers: []string{"/spec/version"},
> })
> +
> + ignoreDiffs = append(ignoreDiffs, argoappv1.ResourceIgnoreDifferences{
> + Group: "infrastructure.cluster.x-k8s.io",
> + Kind: "AWSMachineTemplate",
> + JSONPointers: []string{"/spec"},
>
> Did you confirm that the entire spec is immutable?
> ------------------------------
>
> In pkg/cluster/cluster_app.go
> <#251 (comment)>:
>
> > app.Spec.IgnoreDifferences = ignoreDiffs
> app.Spec.Source.Kustomize = &argoappv1.ApplicationSourceKustomize{
> NamePrefix: clusterName + "-",
> }
> + app.Spec.SyncPolicy = &argoappv1.SyncPolicy{
> + Automated: &argoappv1.SyncPolicyAutomated{
> + Prune: true,
> + },
> + SyncOptions: []string{"Prune=true", "RespectIgnoreDifferences=true"},
>
> Did you confirm that with this option, sync now succeeds on existing
> clusters?
>
> —
> Reply to this email directly, view it on GitHub
> <#251 (review)>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AJNJ3UWHUJAQ3ZOH6GGS5HLWAXCMPANCNFSM6AAAAAAQYSSCZY>
> .
> You are receiving this because you authored the thread.Message ID:
> ***@***.***>
>
|
cruizen
pushed a commit
that referenced
this pull request
Dec 16, 2022
… baseclusters (#251) * ignore diffs AWSMachineTemplate.spec * add doc changes to mention immutability
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.
Fixes #137
AWSMachineTemplate.spec
Testing (Manual):
that-cluster
consumes the manifests atclusters/that-cluster
.AWSMachineTemplate.spec
is then edited and pushed to the git repository.not-that-cluster
is deployed using this modified manifest and put under observation for around 8 hours