mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-05-20 22:15:00 +00:00
129 lines
3.6 KiB
Diff
129 lines
3.6 KiB
Diff
diff -u -N /tmp/noop/apps_v1beta2_Deployment_nginx.yaml /tmp/transformed/apps_v1beta2_Deployment_nginx.yaml
|
|
--- /tmp/noop/apps_v1beta2_Deployment_nginx.yaml YYYY-MM-DD HH:MM:SS
|
|
+++ /tmp/transformed/apps_v1beta2_Deployment_nginx.yaml YYYY-MM-DD HH:MM:SS
|
|
@@ -5,23 +5,26 @@
|
|
note: This is a test annotation
|
|
labels:
|
|
app: mynginx
|
|
+ env: staging
|
|
org: example.com
|
|
- team: foo
|
|
- name: team-foo-nginx
|
|
+ team: override-foo
|
|
+ name: staging-team-foo-nginx
|
|
spec:
|
|
selector:
|
|
matchLabels:
|
|
app: mynginx
|
|
+ env: staging
|
|
org: example.com
|
|
- team: foo
|
|
+ team: override-foo
|
|
template:
|
|
metadata:
|
|
annotations:
|
|
note: This is a test annotation
|
|
labels:
|
|
app: mynginx
|
|
+ env: staging
|
|
org: example.com
|
|
- team: foo
|
|
+ team: override-foo
|
|
spec:
|
|
containers:
|
|
- image: nginx
|
|
@@ -30,8 +33,12 @@
|
|
- mountPath: /tmp/ps
|
|
name: nginx-persistent-storage
|
|
volumes:
|
|
- - emptyDir: {}
|
|
+ - gcePersistentDisk:
|
|
+ pdName: nginx-persistent-storage
|
|
name: nginx-persistent-storage
|
|
- configMap:
|
|
- name: team-foo-configmap-in-base-bbdmdh7m8t
|
|
+ name: staging-configmap-in-overlay-k7cbc75tg8
|
|
+ name: configmap-in-overlay
|
|
+ - configMap:
|
|
+ name: staging-team-foo-configmap-in-base-gh9d7t85gb
|
|
name: configmap-in-base
|
|
diff -u -N /tmp/noop/v1_ConfigMap_configmap-in-base.yaml /tmp/transformed/v1_ConfigMap_configmap-in-base.yaml
|
|
--- /tmp/noop/v1_ConfigMap_configmap-in-base.yaml YYYY-MM-DD HH:MM:SS
|
|
+++ /tmp/transformed/v1_ConfigMap_configmap-in-base.yaml YYYY-MM-DD HH:MM:SS
|
|
@@ -1,6 +1,6 @@
|
|
apiVersion: v1
|
|
data:
|
|
- foo: bar
|
|
+ foo: override-bar
|
|
kind: ConfigMap
|
|
metadata:
|
|
annotations:
|
|
@@ -8,6 +8,7 @@
|
|
creationTimestamp: null
|
|
labels:
|
|
app: mynginx
|
|
+ env: staging
|
|
org: example.com
|
|
- team: foo
|
|
- name: team-foo-configmap-in-base-bbdmdh7m8t
|
|
+ team: override-foo
|
|
+ name: staging-team-foo-configmap-in-base-gh9d7t85gb
|
|
diff -u -N /tmp/noop/v1_ConfigMap_configmap-in-overlay.yaml /tmp/transformed/v1_ConfigMap_configmap-in-overlay.yaml
|
|
--- /tmp/noop/v1_ConfigMap_configmap-in-overlay.yaml YYYY-MM-DD HH:MM:SS
|
|
+++ /tmp/transformed/v1_ConfigMap_configmap-in-overlay.yaml YYYY-MM-DD HH:MM:SS
|
|
@@ -0,0 +1,10 @@
|
|
+apiVersion: v1
|
|
+data:
|
|
+ hello: world
|
|
+kind: ConfigMap
|
|
+metadata:
|
|
+ creationTimestamp: null
|
|
+ labels:
|
|
+ env: staging
|
|
+ team: override-foo
|
|
+ name: staging-configmap-in-overlay-k7cbc75tg8
|
|
diff -u -N /tmp/noop/v1_Secret_secret-in-base.yaml /tmp/transformed/v1_Secret_secret-in-base.yaml
|
|
--- /tmp/noop/v1_Secret_secret-in-base.yaml YYYY-MM-DD HH:MM:SS
|
|
+++ /tmp/transformed/v1_Secret_secret-in-base.yaml YYYY-MM-DD HH:MM:SS
|
|
@@ -1,6 +1,7 @@
|
|
apiVersion: v1
|
|
data:
|
|
password: c29tZXB3
|
|
+ proxy: aGFwcm94eQ==
|
|
username: YWRtaW4=
|
|
kind: Secret
|
|
metadata:
|
|
@@ -9,7 +10,8 @@
|
|
creationTimestamp: null
|
|
labels:
|
|
app: mynginx
|
|
+ env: staging
|
|
org: example.com
|
|
- team: foo
|
|
- name: team-foo-secret-in-base-tkm7hhtf8d
|
|
+ team: override-foo
|
|
+ name: staging-team-foo-secret-in-base-c8db7gk2m2
|
|
type: Opaque
|
|
diff -u -N /tmp/noop/v1_Service_nginx.yaml /tmp/transformed/v1_Service_nginx.yaml
|
|
--- /tmp/noop/v1_Service_nginx.yaml YYYY-MM-DD HH:MM:SS
|
|
+++ /tmp/transformed/v1_Service_nginx.yaml YYYY-MM-DD HH:MM:SS
|
|
@@ -5,13 +5,15 @@
|
|
note: This is a test annotation
|
|
labels:
|
|
app: mynginx
|
|
+ env: staging
|
|
org: example.com
|
|
- team: foo
|
|
- name: team-foo-nginx
|
|
+ team: override-foo
|
|
+ name: staging-team-foo-nginx
|
|
spec:
|
|
ports:
|
|
- port: 80
|
|
selector:
|
|
app: mynginx
|
|
+ env: staging
|
|
org: example.com
|
|
- team: foo
|
|
+ team: override-foo
|