mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-06-13 01:50:55 +00:00
add option to choose prepend/append in merge
This commit is contained in:
@@ -7,4 +7,6 @@ require (
|
||||
sigs.k8s.io/yaml v1.2.0
|
||||
)
|
||||
|
||||
replace sigs.k8s.io/kustomize/kyaml v0.8.1 => ../../../kyaml
|
||||
|
||||
replace sigs.k8s.io/kustomize/api v0.6.2 => ../../../api
|
||||
|
||||
@@ -5,3 +5,5 @@ go 1.14
|
||||
require sigs.k8s.io/kustomize/api v0.6.2
|
||||
|
||||
replace sigs.k8s.io/kustomize/api v0.6.2 => ../../../api
|
||||
|
||||
replace sigs.k8s.io/kustomize/kyaml v0.8.1 => ../../../kyaml
|
||||
|
||||
@@ -8,3 +8,5 @@ require (
|
||||
)
|
||||
|
||||
replace sigs.k8s.io/kustomize/api v0.6.2 => ../../../api
|
||||
|
||||
replace sigs.k8s.io/kustomize/kyaml v0.8.1 => ../../../kyaml
|
||||
|
||||
@@ -321,13 +321,13 @@ spec:
|
||||
old-label: old-value
|
||||
spec:
|
||||
containers:
|
||||
- image: nginx
|
||||
name: nginx
|
||||
- args:
|
||||
- proxy
|
||||
- sidecar
|
||||
image: docker.io/istio/proxyv2
|
||||
name: istio-proxy
|
||||
- image: nginx
|
||||
name: nginx
|
||||
---
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
@@ -747,10 +747,7 @@ spec:
|
||||
name: test-deployment
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
name: take-over-the-world
|
||||
protocol: TCP
|
||||
- containerPort: 8080
|
||||
name: take-over-the-world
|
||||
name: disappearing-act
|
||||
protocol: TCP
|
||||
`)
|
||||
}
|
||||
|
||||
@@ -4,9 +4,9 @@ go 1.14
|
||||
|
||||
require (
|
||||
github.com/evanphx/json-patch v4.5.0+incompatible
|
||||
github.com/pkg/errors v0.8.1
|
||||
sigs.k8s.io/kustomize/api v0.6.2
|
||||
sigs.k8s.io/kustomize/kyaml v0.8.1
|
||||
github.com/pkg/errors v0.8.1
|
||||
sigs.k8s.io/yaml v1.2.0
|
||||
)
|
||||
|
||||
|
||||
@@ -8,3 +8,5 @@ require (
|
||||
)
|
||||
|
||||
replace sigs.k8s.io/kustomize/api v0.6.2 => ../../../api
|
||||
|
||||
replace sigs.k8s.io/kustomize/kyaml v0.8.1 => ../../../kyaml
|
||||
|
||||
@@ -5,3 +5,5 @@ go 1.14
|
||||
require sigs.k8s.io/kustomize/api v0.6.2
|
||||
|
||||
replace sigs.k8s.io/kustomize/api v0.6.2 => ../../../../api
|
||||
|
||||
replace sigs.k8s.io/kustomize/kyaml v0.8.1 => ../../../../kyaml
|
||||
|
||||
@@ -5,3 +5,5 @@ go 1.14
|
||||
require sigs.k8s.io/kustomize/api v0.6.2
|
||||
|
||||
replace sigs.k8s.io/kustomize/api v0.6.2 => ../../../../api
|
||||
|
||||
replace sigs.k8s.io/kustomize/kyaml v0.8.1 => ../../../../kyaml
|
||||
|
||||
@@ -9,3 +9,5 @@ require (
|
||||
)
|
||||
|
||||
replace sigs.k8s.io/kustomize/api v0.6.2 => ../../../../api
|
||||
|
||||
replace sigs.k8s.io/kustomize/kyaml v0.8.1 => ../../../../kyaml
|
||||
|
||||
@@ -5,3 +5,5 @@ go 1.14
|
||||
require sigs.k8s.io/kustomize/api v0.6.2
|
||||
|
||||
replace sigs.k8s.io/kustomize/api v0.6.2 => ../../../../api
|
||||
|
||||
replace sigs.k8s.io/kustomize/kyaml v0.8.1 => ../../../../kyaml
|
||||
|
||||
@@ -5,3 +5,5 @@ go 1.14
|
||||
require sigs.k8s.io/kustomize/api v0.6.2
|
||||
|
||||
replace sigs.k8s.io/kustomize/api v0.6.2 => ../../../../api
|
||||
|
||||
replace sigs.k8s.io/kustomize/kyaml v0.8.1 => ../../../../kyaml
|
||||
|
||||
@@ -8,3 +8,5 @@ require (
|
||||
)
|
||||
|
||||
replace sigs.k8s.io/kustomize/api v0.6.2 => ../../../../api
|
||||
|
||||
replace sigs.k8s.io/kustomize/kyaml v0.8.1 => ../../../../kyaml
|
||||
|
||||
@@ -8,3 +8,5 @@ require (
|
||||
)
|
||||
|
||||
replace sigs.k8s.io/kustomize/api v0.6.2 => ../../../../api
|
||||
|
||||
replace sigs.k8s.io/kustomize/kyaml v0.8.1 => ../../../../kyaml
|
||||
|
||||
@@ -5,3 +5,5 @@ go 1.14
|
||||
require sigs.k8s.io/kustomize/api v0.6.2
|
||||
|
||||
replace sigs.k8s.io/kustomize/api v0.6.2 => ../../../../api
|
||||
|
||||
replace sigs.k8s.io/kustomize/kyaml v0.8.1 => ../../../../kyaml
|
||||
|
||||
@@ -8,3 +8,5 @@ require (
|
||||
)
|
||||
|
||||
replace sigs.k8s.io/kustomize/api v0.6.2 => ../../../../api
|
||||
|
||||
replace sigs.k8s.io/kustomize/kyaml v0.8.1 => ../../../../kyaml
|
||||
|
||||
@@ -9,3 +9,5 @@ require (
|
||||
)
|
||||
|
||||
replace sigs.k8s.io/kustomize/api v0.6.2 => ../../../../api
|
||||
|
||||
replace sigs.k8s.io/kustomize/kyaml v0.8.1 => ../../../../kyaml
|
||||
|
||||
@@ -5,3 +5,5 @@ go 1.14
|
||||
require sigs.k8s.io/kustomize/api v0.6.2
|
||||
|
||||
replace sigs.k8s.io/kustomize/api v0.6.2 => ../../../../api
|
||||
|
||||
replace sigs.k8s.io/kustomize/kyaml v0.8.1 => ../../../../kyaml
|
||||
|
||||
Reference in New Issue
Block a user