Replace uses of --config with --pod-manifest-path

cluster/gce/container-linux/configure-helper.sh

@@ -477,7 +477,7 @@ function start-kubelet {
   flags+=" --cloud-provider=gce"
   flags+=" --cluster-dns=${DNS_SERVER_IP}"
   flags+=" --cluster-domain=${DNS_DOMAIN}"
-  flags+=" --config=/etc/kubernetes/manifests"
+  flags+=" --pod-manifest-path=/etc/kubernetes/manifests"
   flags+=" --experimental-check-node-capabilities-before-mount=true"
 
   if [[ -n "${KUBELET_PORT:-}" ]]; then
@@ -849,7 +849,7 @@ function start-kube-apiserver {
   fi
   local -r src_dir="${KUBE_HOME}/kube-manifests/kubernetes/gci-trusty"
   params+=" --authorization-mode=${authorization_mode}"
-  
+
   src_file="${src_dir}/kube-apiserver.manifest"
   remove-salt-config-comments "${src_file}"
   # Evaluate variables.

cluster/gce/gci/configure-helper.sh

@@ -388,7 +388,7 @@ function create-master-kubelet-auth {
     REGISTER_MASTER_KUBELET="true"
     create-kubelet-kubeconfig
   fi
-  
+
 }
 
 function create-kubeproxy-kubeconfig {
@@ -556,7 +556,7 @@ function start-kubelet {
   flags+=" --cloud-provider=gce"
   flags+=" --cluster-dns=${DNS_SERVER_IP}"
   flags+=" --cluster-domain=${DNS_DOMAIN}"
-  flags+=" --config=/etc/kubernetes/manifests"
+  flags+=" --pod-manifest-path=/etc/kubernetes/manifests"
   flags+=" --experimental-mounter-path=${KUBE_HOME}/bin/mounter"
   flags+=" --experimental-check-node-capabilities-before-mount=true"
 

cluster/gce/trusty/configure-helper.sh

@@ -175,7 +175,7 @@ assemble_kubelet_flags() {
     KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --node-labels=${NODE_LABELS}"
   fi
   # Add the unconditional flags
-  KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --cloud-provider=gce --allow-privileged=true --cgroup-root=/ --system-cgroups=/system --kubelet-cgroups=/kubelet --babysit-daemons=true --config=/etc/kubernetes/manifests --cluster-dns=${DNS_SERVER_IP} --cluster-domain=${DNS_DOMAIN}"
+  KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --cloud-provider=gce --allow-privileged=true --cgroup-root=/ --system-cgroups=/system --kubelet-cgroups=/kubelet --babysit-daemons=true --pod-manifest-path=/etc/kubernetes/manifests --cluster-dns=${DNS_SERVER_IP} --cluster-domain=${DNS_DOMAIN}"
   echo "KUBELET_OPTS=\"${KUBELET_CMD_FLAGS}\"" > /etc/default/kubelet
 }
 
@@ -765,7 +765,7 @@ start_kube_scheduler() {
   if [ -n "${SCHEDULING_ALGORITHM_PROVIDER:-}" ]; then
     params="${params} --algorithm-provider=${SCHEDULING_ALGORITHM_PROVIDER}"
   fi
-  
+
   readonly kube_scheduler_docker_tag=$(cat "${kube_home}/kube-docker-files/kube-scheduler.docker_tag")
 
   # Remove salt comments and replace variables with values

cluster/get-kube-local.sh

@@ -72,7 +72,7 @@ function create_cluster {
       --hostname-override="127.0.0.1" \
       --address="0.0.0.0" \
       --api-servers=http://localhost:8080 \
-      --config=/etc/kubernetes/manifests \
+      --pod-manifest-path=/etc/kubernetes/manifests \
       --allow-privileged=true \
       --cluster-dns=10.0.0.10 \
       --cluster-domain=cluster.local \

cluster/libvirt-coreos/user_data_minion.yml

@@ -22,7 +22,7 @@ coreos:
         --tls-private-key-file=/opt/kubernetes/certs/${NODE_NAMES[$i]}-node-key.pem \
         $( [[ "$ENABLE_CLUSTER_DNS" == "true" ]] && echo "--cluster-dns=${DNS_SERVER_IP}" ) \
         $( [[ "$ENABLE_CLUSTER_DNS" == "true" ]] && echo "--cluster-domain=${DNS_DOMAIN}" ) \
-        --config=/opt/kubernetes/manifests
+        --pod-manifest-path=/opt/kubernetes/manifests
         Restart=always
         RestartSec=2
 

cluster/saltbase/salt/kubelet/default

@@ -55,7 +55,7 @@
   {% set cloud_config = "--cloud-config=" + grains.cloud_config -%}
 {% endif -%}
 
-{% set config = "--config=/etc/kubernetes/manifests" -%}
+{% set config = "--pod-manifest-path=/etc/kubernetes/manifests" -%}
 
 {% set manifest_url = "" -%}
 {% set manifest_url_header = "" -%}

examples/openshift-origin/openshift-controller.yaml

@@ -1,34 +1,34 @@
 apiVersion: extensions/v1beta1
 kind: Deployment
-metadata: 
-  labels: 
+metadata:
+  labels:
     name: openshift
   name: openshift
-spec: 
+spec:
   replicas: 1
   selector:
     matchLabels:
       name: openshift
-  template: 
-    metadata: 
-      labels: 
+  template:
+    metadata:
+      labels:
         name: openshift
-    spec: 
-      containers: 
-        - args: 
+    spec:
+      containers:
+        - args:
             - start
             - master
             - --config=/config/master-config.yaml
           image: "openshift/origin"
           name: origin
-          ports: 
+          ports:
             - containerPort: 8443
               name: openshift
-          volumeMounts: 
+          volumeMounts:
             - mountPath: /config
               name: config
               readOnly: true
-      volumes: 
+      volumes:
         - name: config
           secret:
             secretName: openshift-config

test/e2e_node/conformance/run_test.sh

@@ -156,7 +156,7 @@ start_kubelet --api-servers $apiserver \
   --volume-stats-agg-period $volume_stats_agg_period \
   --allow-privileged=$allow_privileged \
   --serialize-image-pulls=$serialize_image_pulls \
-  --config $config_dir \
+  --pod-manifest-path $config_dir \
   --file-check-frequency $file_check_frequency \
   --pod-cidr=$pod_cidr \
   --runtime-cgroups=/docker-daemon \

test/e2e_node/services/kubelet.go

@@ -131,7 +131,7 @@ func (e *E2EServices) startKubelet() (*server, error) {
 		"--volume-stats-agg-period", "10s", // Aggregate volumes frequently so tests don't need to wait as long
 		"--allow-privileged", "true",
 		"--serialize-image-pulls", "false",
-		"--config", manifestPath,
+		"--pod-manifest-path", manifestPath,
 		"--file-check-frequency", "10s", // Check file frequently so tests won't wait too long
 		"--pod-cidr", "10.180.0.0/24", // Assign a fixed CIDR to the node because there is no node controller.
 		"--eviction-pressure-transition-period", "30s",

test/kubemark/resources/start-kubemark-master.sh

@@ -210,7 +210,7 @@ function compute-kubelet-params {
 	params+=" --babysit-daemons=true"
 	params+=" --cgroup-root=/"
 	params+=" --cloud-provider=gce"
-	params+=" --config=/etc/kubernetes/manifests"
+	params+=" --pod-manifest-path=/etc/kubernetes/manifests"
 	if [[ -n "${KUBELET_PORT:-}" ]]; then
 		params+=" --port=${KUBELET_PORT}"
 	fi