1. 26 Jun, 2016 4 commits
    • k8s-merge-robot's avatar
      Merge pull request #27250 from xiangpengzhao/fix_docproxy · 847ef725
      k8s-merge-robot authored
      Automatic merge from submit-queue
      
      Set network related flags for container gen-swagger-docs
      
      When running `hack/update-api-reference-docs.sh`, I get failure messages as below. This is because:
      
      My env is behind a proxy, I have to input username/password in a page first for authentication before visiting internet. But I have no any way to visit that page in GUI mode in the container gen-swagger-docs. Can we run the container gen-swagger-docs using host network and passing an env variable `https_proxy` to it? I try this way and it works well. This would be helpful for me and other developers who may have this issue.
      
      cc @caesarxuchao Thanks!
      
      ```
      root@vm:/home/paas/zxp/code/k8s/fork/kubernetes# hack/update-api-reference-docs.sh
      Note: This assumes that swagger spec has been updated. Please run hack/update-swagger-spec.sh to ensure that.
      Generating api reference docs at /home/paas/zxp/code/k8s/fork/kubernetes/_output/generated_html
      Reading swagger spec from: /home/paas/zxp/code/k8s/fork/kubernetes/api/swagger-spec/
      --2016-06-09 16:35:26--  https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/api/v1/register.go
      Resolving raw.githubusercontent.com (raw.githubusercontent.com)... failed: Name or service not known.
      wget: unable to resolve host address ‘raw.githubusercontent.com’
      --2016-06-09 16:36:06--  https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/api/v1/register.go
      Resolving raw.githubusercontent.com (raw.githubusercontent.com)... failed: Name or service not known.
      wget: unable to resolve host address ‘raw.githubusercontent.com’
      --2016-06-09 16:36:46--  https://raw.githubusercontent.com/kubernetes/kubernetes/master/pkg/api/v1/register.go
      Resolving raw.githubusercontent.com (raw.githubusercontent.com)... failed: Name or service not known.
      wget: unable to resolve host address ‘raw.githubusercontent.com’
      !!! Error in hack/update-api-reference-docs.sh:71
        'docker run ${user_flags} --rm -v "${TMP_IN_HOST}":/output:z -v "${SWAGGER_PATH}":/swagger-source:z gcr.io/google_containers/gen-swagger-docs:v5 "${SWAGGER_JSON_NAME}" "${REGISTER_FILE_URL}"' exited with status 1
      Call stack:
        1: hack/update-api-reference-docs.sh:71 main(...)
      Exiting with status 1
      ```
      847ef725
    • k8s-merge-robot's avatar
      Merge pull request #27293 from caesarxuchao/add-patch-to-clientset · 93037844
      k8s-merge-robot authored
      Automatic merge from submit-queue
      
      [client-gen]Add Patch to clientset
      
      * add the Patch() method to the clientset. 
      * I have to rename the existing Patch() method of `Event` to PatchWithEventNamespace() to avoid overriding.
      * some minor changes to the fake Patch action.
      
      cc @Random-Liu since he asked for the method
      @kubernetes/sig-api-machinery 
      
      ref #26580 
      
      ```release-note
      Add the Patch method to the generated clientset.
      ```
      93037844
    • k8s-merge-robot's avatar
      Merge pull request #27263 from sttts/sttts-kubectl-attach-cmdName · 84c8158b
      k8s-merge-robot authored
      Automatic merge from submit-queue
      
      Dynamically derive AttachOptions.CommandName
      
      This PR sets AttachOptions.CommandName dynamically depending on the corba Command
      hierarchy. If the root command is named e.g. "oc" (for the OpenShift cli) this
      will result in "oc attach" instead of the static "kubectl attach" before this
      patch.
      
      Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1341450
      84c8158b
    • k8s-merge-robot's avatar
      Merge pull request #27242 from smarterclayton/discovery_prefix · cbab337b
      k8s-merge-robot authored
      Automatic merge from submit-queue
      
      Make discovery client parameterizable to legacy prefix
      cbab337b
  2. 25 Jun, 2016 36 commits