github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Taufen
2017-01-18 20:13:22 -08:00
parent bec6635ccc
commit 982df56c52
10 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/container-linux/configure-helper.sh
View File

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

4
cluster/gce/gci/configure-helper.sh
View File

@@ -388,7 +388,7 @@ function create-master-kubelet-auth {
REGISTER_MASTER_KUBELET="true" REGISTER_MASTER_KUBELET="true"
create-kubelet-kubeconfig create-kubelet-kubeconfig
fi fi
} }
function create-kubeproxy-kubeconfig { function create-kubeproxy-kubeconfig {
@@ -556,7 +556,7 @@ function start-kubelet {
flags+=" --cloud-provider=gce" flags+=" --cloud-provider=gce"
flags+=" --cluster-dns=${DNS_SERVER_IP}" flags+=" --cluster-dns=${DNS_SERVER_IP}"
flags+=" --cluster-domain=${DNS_DOMAIN}" 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-mounter-path=${KUBE_HOME}/bin/mounter"
flags+=" --experimental-check-node-capabilities-before-mount=true" flags+=" --experimental-check-node-capabilities-before-mount=true"

4
cluster/gce/trusty/configure-helper.sh
View File

@@ -175,7 +175,7 @@ assemble_kubelet_flags() {
KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --node-labels=${NODE_LABELS}" KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --node-labels=${NODE_LABELS}"
fi fi
# Add the unconditional flags # 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 echo "KUBELET_OPTS=\"${KUBELET_CMD_FLAGS}\"" > /etc/default/kubelet
} }
@@ -765,7 +765,7 @@ start_kube_scheduler() {
if [ -n "${SCHEDULING_ALGORITHM_PROVIDER:-}" ]; then if [ -n "${SCHEDULING_ALGORITHM_PROVIDER:-}" ]; then
params="${params} --algorithm-provider=${SCHEDULING_ALGORITHM_PROVIDER}" params="${params} --algorithm-provider=${SCHEDULING_ALGORITHM_PROVIDER}"
fi fi
readonly kube_scheduler_docker_tag=$(cat "${kube_home}/kube-docker-files/kube-scheduler.docker_tag") readonly kube_scheduler_docker_tag=$(cat "${kube_home}/kube-docker-files/kube-scheduler.docker_tag")
# Remove salt comments and replace variables with values # Remove salt comments and replace variables with values

2
cluster/get-kube-local.sh
View File

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

2
cluster/libvirt-coreos/user_data_minion.yml
View File

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

2
cluster/saltbase/salt/kubelet/default
View File

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

24
examples/openshift-origin/openshift-controller.yaml
View File

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

2
test/e2e_node/conformance/run_test.sh
View File

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

2
test/e2e_node/services/kubelet.go
View File

@@ -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 "--volume-stats-agg-period", "10s", // Aggregate volumes frequently so tests don't need to wait as long
"--allow-privileged", "true", "--allow-privileged", "true",
"--serialize-image-pulls", "false", "--serialize-image-pulls", "false",
"--config", manifestPath, "--pod-manifest-path", manifestPath,
"--file-check-frequency", "10s", // Check file frequently so tests won't wait too long "--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. "--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", "--eviction-pressure-transition-period", "30s",

2
test/kubemark/resources/start-kubemark-master.sh
View File

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