Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #160 from flatcar-linux/kai/oem-gce-rkt-dns-edge
Edge: coreos-base/oem-gce: Fix resolving metadata.google.internal via /etc/hosts
  • Loading branch information
pothos committed Jan 27, 2020
2 parents 5d6afba + af23902 commit 96547fb
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 5 deletions.
2 changes: 1 addition & 1 deletion coreos-base/oem-gce/files/files/hosts
@@ -1,2 +1,2 @@
169.254.169.254 metadata
169.254.169.254 metadata metadata.google.internal
127.0.0.1 localhost
16 changes: 12 additions & 4 deletions coreos-base/oem-gce/files/units/oem-gce.service
Expand Up @@ -11,11 +11,19 @@ RestartSec=5
KillMode=process
KillSignal=SIGTERM

ExecStart=/usr/bin/docker run \
ExecStart=/usr/bin/rkt run \
--inherit-env=true \
--insecure-options=image \
--net=host \
--mount type=bind,bind-propagation=rprivate,source=/etc,target=/etc \
--mount type=bind,bind-propagation=rshared,source=/home,target=/home \
--mount type=bind,bind-propagation=rprivate,source=/run/systemd,target=/run/systemd
--stage1-path=/usr/lib/rkt/stage1-images/stage1-fly.aci \
--volume=etc,kind=host,source=/etc,readOnly=false \
--volume=home,kind=host,source=/home,readOnly=false \
--volume=runsystemd,kind=host,source=/run/systemd,readOnly=false \
--volume=nsswitch,kind=host,source=/usr/share/google-oslogin/nsswitch.conf,readOnly=true \
--mount=volume=nsswitch,target=/usr/share/google-oslogin/nsswitch.conf \
/usr/share/oem/flatcar-oem-gce.aci

ExecStopPost=/usr/bin/rkt gc --mark-only

[Install]
WantedBy=multi-user.target

0 comments on commit 96547fb

Please sign in to comment.