feat: Introduces Server-Side Apply as sync option

[leoluz]

This PR implements the Server-Side Apply proposal.

Achieved goals:

• [G-1] Fine grained configuration
• [G-2] Strategic merge patch while diffing
• [G-3] Admission Controllers compatibility
• [G-4] Conflict management
• [G-5] Register a proper manager

Fix #2267
Fix #2268

Checklist:

• Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
• The title of the PR states what changed and the related issues number (used for the release note).
• I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
• I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
• Does this PR require documentation updates?
• I've updated documentation as required by this PR.
• Optional. My organization is added to USERS.md.
• I have signed off all my commits as required by DCO
• I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
• My build is green (troubleshooting builds).

Signed-off-by: Leonardo Luz Almeida [email protected]

[codecov]

Codecov Report

Merging #9711 (7310dd3) into master (02db022) will increase coverage by 0.09%.
The diff coverage is 41.17%.

@@            Coverage Diff             @@
##           master    #9711      +/-   ##
==========================================
+ Coverage   45.87%   45.96%   +0.09%     
==========================================
  Files         227      226       -1     
  Lines       27373    27382       +9     
==========================================
+ Hits        12556    12586      +30     
+ Misses      13113    13086      -27     
- Partials     1704     1710       +6     

Impacted Files	Coverage Δ
cmd/argocd/commands/app.go	20.32% <0.00%> (-0.06%)	⬇️
controller/sync.go	56.09% <ø> (ø)
util/argo/managedfields/managed_fields.go	67.27% <ø> (+25.22%)	⬆️
controller/state.go	73.89% <33.33%> (-0.33%)	⬇️
util/argo/diff/diff.go	52.41% <60.00%> (+0.20%)	⬆️
util/db/gpgkeys.go	77.14% <0.00%> (-1.97%)	⬇️
util/gpg/gpg.go	66.96% <0.00%> (-1.25%)	⬇️
util/oidc/oidc.go	57.70% <0.00%> (+1.58%)	⬆️
pkg/apis/application/v1alpha1/app_project_types.go	59.61% <0.00%> (+5.21%)	⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

[yeya24]

I enabled server side apply at the app level right now like below:

  syncPolicy:
    automated:
      prune: true
    syncOptions:
    - ServerSideApply=true

I also tried our service port case mentioned in #8812 (comment) but unfortunately, it doesn't work and threw error during diff phase. The error is:

Hopefully, the error would be helpful for you to troubleshoot. Thanks for the great work so far!

[leoluz]

I also tried our service port case mentioned in #8812 (comment) but unfortunately, it doesn't work and threw error during diff phase. The error is:

Hopefully, the error would be helpful for you to troubleshoot. Thanks for the great work so far!

Hi @yeya24, I created a test with your service example as part of argoproj/gitops-engine#418 and the test is passing. From the error message, it seems that there is something duplicated in your ports list. Can you please double check if you have duplicated ports with the same name?

[yeya24]

#8812 (comment)

I was using the same manifest but I still got this error. No duplicate port name.

apiVersion: v1
kind: Service
metadata:
  name: nginx
spec:
  ports:
  - name: rtmpk
    port: 1986
    protocol: UDP
    targetPort: 1986
  - name: rtmp
    port: 1935
    targetPort: 1935
  - name: rtmpq
    port: 1935
    protocol: UDP
    targetPort: 1935
  - name: https
    port: 443
    targetPort: 443
  - name: http3
    port: 443
    protocol: UDP
    targetPort: 443

[leoluz]

I was using the same manifest but I still got this error. No duplicate port name.

Can you pls try applying this manifest and provide me the results?

apiVersion: v1
kind: Service
metadata:
  name: nginx
spec:
  ports:
  - name: rtmpk
    port: 1986
    protocol: UDP
    targetPort: 1986
  - name: rtmp
    port: 1935
    protocol: TCP
    targetPort: 1935
  - name: rtmpq
    port: 1935
    protocol: UDP
    targetPort: 1935
  - name: https
    port: 443
    protocol: TCP
    targetPort: 443
  - name: http3
    port: 443
    protocol: UDP
    targetPort: 443

[leoluz]

@yeya24 I rebased this branch with master, deployed locally and tested with #8812 (comment) and confirm that its working as expected. Can you please try again with this updated branch?

Btw, added an additional unit test to validate this exact case:
argoproj/gitops-engine@a956f80

[FabioAntunes]

This can be updated now right? argoproj/gitops-engine#418

quite excited for this thanks for the awesome work @leoluz

[leoluz]

@FabioAntunes Tks!
I just updated this branch to point to gitops-engine master.
It would be awesome if you can give this a try and provide us feedback.