mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-26 05:03:09 +00:00
Merge pull request #21917 from yifan-gu/gce_coreos_cloud_config
Auto commit by PR queue bot
This commit is contained in:
commit
fb1ee74e78
@ -28,13 +28,16 @@ coreos:
|
|||||||
Documentation=http://github.com/coreos/rkt
|
Documentation=http://github.com/coreos/rkt
|
||||||
Requires=network-online.target
|
Requires=network-online.target
|
||||||
After=network-online.target
|
After=network-online.target
|
||||||
|
Requires=kube-env.service
|
||||||
|
After=kube-env.service
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
RemainAfterExit=yes
|
RemainAfterExit=yes
|
||||||
EnvironmentFile=/etc/kube-env
|
EnvironmentFile=/etc/kube-env
|
||||||
ExecStartPre=/usr/bin/mkdir -p /etc/rkt
|
ExecStartPre=/usr/bin/mkdir -p /etc/rkt
|
||||||
ExecStartPre=/usr/bin/mkdir -p /opt/downloads
|
ExecStartPre=/usr/bin/mkdir -p /opt/downloads
|
||||||
ExecStartPre=/usr/bin/curl --location --create-dirs --output /opt/downloads/rkt.tar.gz https://github.com/coreos/rkt/releases/download/v${RKT_VERSION}/rkt-v${RKT_VERSION}.tar.gz
|
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output \
|
||||||
|
/opt/downloads/rkt.tar.gz https://github.com/coreos/rkt/releases/download/v${RKT_VERSION}/rkt-v${RKT_VERSION}.tar.gz
|
||||||
ExecStart=/usr/bin/tar xf /opt/downloads/rkt.tar.gz -C /opt --overwrite
|
ExecStart=/usr/bin/tar xf /opt/downloads/rkt.tar.gz -C /opt --overwrite
|
||||||
|
|
||||||
- name: kubernetes-download-salt.service
|
- name: kubernetes-download-salt.service
|
||||||
@ -51,7 +54,8 @@ coreos:
|
|||||||
RemainAfterExit=yes
|
RemainAfterExit=yes
|
||||||
EnvironmentFile=/etc/kube-env
|
EnvironmentFile=/etc/kube-env
|
||||||
ExecStartPre=/usr/bin/mkdir -p /opt/downloads
|
ExecStartPre=/usr/bin/mkdir -p /opt/downloads
|
||||||
ExecStartPre=/usr/bin/curl --location --create-dirs --output /opt/downloads/kubernetes-salt.tar.gz ${SALT_TAR_URL}
|
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output \
|
||||||
|
/opt/downloads/kubernetes-salt.tar.gz ${SALT_TAR_URL}
|
||||||
# TODO(yifan): Check hash.
|
# TODO(yifan): Check hash.
|
||||||
ExecStart=/usr/bin/tar xf /opt/downloads/kubernetes-salt.tar.gz -C /opt --overwrite
|
ExecStart=/usr/bin/tar xf /opt/downloads/kubernetes-salt.tar.gz -C /opt --overwrite
|
||||||
|
|
||||||
@ -69,7 +73,8 @@ coreos:
|
|||||||
RemainAfterExit=yes
|
RemainAfterExit=yes
|
||||||
EnvironmentFile=/etc/kube-env
|
EnvironmentFile=/etc/kube-env
|
||||||
ExecStartPre=/usr/bin/mkdir -p /opt/downloads
|
ExecStartPre=/usr/bin/mkdir -p /opt/downloads
|
||||||
ExecStartPre=/usr/bin/curl --location --create-dirs --output /opt/downloads/kubernetes-manifests.tar.gz ${KUBE_MANIFESTS_TAR_URL}
|
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output \
|
||||||
|
/opt/downloads/kubernetes-manifests.tar.gz ${KUBE_MANIFESTS_TAR_URL}
|
||||||
# TODO(yifan): Check hash.
|
# TODO(yifan): Check hash.
|
||||||
ExecStartPre=/usr/bin/mkdir -p /opt/kube-manifests
|
ExecStartPre=/usr/bin/mkdir -p /opt/kube-manifests
|
||||||
ExecStart=/usr/bin/tar xf /opt/downloads/kubernetes-manifests.tar.gz -C /opt/kube-manifests --overwrite
|
ExecStart=/usr/bin/tar xf /opt/downloads/kubernetes-manifests.tar.gz -C /opt/kube-manifests --overwrite
|
||||||
@ -88,7 +93,8 @@ coreos:
|
|||||||
RemainAfterExit=yes
|
RemainAfterExit=yes
|
||||||
EnvironmentFile=/etc/kube-env
|
EnvironmentFile=/etc/kube-env
|
||||||
ExecStartPre=/usr/bin/mkdir -p /opt/downloads
|
ExecStartPre=/usr/bin/mkdir -p /opt/downloads
|
||||||
ExecStartPre=/usr/bin/curl --location --create-dirs --output /opt/downloads/kubernetes-server-linux-amd64.tar.gz ${SERVER_BINARY_TAR_URL}
|
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output \
|
||||||
|
/opt/downloads/kubernetes-server-linux-amd64.tar.gz ${SERVER_BINARY_TAR_URL}
|
||||||
# TODO(yifan): Check hash.
|
# TODO(yifan): Check hash.
|
||||||
ExecStart=/usr/bin/tar xf /opt/downloads/kubernetes-server-linux-amd64.tar.gz -C /opt --overwrite
|
ExecStart=/usr/bin/tar xf /opt/downloads/kubernetes-server-linux-amd64.tar.gz -C /opt --overwrite
|
||||||
|
|
||||||
@ -131,7 +137,6 @@ coreos:
|
|||||||
RestartSec=10
|
RestartSec=10
|
||||||
|
|
||||||
- name: docker.service
|
- name: docker.service
|
||||||
command: start
|
|
||||||
drop-ins:
|
drop-ins:
|
||||||
- name: 50-docker-opts.conf
|
- name: 50-docker-opts.conf
|
||||||
content: |
|
content: |
|
||||||
|
@ -28,13 +28,16 @@ coreos:
|
|||||||
Documentation=http://github.com/coreos/rkt
|
Documentation=http://github.com/coreos/rkt
|
||||||
Requires=network-online.target
|
Requires=network-online.target
|
||||||
After=network-online.target
|
After=network-online.target
|
||||||
|
Requires=kube-env.service
|
||||||
|
After=kube-env.service
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
RemainAfterExit=yes
|
RemainAfterExit=yes
|
||||||
EnvironmentFile=/etc/kube-env
|
EnvironmentFile=/etc/kube-env
|
||||||
ExecStartPre=/usr/bin/mkdir -p /etc/rkt
|
ExecStartPre=/usr/bin/mkdir -p /etc/rkt
|
||||||
ExecStartPre=/usr/bin/mkdir -p /opt/downloads
|
ExecStartPre=/usr/bin/mkdir -p /opt/downloads
|
||||||
ExecStartPre=/usr/bin/curl --location --create-dirs --output /opt/downloads/rkt.tar.gz https://github.com/coreos/rkt/releases/download/v${RKT_VERSION}/rkt-v${RKT_VERSION}.tar.gz
|
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output \
|
||||||
|
/opt/downloads/rkt.tar.gz https://github.com/coreos/rkt/releases/download/v${RKT_VERSION}/rkt-v${RKT_VERSION}.tar.gz
|
||||||
ExecStart=/usr/bin/tar xf /opt/downloads/rkt.tar.gz -C /opt --overwrite
|
ExecStart=/usr/bin/tar xf /opt/downloads/rkt.tar.gz -C /opt --overwrite
|
||||||
|
|
||||||
- name: kubernetes-download-manifests.service
|
- name: kubernetes-download-manifests.service
|
||||||
@ -51,7 +54,8 @@ coreos:
|
|||||||
RemainAfterExit=yes
|
RemainAfterExit=yes
|
||||||
EnvironmentFile=/etc/kube-env
|
EnvironmentFile=/etc/kube-env
|
||||||
ExecStartPre=/usr/bin/mkdir -p /opt/downloads
|
ExecStartPre=/usr/bin/mkdir -p /opt/downloads
|
||||||
ExecStartPre=/usr/bin/curl --location --create-dirs --output /opt/downloads/kubernetes-manifests.tar.gz ${KUBE_MANIFESTS_TAR_URL}
|
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output \
|
||||||
|
/opt/downloads/kubernetes-manifests.tar.gz ${KUBE_MANIFESTS_TAR_URL}
|
||||||
# TODO(yifan): Check hash.
|
# TODO(yifan): Check hash.
|
||||||
ExecStartPre=/usr/bin/mkdir -p /opt/kube-manifests
|
ExecStartPre=/usr/bin/mkdir -p /opt/kube-manifests
|
||||||
ExecStart=/usr/bin/tar xf /opt/downloads/kubernetes-manifests.tar.gz -C /opt/kube-manifests --overwrite
|
ExecStart=/usr/bin/tar xf /opt/downloads/kubernetes-manifests.tar.gz -C /opt/kube-manifests --overwrite
|
||||||
@ -70,7 +74,8 @@ coreos:
|
|||||||
RemainAfterExit=yes
|
RemainAfterExit=yes
|
||||||
EnvironmentFile=/etc/kube-env
|
EnvironmentFile=/etc/kube-env
|
||||||
ExecStartPre=/usr/bin/mkdir -p /opt/kubernetes/pkg
|
ExecStartPre=/usr/bin/mkdir -p /opt/kubernetes/pkg
|
||||||
ExecStartPre=/usr/bin/curl --location --create-dirs --output /opt/kubernetes/pkg/kubernetes-server-linux-amd64.tar.gz ${SERVER_BINARY_TAR_URL}
|
ExecStartPre=/usr/bin/curl --fail --silent --show-error --location --create-dirs --output \
|
||||||
|
/opt/kubernetes/pkg/kubernetes-server-linux-amd64.tar.gz ${SERVER_BINARY_TAR_URL}
|
||||||
ExecStart=/usr/bin/tar xf /opt/kubernetes/pkg/kubernetes-server-linux-amd64.tar.gz -C /opt --overwrite
|
ExecStart=/usr/bin/tar xf /opt/kubernetes/pkg/kubernetes-server-linux-amd64.tar.gz -C /opt --overwrite
|
||||||
|
|
||||||
- name: kubelet.service
|
- name: kubelet.service
|
||||||
@ -126,7 +131,6 @@ coreos:
|
|||||||
RestartSec=10
|
RestartSec=10
|
||||||
|
|
||||||
- name: docker.service
|
- name: docker.service
|
||||||
command: start
|
|
||||||
drop-ins:
|
drop-ins:
|
||||||
- name: 50-docker-opts.conf
|
- name: 50-docker-opts.conf
|
||||||
content: |
|
content: |
|
||||||
|
Loading…
Reference in New Issue
Block a user