Merge pull request #760 from dghubble/remove-self-hosted-kubelet

Remove --deprecated-self-hosted-kubelet option

Author: dghubble

cmd/bootkube/render.go

@@ -48,7 +48,6 @@ var (
 		altNames            string
 		podCIDR             string
 		serviceCIDR         string
-		selfHostKubelet     bool
 		cloudProvider       string
 		networkProvider     string
 		selfHostedEtcd      bool
@@ -70,7 +69,6 @@ func init() {
 	cmdRender.Flags().StringVar(&renderOpts.altNames, "api-server-alt-names", "", "List of SANs to use in api-server certificate. Example: 'IP=127.0.0.1,IP=127.0.0.2,DNS=localhost'. If empty, SANs will be extracted from the --api-servers flag.")
 	cmdRender.Flags().StringVar(&renderOpts.podCIDR, "pod-cidr", "10.2.0.0/16", "The CIDR range of cluster pods.")
 	cmdRender.Flags().StringVar(&renderOpts.serviceCIDR, "service-cidr", "10.3.0.0/24", "The CIDR range of cluster services.")
-	cmdRender.Flags().BoolVar(&renderOpts.selfHostKubelet, "deprecated-self-hosted-kubelet", false, "(DEPRECATED) Create a self-hosted kubelet daemonset.")
 	cmdRender.Flags().StringVar(&renderOpts.cloudProvider, "cloud-provider", "", "The provider for cloud services.  Empty string for no provider")
 	cmdRender.Flags().StringVar(&renderOpts.networkProvider, "network-provider", "flannel", "CNI network provider (flannel or experimental-canal).")
 	cmdRender.Flags().BoolVar(&renderOpts.selfHostedEtcd, "experimental-self-hosted-etcd", false, "(Experimental) Create self-hosted etcd assets.")
@@ -241,7 +239,6 @@ func flagsToAssetConfig() (c *asset.Config, err error) {
 		BootEtcdServiceIP: bootEtcdServiceIP,
 		DNSServiceIP:      dnsServiceIP,
 		EtcdServiceIP:     etcdServiceIP,
-		SelfHostKubelet:   renderOpts.selfHostKubelet,
 		CloudProvider:     renderOpts.cloudProvider,
 		NetworkProvider:   renderOpts.networkProvider,
 		SelfHostedEtcd:    renderOpts.selfHostedEtcd,

pkg/asset/asset.go

@@ -35,7 +35,6 @@ const (
 	AssetPathKubeletCert                 = "tls/kubelet.crt"
 	AssetPathKubeConfig                  = "auth/kubeconfig"
 	AssetPathManifests                   = "manifests"
-	AssetPathKubelet                     = "manifests/kubelet.yaml"
 	AssetPathKubeConfigInCluster         = "manifests/kubeconfig-in-cluster.yaml"
 	AssetPathProxy                       = "manifests/kube-proxy.yaml"
 	AssetPathProxySA                     = "manifests/kube-proxy-sa.yaml"
@@ -105,7 +104,6 @@ type Config struct {
 	DNSServiceIP           net.IP
 	EtcdServiceIP          net.IP
 	EtcdServiceName        string
-	SelfHostKubelet        bool
 	SelfHostedEtcd         bool
 	CloudProvider          string
 	NetworkProvider        string

pkg/asset/internal/templates.go

@@ -33,111 +33,6 @@ roleRef:
   apiGroup: rbac.authorization.k8s.io
 `)
 
-var KubeletTemplate = []byte(`apiVersion: apps/v1beta2
-kind: DaemonSet
-metadata:
-  name: kubelet
-  namespace: kube-system
-  labels:
-    tier: node
-    k8s-app: kubelet
-spec:
-  selector:
-    matchLabels:
-      tier: node
-      k8s-app: kubelet
-  template:
-    metadata:
-      labels:
-        tier: node
-        k8s-app: kubelet
-    spec:
-      containers:
-      - name: kubelet
-        image: {{ .Images.Hyperkube }}
-        command:
-        - ./hyperkube
-        - kubelet
-        - --allow-privileged
-        - --cluster-dns={{ .DNSServiceIP }}
-        - --cluster-domain=cluster.local
-        - --cni-conf-dir=/etc/kubernetes/cni/net.d
-        - --cni-bin-dir=/opt/cni/bin
-        - --containerized
-        - --hostname-override=$(NODE_NAME)
-        - --kubeconfig=/etc/kubernetes/kubeconfig
-        - --lock-file=/var/run/lock/kubelet.lock
-        - --network-plugin=cni
-        - --pod-manifest-path=/etc/kubernetes/manifests
-        env:
-          - name: NODE_NAME
-            valueFrom:
-              fieldRef:
-                fieldPath: spec.nodeName
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - name: dev
-          mountPath: /dev
-        - name: run
-          mountPath: /run
-        - name: sys
-          mountPath: /sys
-          readOnly: true
-        - name: etc-kubernetes
-          mountPath: /etc/kubernetes
-          readOnly: true
-        - name: etc-ssl-certs
-          mountPath: /etc/ssl/certs
-          readOnly: true
-        - name: var-lib-docker
-          mountPath: /var/lib/docker
-        - name: var-lib-kubelet
-          mountPath: /var/lib/kubelet
-        - name: var-lib-rkt
-          mountPath: /var/lib/rkt
-        - name: rootfs
-          mountPath: /rootfs
-      hostNetwork: true
-      hostPID: true
-      tolerations:
-      - key: node-role.kubernetes.io/master
-        operator: Exists
-        effect: NoSchedule
-      volumes:
-      - name: dev
-        hostPath:
-          path: /dev
-      - name: run
-        hostPath:
-          path: /run
-      - name: sys
-        hostPath:
-          path: /sys
-      - name: etc-kubernetes
-        hostPath:
-          path: /etc/kubernetes
-      - name: etc-ssl-certs
-        hostPath:
-          path: /usr/share/ca-certificates
-      - name: var-lib-docker
-        hostPath:
-          path: /var/lib/docker
-      - name: var-lib-kubelet
-        hostPath:
-          path: /var/lib/kubelet
-      - name: var-lib-rkt
-        hostPath:
-          path: /var/lib/rkt
-      - name: rootfs
-        hostPath:
-          path: /
-  updateStrategy:
-    rollingUpdate:
-      maxUnavailable: 1
-    type: RollingUpdate
-`)
-
 var APIServerTemplate = []byte(`apiVersion: apps/v1beta2
 kind: DaemonSet
 metadata:

pkg/asset/k8s.go

@@ -61,9 +61,6 @@ func newDynamicAssets(conf Config) Assets {
 		MustCreateAssetFromTemplate(AssetPathBootstrapControllerManager, internal.BootstrapControllerManagerTemplate, conf),
 		MustCreateAssetFromTemplate(AssetPathBootstrapScheduler, internal.BootstrapSchedulerTemplate, conf),
 	}
-	if conf.SelfHostKubelet {
-		assets = append(assets, MustCreateAssetFromTemplate(AssetPathKubelet, internal.KubeletTemplate, conf))
-	}
 	if conf.SelfHostedEtcd {
 		conf.EtcdServiceName = EtcdServiceName
 		assets = append(assets,