|
--- original-emoji-deployment.yaml 2019-03-13 13:49:08.311866378 -0700 |
|
+++ override-emoji-deployment.yaml 2019-03-13 13:48:59.907932144 -0700 |
|
@@ -4,18 +4,18 @@ |
|
annotations: |
|
deployment.kubernetes.io/revision: "1" |
|
kubectl.kubernetes.io/last-applied-configuration: | |
|
- {"apiVersion":"apps/v1beta1","kind":"Deployment","metadata":{"annotations":{},"creationTimestamp":null,"name":"emoji","namespace":"emojivoto-01"},"spec":{"replicas":1,"selector":{"matchLabels":{"app":"emoji-svc"}},"strategy":{},"template":{"metadata":{"annotations":{"linkerd.io/inject":"enabled"},"creationTimestamp":null,"labels":{"app":"emoji-svc"}},"spec":{"containers":[{"env":[{"name":"GRPC_PORT","value":"8080"}],"image":"buoyantio/emojivoto-emoji-svc:v6","name":"emoji-svc","ports":[{"containerPort":8080,"name":"grpc"}],"resources":{"requests":{"cpu":"100m"}}}]}}},"status":{}} |
|
- creationTimestamp: "2019-03-13T20:37:22Z" |
|
+ {"apiVersion":"apps/v1beta1","kind":"Deployment","metadata":{"annotations":{},"creationTimestamp":null,"name":"emoji","namespace":"emojivoto"},"spec":{"replicas":1,"selector":{"matchLabels":{"app":"emoji-svc"}},"strategy":{},"template":{"metadata":{"annotations":{"config.linkerd.io/control-port":"4000","config.linkerd.io/disable-external-profile":"true","config.linkerd.io/ignore-inbound-ports":"4222,6222","config.linkerd.io/ignore-outbound-ports":"8078,8079","config.linkerd.io/inbound-port":"5000","config.linkerd.io/init-image":"gcr.io/linkerd-io/proxy-init","config.linkerd.io/limit-cpu":"1","config.linkerd.io/limit-memory":"128Mi","config.linkerd.io/log-level":"info,linkerd2_proxy=debug","config.linkerd.io/metrics-port":"5001","config.linkerd.io/outbound-port":"5002","config.linkerd.io/proxy-image":"gcr.io/linkerd-io/proxy","config.linkerd.io/request-cpu":"0.2","config.linkerd.io/request-memory":"64Mi","config.linkerd.io/uid":"9700","linkerd.io/inject":"enabled"},"creationTimestamp":null,"labels":{"app":"emoji-svc"}},"spec":{"containers":[{"env":[{"name":"GRPC_PORT","value":"8080"}],"image":"buoyantio/emojivoto-emoji-svc:v6","name":"emoji-svc","ports":[{"containerPort":8080,"name":"grpc"}],"resources":{"requests":{"cpu":"100m"}}}]}}},"status":{}} |
|
+ creationTimestamp: "2019-03-13T17:57:58Z" |
|
generation: 1 |
|
labels: |
|
app: emoji-svc |
|
linkerd.io/control-plane-ns: linkerd |
|
linkerd.io/proxy-deployment: emoji |
|
name: emoji |
|
- namespace: emojivoto-01 |
|
- resourceVersion: "346045" |
|
- selfLink: /apis/extensions/v1beta1/namespaces/emojivoto-01/deployments/emoji |
|
- uid: ce1ab9aa-45cf-11e9-be5d-ec7d530f2a6d |
|
+ namespace: emojivoto |
|
+ resourceVersion: "334043" |
|
+ selfLink: /apis/extensions/v1beta1/namespaces/emojivoto/deployments/emoji |
|
+ uid: 89637e13-45b9-11e9-be5d-ec7d530f2a6d |
|
spec: |
|
progressDeadlineSeconds: 600 |
|
replicas: 1 |
|
@@ -31,6 +31,21 @@ |
|
template: |
|
metadata: |
|
annotations: |
|
+ config.linkerd.io/control-port: "4000" |
|
+ config.linkerd.io/disable-external-profile: "true" |
|
+ config.linkerd.io/ignore-inbound-ports: 4222,6222 |
|
+ config.linkerd.io/ignore-outbound-ports: 8078,8079 |
|
+ config.linkerd.io/inbound-port: "5000" |
|
+ config.linkerd.io/init-image: gcr.io/linkerd-io/proxy-init |
|
+ config.linkerd.io/limit-cpu: "1" |
|
+ config.linkerd.io/limit-memory: 128Mi |
|
+ config.linkerd.io/log-level: info,linkerd2_proxy=debug |
|
+ config.linkerd.io/metrics-port: "5001" |
|
+ config.linkerd.io/outbound-port: "5002" |
|
+ config.linkerd.io/proxy-image: gcr.io/linkerd-io/proxy |
|
+ config.linkerd.io/request-cpu: "0.2" |
|
+ config.linkerd.io/request-memory: 64Mi |
|
+ config.linkerd.io/uid: "9700" |
|
linkerd.io/created-by: linkerd/proxy-injector git-b1567f52 |
|
linkerd.io/identity-mode: optional |
|
linkerd.io/inject: enabled |
|
@@ -59,17 +74,17 @@ |
|
terminationMessagePolicy: File |
|
- env: |
|
- name: LINKERD2_PROXY_LOG |
|
- value: warn,linkerd2_proxy=info |
|
+ value: info,linkerd2_proxy=debug |
|
- name: LINKERD2_PROXY_CONTROL_URL |
|
value: tcp://linkerd-destination.linkerd.svc.cluster.local:8086 |
|
- name: LINKERD2_PROXY_CONTROL_LISTENER |
|
- value: tcp://0.0.0.0:4190 |
|
+ value: tcp://0.0.0.0:4000 |
|
- name: LINKERD2_PROXY_METRICS_LISTENER |
|
- value: tcp://0.0.0.0:4191 |
|
+ value: tcp://0.0.0.0:5001 |
|
- name: LINKERD2_PROXY_OUTBOUND_LISTENER |
|
- value: tcp://127.0.0.1:4140 |
|
+ value: tcp://127.0.0.1:5002 |
|
- name: LINKERD2_PROXY_INBOUND_LISTENER |
|
- value: tcp://0.0.0.0:4143 |
|
+ value: tcp://0.0.0.0:5000 |
|
- name: LINKERD2_PROXY_DESTINATION_PROFILE_SUFFIXES |
|
value: . |
|
- name: LINKERD2_PROXY_POD_NAMESPACE |
|
@@ -101,7 +116,7 @@ |
|
failureThreshold: 3 |
|
httpGet: |
|
path: /metrics |
|
- port: 4191 |
|
+ port: 5001 |
|
scheme: HTTP |
|
initialDelaySeconds: 10 |
|
periodSeconds: 10 |
|
@@ -109,26 +124,32 @@ |
|
timeoutSeconds: 1 |
|
name: linkerd-proxy |
|
ports: |
|
- - containerPort: 4143 |
|
+ - containerPort: 5000 |
|
name: linkerd-proxy |
|
protocol: TCP |
|
- - containerPort: 4191 |
|
+ - containerPort: 5001 |
|
name: linkerd-metrics |
|
protocol: TCP |
|
readinessProbe: |
|
failureThreshold: 3 |
|
httpGet: |
|
path: /metrics |
|
- port: 4191 |
|
+ port: 5001 |
|
scheme: HTTP |
|
initialDelaySeconds: 10 |
|
periodSeconds: 10 |
|
successThreshold: 1 |
|
timeoutSeconds: 1 |
|
- resources: {} |
|
+ resources: |
|
+ limits: |
|
+ cpu: "1" |
|
+ memory: 128Mi |
|
+ requests: |
|
+ cpu: 200m |
|
+ memory: 64Mi |
|
securityContext: |
|
procMount: Default |
|
- runAsUser: 2102 |
|
+ runAsUser: 9700 |
|
terminationMessagePath: /dev/termination-log |
|
terminationMessagePolicy: FallbackToLogsOnError |
|
volumeMounts: |
|
@@ -142,15 +163,15 @@ |
|
initContainers: |
|
- args: |
|
- --incoming-proxy-port |
|
- - "4143" |
|
+ - "5000" |
|
- --outgoing-proxy-port |
|
- - "4140" |
|
+ - "5002" |
|
- --proxy-uid |
|
- - "2102" |
|
+ - "9700" |
|
- --inbound-ports-to-ignore |
|
- - 8888,9999,4190,4191 |
|
+ - 4222,6222,4000,5001 |
|
- --outbound-ports-to-ignore |
|
- - "7777" |
|
+ - 8078,8079 |
|
image: gcr.io/linkerd-io/proxy-init:git-b1567f52 |
|
imagePullPolicy: IfNotPresent |
|
name: linkerd-init |
|
@@ -183,15 +204,15 @@ |
|
status: |
|
availableReplicas: 1 |
|
conditions: |
|
- - lastTransitionTime: "2019-03-13T20:37:50Z" |
|
- lastUpdateTime: "2019-03-13T20:37:50Z" |
|
+ - lastTransitionTime: "2019-03-13T17:58:24Z" |
|
+ lastUpdateTime: "2019-03-13T17:58:24Z" |
|
message: Deployment has minimum availability. |
|
reason: MinimumReplicasAvailable |
|
status: "True" |
|
type: Available |
|
- - lastTransitionTime: "2019-03-13T20:37:23Z" |
|
- lastUpdateTime: "2019-03-13T20:37:50Z" |
|
- message: ReplicaSet "emoji-68db59f65c" has successfully progressed. |
|
+ - lastTransitionTime: "2019-03-13T17:57:58Z" |
|
+ lastUpdateTime: "2019-03-13T17:58:24Z" |
|
+ message: ReplicaSet "emoji-6c85c4d5b4" has successfully progressed. |
|
reason: NewReplicaSetAvailable |
|
status: "True" |
|
type: Progressing |