"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "magnum/drivers/k8s_coreos_v1/templates/fragments/enable-kubelet-minion.yaml" between
magnum-8.1.0.tar.gz and magnum-8.2.0.tar.gz

About: OpenStack Magnum makes container orchestration engines such as Docker and Kubernetes available as first class resources in OpenStack.
The "Stein" series (maintained release).

enable-kubelet-minion.yaml  (magnum-8.1.0):enable-kubelet-minion.yaml  (magnum-8.2.0)
skipping to change at line 46 skipping to change at line 46
KUBE_PROTOCOL="https" KUBE_PROTOCOL="https"
KUBE_CONFIG="/etc/kubernetes/config/worker-kubeconfig.yaml" KUBE_CONFIG="/etc/kubernetes/config/worker-kubeconfig.yaml"
if [ "$TLS_DISABLED" == "True" ]; then if [ "$TLS_DISABLED" == "True" ]; then
TLS_CERT_FILE= TLS_CERT_FILE=
TLS_PRIVATE_KEY_FILE= TLS_PRIVATE_KEY_FILE=
KUBE_PROTOCOL="http" KUBE_PROTOCOL="http"
KUBE_CONFIG= KUBE_CONFIG=
fi fi
KUBE_MASTER_URI="$KUBE_PROTOCOL://$KUBE_MASTER_IP:$KUBE_API_PORT" KUBE_MASTER_URI="$KUBE_PROTOCOL://$KUBE_MASTER_IP:$KUBE_API_PORT"
HOSTNAME_OVERRIDE=$(hostname --short | sed 's/\.novalocal//')
uuid_file="/var/run/kubelet-pod.uuid" uuid_file="/var/run/kubelet-pod.uuid"
CONF_FILE=/etc/systemd/system/kubelet.service CONF_FILE=/etc/systemd/system/kubelet.service
cat > $CONF_FILE <<EOF cat > $CONF_FILE <<EOF
[Service] [Service]
EnvironmentFile=/etc/environment EnvironmentFile=/etc/environment
Environment=KUBELET_VERSION=${KUBE_VERSION} Environment=KUBELET_VERSION=${KUBE_VERSION}
Environment=KUBELET_ACI=${HYPERKUBE_IMAGE_REPO} Environment=KUBELET_ACI=${HYPERKUBE_IMAGE_REPO}
Environment="RKT_OPTS=--uuid-file-save=${uuid_file} \ Environment="RKT_OPTS=--uuid-file-save=${uuid_file} \
--volume dns,kind=host,source=/etc/resolv.conf \ --volume dns,kind=host,source=/etc/resolv.conf \
--mount volume=dns,target=/etc/resolv.conf \ --mount volume=dns,target=/etc/resolv.conf \
skipping to change at line 73 skipping to change at line 71
--mount volume=stage,target=/tmp \ --mount volume=stage,target=/tmp \
--volume var-log,kind=host,source=/var/log \ --volume var-log,kind=host,source=/var/log \
--mount volume=var-log,target=/var/log" --mount volume=var-log,target=/var/log"
ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests ExecStartPre=/usr/bin/mkdir -p /etc/kubernetes/manifests
ExecStartPre=/usr/bin/mkdir -p /opt/cni/bin ExecStartPre=/usr/bin/mkdir -p /opt/cni/bin
ExecStartPre=/usr/bin/mkdir -p /var/log/containers ExecStartPre=/usr/bin/mkdir -p /var/log/containers
ExecStartPre=-/usr/bin/rkt rm --uuid-file=${uuid_file} ExecStartPre=-/usr/bin/rkt rm --uuid-file=${uuid_file}
ExecStart=/usr/lib/coreos/kubelet-wrapper \ ExecStart=/usr/lib/coreos/kubelet-wrapper \
--cni-conf-dir=/etc/kubernetes/cni/net.d \ --cni-conf-dir=/etc/kubernetes/cni/net.d \
--network-plugin=cni \ --network-plugin=cni \
--hostname-override=${HOSTNAME_OVERRIDE} \ --hostname-override=${INSTANCE_NAME} \
--container-runtime=${CONTAINER_RUNTIME} \ --container-runtime=${CONTAINER_RUNTIME} \
--allow-privileged=true \ --allow-privileged=true \
--pod-manifest-path=/etc/kubernetes/manifests \ --pod-manifest-path=/etc/kubernetes/manifests \
--logtostderr=true \ --logtostderr=true \
--v=0 \ --v=0 \
--cadvisor-port=4194 \ --cadvisor-port=4194 \
--kubeconfig=${KUBE_CONFIG} \ --kubeconfig=${KUBE_CONFIG} \
--tls-cert-file=${TLS_CERT_FILE} \ --tls-cert-file=${TLS_CERT_FILE} \
--tls-private-key-file=${TLS_PRIVATE_KEY_FILE} \ --tls-private-key-file=${TLS_PRIVATE_KEY_FILE} \
--cluster_dns=${DNS_SERVICE_IP} \ --cluster_dns=${DNS_SERVICE_IP} \
 End of changes. 2 change blocks. 
3 lines changed or deleted 1 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)