clearlinux/rkt
2
0
Fork 0
mirror of https://github.com/clearlinux/rkt.git synced 2026-08-31 02:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

mdsvc: no more 169.254.196.255 address

Browse Source 
Since the spec requires AC_METADATA_URL env var,
well known IP is no longer needed. This removes
the iptables manipulation. Instead the IP address of the
host is passed in the AC_METADATA_URL. This host IP
is the address of the host end of the default veth.
This commit is contained in:
Eugene Yakubovich
2015-03-30 16:04:56 -07:00
parent 40bb807531
commit ebdc1503df
7 changed files with 47 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/common.go
+4 -5
View File
@@ -19,6 +19,7 @@ package common
import (
"bufio"
"fmt"
"net"
"os"
"os/exec"
"path/filepath"
@@ -36,9 +37,7 @@ const (
Stage1IDFilename = "stage1ID"
OverlayPreparedFilename = "overlay-prepared"
MetadataServiceIP = "169.254.169.255"
MetadataServicePubPort = 80
MetadataServicePrvPort = 2375
MetadataServicePort = 2375
MetadataServiceRegSock = "/run/rkt/metadata-svc.sock"
)
@@ -99,8 +98,8 @@ func ImageManifestPath(root string, imageID types.Hash) string {
}
// MetadataServicePublicURL returns the public URL used to host the metadata service
func MetadataServicePublicURL() string {
return fmt.Sprintf("http://%v:%v", MetadataServiceIP, MetadataServicePubPort)
func MetadataServicePublicURL(ip net.IP) string {
return fmt.Sprintf("http://%v:%v", ip, MetadataServicePort)
}
func GetRktLockFD() (int, error) {
networking/net/net.go
+4
View File
@@ -63,6 +63,10 @@ func LoadNet(path string, n interface{}) error {
type IfConfig struct {
IP gonet.IP `json:"ip,omitempty"`
IP6 gonet.IP `json:"ip6,omitempty"`
// these are "extensions" and only meaningful for default net
HostIP gonet.IP `json:"hostIP,omitempty"`
HostIP6 gonet.IP `json:"hostIP6,omitempty"`
}
func PrintIfConfig(conf *IfConfig) error {
networking/net/veth/veth.go
+2 -1
View File
@@ -116,7 +116,8 @@ func cmdAdd(args *util.CmdArgs) error {
}
return rktnet.PrintIfConfig(&rktnet.IfConfig{
IP: ipConf.IP.IP,
IP: ipConf.IP.IP,
HostIP: ipConf.Gateway,
})
}
networking/net_plugin.go
+4 -4
View File
@@ -32,18 +32,18 @@ import (
const UserNetPluginsPath = "/usr/lib/rkt/plugins/net"
const BuiltinNetPluginsPath = "usr/lib/rkt/plugins/net"
func (e *containerEnv) netPluginAdd(n *Net, netns, args, ifName string) (net.IP, error) {
func (e *containerEnv) netPluginAdd(n *Net, netns, args, ifName string) (ip, hostIP net.IP, err error) {
output, err := e.execNetPlugin("ADD", n, netns, args, ifName)
if err != nil {
return nil, err
return nil, nil, err
}
ifConf := rktnet.IfConfig{}
if err = json.Unmarshal(output, &ifConf); err != nil {
return nil, fmt.Errorf("error parsing %q output: %v", n.Name, err)
return nil, nil, fmt.Errorf("error parsing %q output: %v", n.Name, err)
}
return ifConf.IP, nil
return ifConf.IP, ifConf.HostIP, nil
}
func (e *containerEnv) netPluginDel(n *Net, netns, args, ifName string) error {
networking/networking.go
+4 -1
View File
@@ -39,6 +39,7 @@ type activeNet struct {
Net
ifName string
ip net.IP
hostIP net.IP // kludge for default network
}
// "base" struct that's populated from the beginning
@@ -54,6 +55,7 @@ type Networking struct {
containerEnv
MetadataIP net.IP
HostIP net.IP
contID types.UUID
hostNS *os.File
@@ -112,6 +114,7 @@ func Setup(rktRoot string, contID types.UUID) (*Networking, error) {
// last net is the default
n.MetadataIP = n.nets[len(n.nets)-1].ip
n.HostIP = n.nets[len(n.nets)-1].hostIP
return &n, nil
}
@@ -197,7 +200,7 @@ func (e *containerEnv) setupNets(netns string, nets []Net) ([]activeNet, error)
break
}
an.ip, err = e.netPluginAdd(&nt, netns, nt.args, an.ifName)
an.ip, an.hostIP, err = e.netPluginAdd(&nt, netns, nt.args, an.ifName)
if err != nil {
err = fmt.Errorf("error adding network %q: %v", nt.Name, err)
break
rkt/metadata_service.go
+1 -23
View File
@@ -26,7 +26,6 @@ import (
"net/http"
"net/url"
"os"
"os/exec"
"os/signal"
"path/filepath"
"strconv"
@@ -61,7 +60,6 @@ var (
hmacKey [sha512.Size]byte
flagListenPort int
flagSrcAddrs string
flagNoIdle bool
exitCh = make(chan os.Signal, 1)
@@ -73,24 +71,10 @@ const (
func init() {
commands = append(commands, cmdMetadataService)
cmdMetadataService.Flags.StringVar(&flagSrcAddrs, "src-addr", "0.0.0.0/0", "source address/range for iptables")
cmdMetadataService.Flags.IntVar(&flagListenPort, "listen-port", common.MetadataServicePrvPort, "listen port")
cmdMetadataService.Flags.IntVar(&flagListenPort, "listen-port", common.MetadataServicePort, "listen port")
cmdMetadataService.Flags.BoolVar(&flagNoIdle, "no-idle", false, "exit when last container is unregistered")
}
func modifyIPTables(action string) error {
return exec.Command(
"iptables",
"-t", "nat",
action, "PREROUTING",
"-p", "tcp",
"-d", common.MetadataServiceIP,
"--dport", strconv.Itoa(common.MetadataServicePubPort),
"-j", "REDIRECT",
"--to-port", strconv.Itoa(flagListenPort),
).Run()
}
func queryValue(u *url.URL, key string) string {
vals, ok := u.Query()[key]
if !ok || len(vals) != 1 {
@@ -541,12 +525,6 @@ func runMetadataService(args []string) (exit int) {
return 1
}
if err := modifyIPTables("-A"); err != nil {
stderr("Error setting up iptables: %v", err)
return 1
}
defer modifyIPTables("-D")
go runRegistrationServer(unixl)
go runPublicServer(tcpl)
stage1/init/init.go
+28 -25
View File
@@ -185,7 +185,28 @@ func stage1() int {
}
mirrorLocalZoneInfo(c.Root)
c.MetadataServiceURL = common.MetadataServicePublicURL()
if privNet {
n, err := networking.Setup(root, c.UUID)
if err != nil {
fmt.Fprintf(os.Stderr, "Failed to setup network: %v\n", err)
return 6
}
defer n.Teardown()
c.MetadataServiceURL = common.MetadataServicePublicURL(n.HostIP)
if err = n.EnterContNS(); err != nil {
fmt.Fprintf(os.Stderr, "Failed to switch to container netns: %v\n", err)
return 6
}
if err = registerContainer(c, n.MetadataIP); err != nil {
fmt.Fprintf(os.Stderr, "Failed to register container: %v\n", err)
return 6
}
defer unregisterContainer(c)
}
if err = c.ContainerToSystemd(interactive); err != nil {
fmt.Fprintf(os.Stderr, "Failed to configure systemd: %v\n", err)
@@ -198,28 +219,9 @@ func stage1() int {
return 3
}
var execFn func() error
if privNet {
// careful not to make another local err variable.
// cmd.Run sets the one from parent scope
var n *networking.Networking
n, err = networking.Setup(root, c.UUID)
if err != nil {
fmt.Fprintf(os.Stderr, "Failed to setup network: %v\n", err)
return 6
}
defer n.Teardown()
if err = n.EnterContNS(); err != nil {
fmt.Fprintf(os.Stderr, "Failed to switch to container netns: %v\n", err)
return 6
}
if err = registerContainer(c, n.MetadataIP); err != nil {
fmt.Fprintf(os.Stderr, "Failed to register container: %v\n", err)
return 6
}
defer unregisterContainer(c)
cmd := exec.Cmd{
Path: args[0],
Args: args,
@@ -228,13 +230,14 @@ func stage1() int {
Stderr: os.Stderr,
Env: env,
}
err = withClearedCloExec(lfd, cmd.Run)
execFn = cmd.Run
} else {
err = withClearedCloExec(lfd, func() error {
execFn = func() error {
return syscall.Exec(args[0], args, env)
})
}
}
err = withClearedCloExec(lfd, execFn)
if err != nil {
fmt.Fprintf(os.Stderr, "Failed to execute nspawn: %v\n", err)
return 5