Merge "calico: yaml indentation fixes"

This commit is contained in:
Zuul 2018-04-28 17:41:38 +00:00 committed by Gerrit Code Review
commit 158b07037c

View File

@ -65,40 +65,40 @@ pod:
memory: "1024Mi" memory: "1024Mi"
cpu: "2000m" cpu: "2000m"
calico_kube_policy_controller: calico_kube_policy_controller:
requests: requests:
memory: "128Mi" memory: "128Mi"
cpu: "100m" cpu: "100m"
limits: limits:
memory: "1024Mi" memory: "1024Mi"
cpu: "2000m" cpu: "2000m"
calico_node: calico_node:
requests: requests:
memory: "128Mi" memory: "128Mi"
cpu: "100m" cpu: "100m"
limits: limits:
memory: "1024Mi" memory: "1024Mi"
cpu: "2000m" cpu: "2000m"
calico_cni: calico_cni:
requests: requests:
memory: "128Mi" memory: "128Mi"
cpu: "100m" cpu: "100m"
limits: limits:
memory: "1024Mi" memory: "1024Mi"
cpu: "2000m" cpu: "2000m"
calico_ctl: calico_ctl:
requests: requests:
memory: "128Mi" memory: "128Mi"
cpu: "100m" cpu: "100m"
limits: limits:
memory: "1024Mi" memory: "1024Mi"
cpu: "2000m" cpu: "2000m"
calico_etcd: calico_etcd:
requests: requests:
memory: "128Mi" memory: "128Mi"
cpu: "100m" cpu: "100m"
limits: limits:
memory: "1024Mi" memory: "1024Mi"
cpu: "2000m" cpu: "2000m"
lifecycle: lifecycle:
upgrades: upgrades:
deployments: deployments:
@ -174,7 +174,7 @@ endpoints:
scheme: scheme:
default: http default: http
path: path:
default: ' ' # space required to provide a truly empty path default: ' ' # space required to provide a truly empty path
hosts: hosts:
default: 10.96.232.136 default: 10.96.232.136
host_fqdn_override: host_fqdn_override:
@ -196,7 +196,7 @@ monitoring:
networking: networking:
podSubnet: 192.168.0.0/16 podSubnet: 192.168.0.0/16
#NOTE(portdirect): this should be the physical MTU, the appropriate MTU # NOTE(portdirect): this should be the physical MTU, the appropriate MTU
# that calico should use will be calculated. # that calico should use will be calculated.
mtu: 1500 mtu: 1500
settings: settings: