k3s/pkg
k8s-merge-robot 939ad4115a Merge pull request #27283 from yifan-gu/stats
Automatic merge from submit-queue

kubelet/rkt - treat pod container as the infra - only network stats

As no "container name" annotation was being applied to the pod as a whole, the rkt pod container didn't have a container name label. This means that in stat/summary it came up as a nameless container that belonged to the pod.

this was problematic as it caused double counting of container stats.

this adds a container name annotation to the pod level which will be overridden during label creation by annotations of the same name at the container level for the containers themselves.

stats/summary will do the right thing as it will treat it the same as the infra container, just get network stats from it.


Suppress #26759

cc @kubernetes/sig-node @kubernetes/rktnetes-maintainers
2016-06-14 06:05:40 -07:00
..
admission make admission plugins configurable based on external criteria 2016-05-26 09:12:17 -04:00
api Revert "Versioning docs and examples for v1.4.0-alpha.0." 2016-06-10 16:46:46 -07:00
apimachinery Moving StorageFactory building logic to genericapiserver 2016-05-10 00:57:11 -07:00
apis regenerated 2016-06-13 15:02:48 -07:00
apiserver Merge pull request #25731 from Pensu/master 2016-06-06 12:06:32 -07:00
auth Add an 'authenticated user' metric to the RequestAuthenticator. 2016-05-19 16:04:11 -07:00
capabilities
client Fix Retry-After in clients 2016-06-07 21:04:44 +02:00
cloudprovider Merge pull request #26900 from Clarifai/aws-instance-cache 2016-06-12 14:24:25 -07:00
controller Merge pull request #27127 from jsafrane/refactor-binder-operations 2016-06-12 23:44:28 -07:00
conversion Remove unused deep_copies 2016-06-06 17:18:22 -04:00
credentialprovider Add ap-northeast-2 2016-05-10 12:03:41 -04:00
dns Fix srv record lookup 2016-06-03 20:41:08 -07:00
fieldpath Downward API implementation for resources limits and requests 2016-05-24 12:22:35 -04:00
fields
genericapiserver Fixing externalAddress in genericapiserver 2016-06-03 11:21:29 -07:00
healthz
httplog
hyperkube
kubectl Merge pull request #26557 from AdoHe/patch_retry 2016-06-13 10:13:27 -07:00
kubelet rkt: Updated the TestMakePodManifestAnnotations(). 2016-06-13 09:43:15 -07:00
kubemark Added pods-per-core to kubelet. #25762 2016-05-27 07:10:13 -04:00
labels Remove unused deep_copies 2016-06-06 17:18:22 -04:00
master Revert "ScheduledJob tests" 2016-06-10 16:22:04 +02:00
metrics Fix call-sites after dep updates 2016-06-02 16:57:28 -07:00
probe followup to add http server close method 2016-05-05 12:04:41 +08:00
proxy add hostport support for kubenet 2016-05-22 22:18:58 -07:00
quota Merge pull request #26988 from vishh/quota-owners 2016-06-13 17:32:24 -07:00
registry Fix deployment strategy validation 2016-06-10 11:14:32 -07:00
runtime Remove unused deep_copies 2016-06-06 17:18:22 -04:00
security Adding volume plugin to api/v1 and updating auto-generated files 2016-05-21 12:53:03 -07:00
securitycontext Merge pull request #24909 from pmorie/security-context-loc 2016-05-27 10:27:55 -07:00
serviceaccount Make name validators return string slices 2016-05-18 00:48:01 -07:00
ssh Merge pull request #24506 from timstclair/ssh 2016-04-19 22:36:44 -07:00
storage Fix traces 2016-06-06 10:49:46 +02:00
types
ui
util Merge pull request #27012 from janetkuo/reduce-pod-list 2016-06-10 20:40:22 -07:00
version
volume Merge pull request #25888 from rootfs/attacher-aws-cinder 2016-06-10 05:39:22 -07:00
watch Merge pull request #24789 from wojtek-t/use_proper_codec_in_client 2016-05-04 11:00:04 -07:00
OWNERS