1. 19 Jul, 2016 5 commits
    • k8s-merge-robot's avatar
      Merge pull request #28807 from Random-Liu/e2e-node-e2e-share-test · af0835c0
      k8s-merge-robot authored
      Automatic merge from submit-queue
      
      Node E2E: Make it possible to share test between e2e and node e2e
      
      This PR is part of the plan to improve node e2e test coverage.
      * Now to improve test coverage, we have to copy test from e2e to node e2e.
      * When adding a new test, we have to decide its destiny at the very beginning - whether it is a node e2e or e2e.
      
      This PR makes it possible to share test between e2e and node e2e. 
      By leveraging the mechanism of ginkgo, as long as we can import the test package in the test suite, the corresponding `Describe` will be run to initialize the global variable `_`, and the test will be inserted into the test suite. (See https://github.com/onsi/composition-ginkgo-example)
      
      In the future, we just need to use the framework to write the test, and put the test into `test/e2e/node`, then it will be automatically shared by the 2 test suites.
      
      This PR:
      1) Refactored the framework to make it automatically differentiate e2e and node e2e (Mainly refactored the `PodClient` and the apiserver client initialization).
      2) Created a new directory `test/e2e/node` and make it shared by e2e and node e2e.
      3) Moved `container_probe.go` into `test/e2e/node` to verify the change.
      
      @kubernetes/sig-node 
      
      [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
      af0835c0
    • k8s-merge-robot's avatar
      Merge pull request #29139 from adityakali/logrotate.1 · 8b16c75b
      k8s-merge-robot authored
      Automatic merge from submit-queue
      
      fix logrotate config (again)
      
      we need to add the dateformat option so that the logrotate
      can create unique logfiles for each rotation. Without this,
      logrotation is skipped with message like (generated in
      verbose mode of logrotate):
      
      rotating log /var/log/rotate-test.log, log->rotateCount is 5
      dateext suffix '-20160718'
      glob pattern '-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]'
      destination /var/log/rotate-test2.log-20160718.gz already exists, skipping rotation
      
      Tested as follows:
        # config in '/etc/logrotate.d/rotate-test':
        /var/log/rotate-test.log {
          rotate 5
          copytruncate
          missingok
          notifempty
          compress
          maxsize 100M
          daily
          dateext
          dateformat -%Y%m%d-%s
          create 0644 root root
        }
      
        # create 150Mb of /var/log/rotate-test.log
        $ dd if=/dev/zero of=/var/log/rotate-test.log bs=1048576 count=150 conv=notrunc oflag=append
      
        # run logrotate
        $ /usr/sbin/logrotate -v /etc/logrotate.conf
        ...
        rotating pattern: /var/log/rotate-test.log  after 1 days (5 rotations)
        empty log files are not rotated, log files >= 104857600 are rotated earlier, old logs are removed
        considering log /var/log/rotate-test.log
          log needs rotating
        rotating log /var/log/rotate-test.log, log->rotateCount is 5
        Converted ' -%Y%m%d-%s' -> '-%Y%m%d-%s'
        dateext suffix '-20160718-1468875268'
        glob pattern '-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]-[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]'
        copying /var/log/rotate-test.log to /var/log/rotate-test.log-20160718-1468875268
        truncating /var/log/rotate-test.log
        compressing log with: /bin/gzip
      
        Repeating 'dd' and 'logrotate' commands now generate logfiles correctly.
      
      #27754 
      @bprashanth can you please review?
      8b16c75b
    • k8s-merge-robot's avatar
      Merge pull request #28714 from ciwang/robust-unmount · adef589e
      k8s-merge-robot authored
      Automatic merge from submit-queue
      
      Add OpenFile check if device is in use before unmount
      
      Fixes #28252 
      adef589e
    • k8s-merge-robot's avatar
      Merge pull request #29141 from zmerlynn/fix-node-prefix · 1d919962
      k8s-merge-robot authored
      Automatic merge from submit-queue
      
      GCE bring-up: Differentiate NODE_TAGS from NODE_INSTANCE_PREFIX
      1d919962
    • k8s-merge-robot's avatar
      Merge pull request #28489 from liyimeng/patch-1 · d90e3761
      k8s-merge-robot authored
      Automatic merge from submit-queue
      
      hyperkube: fix build for 3rd party registry (again)
      
      
      Fixes issue #28487 
      
      This is a minor fix for the issue reported in #28487
      d90e3761
  2. 18 Jul, 2016 35 commits