Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/metal-stack/metal-core in…
Browse files Browse the repository at this point in the history 
…to ipv6-support
  • Loading branch information
@majst01
majst01 committed Aug 8, 2024
2 parents f1c7c3a + 7aca726 commit 95005e6
Show file tree
Hide file tree
Showing 15 changed files with 195 additions and 227 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
[ "${GITHUB_EVENT_NAME}" == 'push' ] && echo "tag=latest" >> $GITHUB_ENV || true
- name: Build and push image
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
context: .
push: true
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.22-alpine3.19 as builder
FROM golang:1.22-alpine3.20 as builder
WORKDIR /work
COPY . .
RUN apk add \
Expand All @@ -11,7 +11,7 @@ RUN apk add \
dbus-libs
RUN make

FROM alpine:3.19
FROM alpine:3.20

RUN apk add \
libpcap \
Expand Down
56 changes: 28 additions & 28 deletions cmd/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,32 @@ import "time"

type Config struct {
// Valid log levels are: DEBUG, INFO, WARN, ERROR, FATAL and PANIC
CIDR string `required:"true" desc:"set the metal core CIDR"`
PartitionID string `required:"true" desc:"set the partition ID" envconfig:"partition_id"`
RackID string `required:"true" desc:"set the rack ID" envconfig:"rack_id"`
BindAddress string `required:"false" default:"0.0.0.0" desc:"set server bind address" split_words:"true"`
MetricsServerPort int `required:"false" default:"2112" desc:"the port of the metrics server" split_words:"true"`
MetricsServerBindAddress string `required:"false" default:"0.0.0.0" desc:"the bind addr of the metrics server" split_words:"true"`
LogLevel string `required:"false" default:"info" desc:"set log level" split_words:"true"`
ApiProtocol string `required:"false" default:"http" desc:"set metal api protocol" envconfig:"metal_api_protocol"`
ApiIP string `required:"false" default:"localhost" desc:"set metal api address" envconfig:"metal_api_ip"`
ApiPort int `required:"false" default:"8080" desc:"set metal api port" envconfig:"metal_api_port"`
ApiBasePath string `required:"false" default:"" desc:"set metal api basepath" envconfig:"metal_api_basepath"`
LoopbackIP string `required:"false" default:"10.0.0.11" desc:"set the loopback ip address that is used with BGP unnumbered" split_words:"true"`
ASN string `required:"false" default:"420000011" desc:"set the ASN that is used with BGP"`
SpineUplinks []string `required:"false" default:"swp31,swp32" desc:"set the ports that are connected to spines" envconfig:"spine_uplinks"`
ManagementGateway string `required:"false" default:"" desc:"the default gateway for the management network" split_words:"true"`
ReconfigureSwitch bool `required:"false" default:"false" desc:"let metal-core reconfigure the switch" split_words:"true"`
ReconfigureSwitchInterval time.Duration `required:"false" default:"10s" desc:"pull interval to fetch and apply switch configuration" split_words:"true"`
AdditionalBridgeVIDs []string `required:"false" desc:"additional vlan ids that should be configured at the vlan-aware bridge" envconfig:"additional_bridge_vids"`
AdditionalBridgePorts []string `required:"false" desc:"additional switch ports that should be configured at the vlan-aware bridge" envconfig:"additional_bridge_ports"`
InterfacesTplFile string `required:"false" default:"" desc:"the golang template file used to render /etc/network/interfaces, a default template is included" envconfig:"interfaces_tpl_file"`
FrrTplFile string `required:"false" default:"" desc:"the golang template file used to render /etc/frr/frr.conf, a default template is included" envconfig:"frr_tpl_file"`
HMACKey string `required:"true" desc:"the preshared key for the hmac calculation" envconfig:"hmac_key"`
GrpcAddress string `required:"true" default:"" desc:"the gRPC address" envconfig:"grpc_address"`
GrpcCACertFile string `required:"false" desc:"the gRPC CA certificate file" envconfig:"grpc_ca_cert_file"`
GrpcClientCertFile string `required:"false" desc:"the gRPC client certificate file" envconfig:"grpc_client_cert_file"`
GrpcClientKeyFile string `required:"false" desc:"the gRPC client key file" envconfig:"grpc_client_key_file"`
PXEVlanID uint16 `required:"false" default:"4000" desc:"the id of the pxe vlan" envconfig:"pxe_vlan_id"`
PodCIDRs []string `required:"false" default:"10.240.0.0/12" desc:"the pod cidrs, one cidr for ipv4 and on for ipv6 separated by comma" envconfig:"pod_cidrs"`
CIDR string `required:"true" desc:"set the metal core CIDR"`
PartitionID string `required:"true" desc:"set the partition ID" envconfig:"partition_id"`
RackID string `required:"true" desc:"set the rack ID" envconfig:"rack_id"`
BindAddress string `required:"false" default:"0.0.0.0" desc:"set server bind address" split_words:"true"`
MetricsServerPort int `required:"false" default:"2112" desc:"the port of the metrics server" split_words:"true"`
MetricsServerBindAddress string `required:"false" default:"0.0.0.0" desc:"the bind addr of the metrics server" split_words:"true"`
LogLevel string `required:"false" default:"info" desc:"set log level" split_words:"true"`
ApiProtocol string `required:"false" default:"http" desc:"set metal api protocol" envconfig:"metal_api_protocol"`
ApiIP string `required:"false" default:"localhost" desc:"set metal api address" envconfig:"metal_api_ip"`
ApiPort int `required:"false" default:"8080" desc:"set metal api port" envconfig:"metal_api_port"`
ApiBasePath string `required:"false" default:"" desc:"set metal api basepath" envconfig:"metal_api_basepath"`
LoopbackIP string `required:"false" default:"10.0.0.11" desc:"set the loopback ip address that is used with BGP unnumbered" split_words:"true"`
ASN string `required:"false" default:"420000011" desc:"set the ASN that is used with BGP"`
SpineUplinks []string `required:"false" default:"swp31,swp32" desc:"set the ports that are connected to spines" envconfig:"spine_uplinks"`
ManagementGateway string `required:"false" default:"" desc:"the default gateway for the management network" split_words:"true"`
ReconfigureSwitch bool `required:"false" default:"false" desc:"let metal-core reconfigure the switch" split_words:"true"`
ReconfigureSwitchInterval time.Duration `required:"false" default:"10s" desc:"pull interval to fetch and apply switch configuration" split_words:"true"`
AdditionalBridgeVIDs []string `required:"false" desc:"additional vlan ids that should be configured at the vlan-aware bridge" envconfig:"additional_bridge_vids"`
AdditionalBridgePorts []string `required:"false" desc:"additional switch ports that should be configured at the vlan-aware bridge" envconfig:"additional_bridge_ports"`
InterfacesTplFile string `required:"false" default:"" desc:"the golang template file used to render /etc/network/interfaces, a default template is included" envconfig:"interfaces_tpl_file"`
FrrTplFile string `required:"false" default:"" desc:"the golang template file used to render /etc/frr/frr.conf, a default template is included" envconfig:"frr_tpl_file"`
HMACKey string `required:"true" desc:"the preshared key for the hmac calculation" envconfig:"hmac_key"`
GrpcAddress string `required:"true" default:"" desc:"the gRPC address" envconfig:"grpc_address"`
GrpcCACertFile string `required:"false" desc:"the gRPC CA certificate file" envconfig:"grpc_ca_cert_file"`
GrpcClientCertFile string `required:"false" desc:"the gRPC client certificate file" envconfig:"grpc_client_cert_file"`
GrpcClientKeyFile string `required:"false" desc:"the gRPC client key file" envconfig:"grpc_client_key_file"`
PXEVlanID uint16 `required:"false" default:"4000" desc:"the id of the pxe vlan" envconfig:"pxe_vlan_id"`
DefaultAdditionalRouteMapCIDRs []string `required:"false" default:"10.240.0.0/12" desc:"the pod CIDRs, one or more CIDR for ipv4 or ipv6, separated by comma" envconfig:"default_additional_route_map_cidrs"`
}
7 changes: 1 addition & 6 deletions cmd/grpc.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package cmd

