1. 04 Jan, 2017 7 commits
    • Kubernetes Submit Queue's avatar
      Merge pull request #37350 from chentao1596/delete-meaningless-judgments · fe391d7b
      Kubernetes Submit Queue authored
      Automatic merge from submit-queue (batch tested with PRs 39280, 37350, 39389, 39390, 39313)
      
      delete meaningless judgments
      
      What this PR does / why we need it:
            Whether "err" is nil or not, "err" can be return, so the judgment "err !=nil " is unnecessary
      fe391d7b
    • Kubernetes Submit Queue's avatar
      Merge pull request #39280 from luxas/kubeadm_api_proto · 27850a79
      Kubernetes Submit Queue authored
      Automatic merge from submit-queue (batch tested with PRs 39280, 37350, 39389, 39390, 39313)
      
      Refactor the certificate and kubeconfig code in the kubeadm binary into two phases
      
      **What this PR does / why we need it**:
      
      First stab at refactoring kubeadm code into logically independent phases.
      This defines two phases in the kubeadm init process:
       - certs: Takes some API values as input (the API will be refactored in a later PR), and generates certificates in the pki directory
       - kubeconfig: Takes the pki directory and the endpoint where the master is located and produces two kubeconfig files: admin.conf and kubelet.conf
      
      **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*:
      Required long-term for graduating our API
      
      **Special notes for your reviewer**:
      
      ### Old sample output
      The earlier kubeconfig code had a bug in it; see this example:
      _admin.conf:_
      ```yaml
      apiVersion: v1
      clusters:
      - cluster:
          certificate-authority-data: <data>
          server: https://192.168.200.x:6443
        name: kubernetes
      contexts:
      - context:
          cluster: kubernetes
          user: admin
        name: admin@kubernetes
      - context:
          cluster: kubernetes
          user: kubelet
        name: kubelet@kubernetes
      current-context: admin@kubernetes
      kind: Config
      preferences: {}
      users:
      - name: admin
        user:
          client-certificate-data: <data>
          client-key-data: <data>
      - name: kubelet
        user:
          client-certificate-data: <data>
          client-key-data: <data>
      ```
      kubelet.conf:
      ```yaml
      apiVersion: v1
      clusters:
      - cluster:
          certificate-authority-data: <data>
          server: https://192.168.200.x:6443
        name: kubernetes
      contexts:
      - context:
          cluster: kubernetes
          user: admin
        name: admin@kubernetes
      - context:
          cluster: kubernetes
          user: kubelet
        name: kubelet@kubernetes
      current-context: admin@kubernetes
      kind: Config
      preferences: {}
      users:
      - name: admin
        user:
          client-certificate-data: <data>
          client-key-data: <data>
      - name: kubelet
        user:
          client-certificate-data: <data>
          client-key-data: <data>
      ```
      ```console
      $ shasum /etc/kubernetes/*.conf
      2b22b25cc4c97e5619ece6c43badf42b87c4970a  /etc/kubernetes/admin.conf
      2b22b25cc4c97e5619ece6c43badf42b87c4970a  /etc/kubernetes/kubelet.conf
      ```
      
      #### New output
      admin.conf
      ```yaml
      apiVersion: v1
      clusters:
      - cluster:
          certificate-authority-data: <data>
          server: https://192.168.200.x:6443
        name: kubernetes
      contexts:
      - context:
          cluster: kubernetes
          user: admin
        name: admin@kubernetes
      current-context: admin@kubernetes
      kind: Config
      preferences: {}
      users:
      - name: admin
        user:
          client-certificate-data: <data>
          client-key-data: <data>
      ```
      kubelet.conf
      ```yaml
      apiVersion: v1
      clusters:
      - cluster:
          certificate-authority-data: <data>
          server: https://192.168.200.x:6443
        name: kubernetes
      contexts:
      - context:
          cluster: kubernetes
          user: kubelet
        name: kubelet@kubernetes
      current-context: kubelet@kubernetes
      kind: Config
      preferences: {}
      users:
      - name: kubelet
        user:
          client-certificate-data: <data>
          client-key-data: <data>
      ```
      
      **Release note**:
      
      ```release-note
      Refactor the certificate and kubeconfig code in the kubeadm binary into two phases
      ```
      
      PTAL @dgoodwin @jbeda @mikedanese @errordeveloper @pipejakob @lukemarsden
      27850a79
    • Kubernetes Submit Queue's avatar
      Merge pull request #39273 from NickrenREN/kubelet-node-status · 9eaf1aa3
      Kubernetes Submit Queue authored
      Automatic merge from submit-queue (batch tested with PRs 39001, 39104, 35978, 39361, 39273)
      
      delete SetNodeStatus() function and fix some function notes words
      9eaf1aa3
    • Kubernetes Submit Queue's avatar
      Merge pull request #39361 from zdj6373/util-log · 85545992
      Kubernetes Submit Queue authored
      Automatic merge from submit-queue (batch tested with PRs 39001, 39104, 35978, 39361, 39273)
      
      Log error modification
      
      controller_utils.go:  Log content is wrong, modify
      85545992
    • Kubernetes Submit Queue's avatar
      Merge pull request #35978 from fabianofranz/cors_with_patch_method · a70ad9f4
      Kubernetes Submit Queue authored
      Automatic merge from submit-queue (batch tested with PRs 39001, 39104, 35978, 39361, 39273)
      
      Allow PATCH in an API CORS setup
      
      Allows the PATCH method to be used in a REST API CORS setup.
      
      **Release note**:
      
      ```release-note
      NONE
      ```
      a70ad9f4
    • Kubernetes Submit Queue's avatar
      Merge pull request #39104 from deads2k/api-57-admission-all-initializers · 94d4ba7c
      Kubernetes Submit Queue authored
      Automatic merge from submit-queue (batch tested with PRs 39001, 39104, 35978, 39361, 39273)
      
      refactored admission to avoid internal client references
      
      Refactored admission to avoid internal client references.  This required switching to plugin initializers for them.  And that required some rewiring of the plugin initializers. 
      
      Technically I can decouple from the other two commits, but I'm optimistic that those will go through easy. This is slightly move invasive, but I'd like to shoot for pre-christmas to avoid new admission plugins coming through and breaking bits.
      
      @sttts @derekwaynecarr
      94d4ba7c
    • Kubernetes Submit Queue's avatar
      Merge pull request #39001 from xilabao/fix-group-in-create-clusterrolebinding · 34ea3a17
      Kubernetes Submit Queue authored
      Automatic merge from submit-queue
      
      fix group in create clusterrolebinding
      
      group lost.
      
      ```
      #kubectl create clusterrolebinding test --clusterrole=a --group=b
      clusterrolebinding "test" created
      
      #kubectl get clusterrolebinding test -o yaml
      apiVersion: rbac.authorization.k8s.io/v1alpha1
      kind: ClusterRoleBinding
      metadata:
        creationTimestamp: 2016-12-20T03:13:24Z
        name: test
        resourceVersion: "284"
        selfLink: /apis/rbac.authorization.k8s.io/v1alpha1/clusterrolebindingstest
        uid: 44d3476d-c662-11e6-a439-7427ea6f0fe3
      roleRef:
        apiGroup: rbac.authorization.k8s.io
        kind: ClusterRole
        name: a
      subjects: null
      ```
      34ea3a17
  2. 03 Jan, 2017 33 commits