mirror of
https://github.com/argoproj/argo-cd
synced 2026-04-22 01:17:16 +00:00
1c4ef33687
* feat: Add server-side apply manager config Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * Force conflicts when SSA Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * Implement strategic-merge patch in diff Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * Implement structured merge diff Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * Implement structured merge in diff Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * Fix parseable type conversion Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * Handle structured merge diff for create/delete operations Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * User NormalizeUnionsApply instead of Merge for structured-merge diff Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * NormalizeUnions Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * merge first than normalize union Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * calculate diff with fieldsets Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * extract managed fields Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * remove managed fields then merge Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * Just remove fields if manager is found Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * remove config fieldset instead of using managed fields Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * Structure merge diff with defaults Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * tests Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * Normalize union at the end Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * test Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * test Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * Remove fields after merging Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * test Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * test Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * apply defaults when building diff result Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * fix default func call Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * Fix diff default Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * fix merged object Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * keep diff order Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * apply default with patch Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * handle ssa diffs with resource annotations Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * use managed fields to calculate diff Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * Implement unit tests Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * fix bad merge Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * add test to validate service with multiple ports Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * resolveFromStaticParser optimization Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com> * try without reordering while patching default values Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
18 lines
368 B
YAML
18 lines
368 B
YAML
apiVersion: v1
|
|
kind: Service
|
|
metadata:
|
|
annotations:
|
|
argocd.argoproj.io/sync-options: ServerSideApply=true
|
|
labels:
|
|
app.kubernetes.io/instance: big-crd
|
|
name: multiple-protocol-port-svc
|
|
namespace: default
|
|
spec:
|
|
ports:
|
|
- name: rtmpk
|
|
port: 1986
|
|
protocol: UDP
|
|
targetPort: 1986
|
|
- name: rtmp
|
|
port: 1935
|
|
targetPort: 1935
|