import (
"context"
"crypto/tls"
"crypto/x509"
"errors"
Expand Down Expand Up @@ -48,13 +47,9 @@ func NewGrpcClient(log *slog.Logger, address string, cert, key, caCert []byte) (
dialOpts := []grpc.DialOption{
grpc.WithKeepaliveParams(kacp),
grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
grpc.WithBlock(),
}

ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
defer cancel()

conn, err := grpc.DialContext(ctx, address, dialOpts...)
conn, err := grpc.NewClient(address, dialOpts...)
if err != nil {
return nil, err
}
Expand Down
10 changes: 5 additions & 5 deletions cmd/internal/core/core.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ type Core struct {

metrics *metrics.Metrics

pxeVlanID uint16
podCidrs []string
pxeVlanID uint16
additionalRouteMapCIDRs []string
}

type Config struct {
Expand All @@ -60,8 +60,8 @@ type Config struct {

Metrics *metrics.Metrics

PXEVlanID uint16
PodCidrs []string
PXEVlanID uint16
DefaultAdditionalRouteMapCIDRs []string
}

func New(c Config) *Core {
Expand All @@ -84,6 +84,6 @@ func New(c Config) *Core {
eventServiceClient: c.EventServiceClient,
metrics: c.Metrics,
pxeVlanID: c.PXEVlanID,
podCidrs: c.PodCidrs,
additionalRouteMapCIDRs: c.DefaultAdditionalRouteMapCIDRs,
}
}
16 changes: 8 additions & 8 deletions cmd/internal/core/reconfigure-switch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,14 +126,14 @@ func (c *Core) buildSwitcherConfig(s *models.V1SwitchResponse) (*types.Conf, err
}

switcherConfig := &types.Conf{
Name: s.Name,
LogLevel: mapLogLevel(c.logLevel),
ASN: asn,
Loopback: c.loopbackIP,
MetalCoreCIDR: c.cidr,
AdditionalBridgeVIDs: c.additionalBridgeVIDs,
PXEVlanID: c.pxeVlanID,
PodCidrs: c.podCidrs,
Name: s.Name,
LogLevel: mapLogLevel(c.logLevel),
ASN: asn,
Loopback: c.loopbackIP,
MetalCoreCIDR: c.cidr,
AdditionalBridgeVIDs: c.additionalBridgeVIDs,
PXEVlanID: c.pxeVlanID,
AdditionalRouteMapCIDRs: c.additionalRouteMapCIDRs,
}

p := types.Ports{
Expand Down
28 changes: 14 additions & 14 deletions cmd/internal/core/reconfigure-switch_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ import (

func TestBuildSwitcherConfig(t *testing.T) {
c := &Core{
cidr: "10.255.255.2/24",
partitionID: "fra-equ01",
rackID: "rack01",
asn: "420000001",
loopbackIP: "10.0.0.1",
spineUplinks: []string{"swp31", "swp32"},
additionalBridgeVIDs: []string{"201-256", "301-356"},
nos: &cumulus.Cumulus{},
podCidrs: []string{"10.240.0.0/12"},
cidr: "10.255.255.2/24",
partitionID: "fra-equ01",
rackID: "rack01",
asn: "420000001",
loopbackIP: "10.0.0.1",
spineUplinks: []string{"swp31", "swp32"},
additionalBridgeVIDs: []string{"201-256", "301-356"},
nos: &cumulus.Cumulus{},
additionalRouteMapCIDRs: []string{"10.240.0.0/12"},
}

n1 := "swp1"
Expand Down Expand Up @@ -54,11 +54,11 @@ func TestBuildSwitcherConfig(t *testing.T) {
require.NoError(t, err)
require.NotNil(t, actual)
expected := &types.Conf{
LogLevel: "warnings",
Loopback: "10.0.0.1",
MetalCoreCIDR: "10.255.255.2/24",
ASN: 420000001,
PodCidrs: []string{"10.240.0.0/12"},
LogLevel: "warnings",
Loopback: "10.0.0.1",
MetalCoreCIDR: "10.255.255.2/24",
ASN: 420000001,
AdditionalRouteMapCIDRs: []string{"10.240.0.0/12"},
Ports: types.Ports{
DownPorts: map[string]bool{},
Underlay: []string{"swp31", "swp32"},
Expand Down
2 changes: 1 addition & 1 deletion cmd/internal/switcher/templates/test_data/dev/conf.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ loglevel: warnings
loopback: 10.0.0.10
asn: 4200000010
metalcorecidr: 10.255.255.2/24
podcidrs:
additionalroutemapcidrs:
- "10.240.0.0/12"
- "fd00:10::/64"
ports:
Expand Down
2 changes: 1 addition & 1 deletion cmd/internal/switcher/templates/test_data/lab/conf.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ loglevel: debugging
loopback: 10.0.0.10
asn: 4200000010
metalcorecidr: 10.255.255.2/24
podcidrs:
additionalroutemapcidrs:
- "10.240.0.0/12"
ports:
eth0:
Expand Down
2 changes: 1 addition & 1 deletion cmd/internal/switcher/templates/test_data/notenants/conf.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ loglevel: warnings
loopback: 10.0.0.10
asn: 4200000010
metalcorecidr: 10.255.255.2/24
podcidrs:
additionalroutemapcidrs:
- "10.240.0.0/12"
ports:
eth0:
Expand Down
2 changes: 1 addition & 1 deletion cmd/internal/switcher/types/conf.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func (c *Conf) FillRouteMapsAndIPPrefixLists() error {
f.Assemble("fw-"+port, f.Vnis, f.Cidrs)
}
for vrf, t := range c.Ports.Vrfs {
t.Cidrs = append(t.Cidrs, c.PodCidrs...)
t.Cidrs = append(t.Cidrs, c.AdditionalRouteMapCIDRs...)
ipv4, ipv6, err := addressFamilies(t.Cidrs)
if err != nil {
return fmt.Errorf("unable to parse addressfamilies from cidrs:%w", err)
Expand Down
18 changes: 9 additions & 9 deletions cmd/internal/switcher/types/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ import (

// Conf holds the switch configuration
type Conf struct {
Name string
LogLevel string
Loopback string
ASN uint32
Ports Ports
MetalCoreCIDR string
AdditionalBridgeVIDs []string
PXEVlanID uint16
PodCidrs []string
Name string
LogLevel string
Loopback string
ASN uint32
Ports Ports
MetalCoreCIDR string
AdditionalBridgeVIDs []string
PXEVlanID uint16
AdditionalRouteMapCIDRs []string
}

type Ports struct {
Expand Down
38 changes: 19 additions & 19 deletions cmd/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,25 +84,25 @@ func Run() {
metrics := metrics.New()

c := core.New(core.Config{
Log: log,
LogLevel: cfg.LogLevel,
CIDR: cfg.CIDR,
LoopbackIP: cfg.LoopbackIP,
ASN: cfg.ASN,
PartitionID: cfg.PartitionID,
RackID: cfg.RackID,
ReconfigureSwitch: cfg.ReconfigureSwitch,
ReconfigureSwitchInterval: cfg.ReconfigureSwitchInterval,
ManagementGateway: cfg.ManagementGateway,
AdditionalBridgePorts: cfg.AdditionalBridgePorts,
AdditionalBridgeVIDs: cfg.AdditionalBridgeVIDs,
SpineUplinks: cfg.SpineUplinks,
NOS: nos,
Driver: driver,
EventServiceClient: grpcClient.NewEventClient(),
Metrics: metrics,
PXEVlanID: cfg.PXEVlanID,
PodCidrs: cfg.PodCIDRs,
Log: log,
LogLevel: cfg.LogLevel,
CIDR: cfg.CIDR,
LoopbackIP: cfg.LoopbackIP,
ASN: cfg.ASN,
PartitionID: cfg.PartitionID,
RackID: cfg.RackID,
ReconfigureSwitch: cfg.ReconfigureSwitch,
ReconfigureSwitchInterval: cfg.ReconfigureSwitchInterval,
ManagementGateway: cfg.ManagementGateway,
AdditionalBridgePorts: cfg.AdditionalBridgePorts,
AdditionalBridgeVIDs: cfg.AdditionalBridgeVIDs,
SpineUplinks: cfg.SpineUplinks,
NOS: nos,
Driver: driver,
EventServiceClient: grpcClient.NewEventClient(),
Metrics: metrics,
PXEVlanID: cfg.PXEVlanID,
DefaultAdditionalRouteMapCIDRs: cfg.DefaultAdditionalRouteMapCIDRs,
})

err = c.RegisterSwitch()
Expand Down
Loading

0 comments on commit 95005e6

Please sign in to comment.