Skip to content

K
k3s
Commit e13b00ed authored by Alex Robinson's avatar Alex Robinson
Browse files
Options

Merge pull request #12436 from runningwild/PR

Install rkt to a directory that doesn't require environment variables…
parents 9bda3c59 f456e583
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
cluster/gce/coreos/node.yaml
View file @ e13b00ed
...@@ -91,11 +91,13 @@ coreos: ...@@ -91,11 +91,13 @@ coreos:
[Service] [Service]
Type=oneshot Type=oneshot
EnvironmentFile=/etc/kube-env EnvironmentFile=/etc/kube-env
ExecStartPre=/usr/bin/rm -rf /opt/rkt
ExecStartPre=/usr/bin/mkdir -p /opt/rkt ExecStartPre=/usr/bin/mkdir -p /opt/rkt
ExecStartPre=/usr/bin/wget \ ExecStartPre=/usr/bin/wget \
-O /opt/rkt/rkt-v${RKT_VERSION}.tar.gz \ -O /opt/rkt/rkt-v${RKT_VERSION}.tar.gz \
https://github.com/coreos/rkt/releases/download/v${RKT_VERSION}/rkt-v${RKT_VERSION}.tar.gz https://github.com/coreos/rkt/releases/download/v${RKT_VERSION}/rkt-v${RKT_VERSION}.tar.gz
ExecStart=/usr/bin/tar xzvf /opt/rkt/rkt-v${RKT_VERSION}.tar.gz -C /opt --overwrite ExecStartPre=/usr/bin/tar xzvf /opt/rkt/rkt-v${RKT_VERSION}.tar.gz -C /opt --overwrite
ExecStart=/usr/bin/mv /opt/rkt-v${RKT_VERSION} /opt/rkt/rkt
- name: kubernetes-install-minion.service - name: kubernetes-install-minion.service
command: start command: start
...@@ -200,4 +202,4 @@ coreos: ...@@ -200,4 +202,4 @@ coreos:
After=kubernetes-install-rkt.service After=kubernetes-install-rkt.service
[Service] [Service]
EnvironmentFile=/etc/kube-env EnvironmentFile=/etc/kube-env
ExecStart=/opt/rkt-v${RKT_VERSION}/rkt metadata-service ExecStart=/opt/rkt/rkt metadata-service
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment