Browse Source

Merge "Add /etc/environment to flannel/etcd/kubelet"

changes/78/514078/1
Zuul 4 years ago
committed by Gerrit Code Review
parent
commit
9c1dbe2c22
5 changed files with 17 additions and 0 deletions
  1. +1
    -0
      magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml
  2. +1
    -0
      magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml
  3. +1
    -0
      magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml
  4. +7
    -0
      magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service-client.yaml
  5. +7
    -0
      magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service.yaml

+ 1
- 0
magnum/drivers/k8s_coreos_v1/templates/fragments/configure-etcd.yaml View File

@ -34,6 +34,7 @@ write_files:
fi
cat > $DROP_IN_FILE <<EOF
[Service]
EnvironmentFile=/etc/environment
Environment=ETCD_NAME=$KUBE_NODE_IP
Environment=ETCD_DATA_DIR=/var/lib/etcd/default.etcd
Environment=ETCD_LISTEN_CLIENT_URLS=$protocol://$KUBE_NODE_IP:2379,http://127.0.0.1:2379


+ 1
- 0
magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-master.yaml View File

@ -37,6 +37,7 @@ write_files:
CONF_FILE=/etc/systemd/system/kubelet.service
cat > $CONF_FILE <<EOF
[Service]
EnvironmentFile=/etc/environment
Environment=KUBELET_IMAGE_TAG=${KUBE_VERSION}
Environment=KUBELET_IMAGE_REPO=${HYPERKUBE_IMAGE_REPO}
Environment="RKT_RUN_ARGS=--uuid-file-save=${uuid_file} \


+ 1
- 0
magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml View File

@ -49,6 +49,7 @@ write_files:
CONF_FILE=/etc/systemd/system/kubelet.service
cat > $CONF_FILE <<EOF
[Service]
EnvironmentFile=/etc/environment
Environment=KUBELET_VERSION=${KUBE_VERSION}
Environment=KUBELET_ACI=${HYPERKUBE_IMAGE_REPO}
Environment="RKT_OPTS=--uuid-file-save=${uuid_file} \


+ 7
- 0
magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service-client.yaml View File

@ -60,6 +60,13 @@ write_files:
ExecStartPre=/usr/bin/ln -sf /etc/flannel/options.env /run/flannel/options.env
EOF
DROP_IN_FILE=/etc/systemd/system/flanneld.service.d/50-Environment.conf
mkdir -p $(dirname $DROP_IN_FILE)
cat > $DROP_IN_FILE <<EOF
[Service]
EnvironmentFile=/etc/environment
EOF
DOCKER_FLANNEL_CONF=/etc/systemd/system/docker.service.d/40-flannel.conf
mkdir -p $(dirname $DOCKER_FLANNEL_CONF)
cat > $DOCKER_FLANNEL_CONF <<EOF


+ 7
- 0
magnum/drivers/k8s_coreos_v1/templates/fragments/enable-network-service.yaml View File

@ -44,6 +44,13 @@ write_files:
ExecStartPre=/usr/bin/ln -sf /etc/flannel/options.env /run/flannel/options.env
EOF
DROP_IN_FILE=/etc/systemd/system/flanneld.service.d/50-Environment.conf
mkdir -p $(dirname $DROP_IN_FILE)
cat > $DROP_IN_FILE <<EOF
[Service]
EnvironmentFile=/etc/environment
EOF
DOCKER_FLANNEL_CONF=/etc/systemd/system/docker.service.d/40-flannel.conf
mkdir -p $(dirname $DOCKER_FLANNEL_CONF)
cat > $DOCKER_FLANNEL_CONF <<EOF


Loading…
Cancel
Save