Skip to content

Draft: proof of concept for firewall machine deployments #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vknabel wants to merge 1 commit into from
Closed

Draft: proof of concept for firewall machine deployments #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions capi-lab/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ CONTROL_PLANE_MACHINE_IMAGE ?= ubuntu-24.04
CONTROL_PLANE_MACHINE_SIZE ?= v1-small-x86
WORKER_MACHINE_IMAGE ?= ubuntu-24.04
WORKER_MACHINE_SIZE ?= v1-small-x86
FIREWALL_MACHINE_IMAGE ?= firewall-ubuntu-3.0
FIREWALL_MACHINE_SIZE ?= v1-small-x86

IMG ?= ghcr.io/metal-stack/cluster-api-metal-stack-controller:latest

Expand Down
2 changes: 1 addition & 1 deletion capi-lab/mini-lab
Open in desktop
Submodule mini-lab updated 11 files
+30 −2 Makefile
+1 −1 docs/network.svg
+11 −0 files/exit/frr.conf
+2 −0 files/exit/network.sh
+2 −0 files/external_service/network.sh
+1 −1 files/ignition.json
+25 −0 files/rules.yaml
+1 −0 inventories/group_vars/all/images.yaml
+20 −0 inventories/group_vars/control-plane/metal.yml
+4 −0 mini-lab.capms.yaml
+23 −0 test/integration.sh
47 changes: 47 additions & 0 deletions config/clusterctl-templates/cluster-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,50 @@ spec:
nodeRegistration:
kubeletExtraArgs:
cloud-provider: external
---
apiVersion: cluster.x-k8s.io/v1beta1
kind: MachineDeployment
metadata:
name: ${CLUSTER_NAME}-firewall
labels:
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
nodepool: firewall
spec:
clusterName: ${CLUSTER_NAME}
replicas: 1
selector:
matchLabels:
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
nodepool: firewall
template:
metadata:
labels:
cluster.x-k8s.io/cluster-name: ${CLUSTER_NAME}
nodepool: firewall
spec:
nodeDrainTimeout: 120s
clusterName: ${CLUSTER_NAME}
version: "${KUBERNETES_VERSION}"
bootstrap:
dataSecretName: ${CLUSTER_NAME}-firewall-data
infrastructureRef:
name: ${CLUSTER_NAME}-firewall
apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
kind: MetalStackMachineTemplate
---
apiVersion: infrastructure.cluster.x-k8s.io/v1alpha1
kind: MetalStackMachineTemplate
metadata:
name: ${CLUSTER_NAME}-firewall
spec:
template:
spec:
size: ${FIREWALL_MACHINE_SIZE}
image: ${FIREWALL_MACHINE_IMAGE}
---
apiVersion: v1
kind: Secret
metadata:
name: ${CLUSTER_NAME}-firewall-data
stringData:
value: "{}"
92 changes: 74 additions & 18 deletions internal/controller/metalstackmachine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import (
"github.com/go-logr/logr"
"github.com/metal-stack/cluster-api-provider-metal-stack/api/v1alpha1"
metalgo "github.com/metal-stack/metal-go"
metalfirewall "github.com/metal-stack/metal-go/api/client/firewall"
ipmodels "github.com/metal-stack/metal-go/api/client/ip"
metalmachine "github.com/metal-stack/metal-go/api/client/machine"
"github.com/metal-stack/metal-go/api/models"
Expand Down Expand Up @@ -314,26 +315,81 @@ func (r *machineReconciler) create() (*models.V1MachineResponse, error) {
})
}

resp, err := r.metalClient.Machine().AllocateMachine(metalmachine.NewAllocateMachineParamsWithContext(r.ctx).WithBody(&models.V1MachineAllocateRequest{
Partitionid: &r.infraCluster.Spec.Partition,
Projectid: &r.infraCluster.Spec.ProjectID,
PlacementTags: []string{tag.New(tag.ClusterID, r.infraCluster.GetClusterID())},
Tags: append(r.machineTags(), r.additionalMachineTags()...),
Name: r.infraMachine.Name,
Hostname: r.infraMachine.Name,
Sizeid: &r.infraMachine.Spec.Size,
Imageid: &r.infraMachine.Spec.Image,
Description: fmt.Sprintf("%s/%s for cluster %s/%s", r.infraMachine.Namespace, r.infraMachine.Name, r.infraCluster.Namespace, r.infraCluster.Name),
Networks: nws,
Ips: ips,
UserData: string(bootstrapSecret.Data["value"]),
// TODO: SSHPubKeys, ...
}), nil)
if err != nil {
return nil, fmt.Errorf("failed to allocate machine: %w", err)
var m *models.V1MachineResponse

if strings.Contains(r.infraMachine.Name, "firewall") {
fireResp, err := r.metalClient.Firewall().AllocateFirewall(metalfirewall.NewAllocateFirewallParamsWithContext(r.ctx).WithBody(&models.V1FirewallCreateRequest{
FirewallRules: &models.V1FirewallRules{
Egress: []*models.V1FirewallEgressRule{
{
Comment: "allow all",
Ports: []int32{53, 80, 443, 8080},
Protocol: "TCP",
To: []string{"0.0.0.0/0"},
},
{
Comment: "allow all",
Ports: []int32{53, 123},
Protocol: "UDP",
To: []string{"0.0.0.0/0"},
},
},
Ingress: []*models.V1FirewallIngressRule{
{
Comment: "allow all",
Ports: []int32{80, 443, 8080},
Protocol: "TCP",
From: []string{"0.0.0.0/0"},
},
},
},
Partitionid: &r.infraCluster.Spec.Partition,
Projectid: &r.infraCluster.Spec.ProjectID,
PlacementTags: []string{tag.New(tag.ClusterID, r.infraCluster.GetClusterID())},
Tags: append(r.machineTags(), r.additionalMachineTags()...),
Name: r.infraMachine.Name,
Hostname: r.infraMachine.Name,
Sizeid: &r.infraMachine.Spec.Size,
Imageid: &r.infraMachine.Spec.Image,
Description: fmt.Sprintf("firewall %s/%s for cluster %s/%s", r.infraMachine.Namespace, r.infraMachine.Name, r.infraCluster.Namespace, r.infraCluster.Name),
Networks: append(nws, &models.V1MachineAllocationNetwork{
Autoacquire: ptr.To(true),
Networkid: ptr.To("internet-mini-lab"),
}),
Ips: ips,
UserData: string(bootstrapSecret.Data["value"]),
}), nil)
if err != nil {
return nil, fmt.Errorf("failed to allocate firewall: %w", err)
}
resp, err := r.metalClient.Machine().FindMachine(metalmachine.NewFindMachineParamsWithContext(r.ctx).WithID(*fireResp.Payload.ID), nil)
if err != nil {
return nil, fmt.Errorf("failed to allocate firewall: %w", err)
}
m = resp.Payload
} else {
resp, err := r.metalClient.Machine().AllocateMachine(metalmachine.NewAllocateMachineParamsWithContext(r.ctx).WithBody(&models.V1MachineAllocateRequest{
Partitionid: &r.infraCluster.Spec.Partition,
Projectid: &r.infraCluster.Spec.ProjectID,
PlacementTags: []string{tag.New(tag.ClusterID, r.infraCluster.GetClusterID())},
Tags: append(r.machineTags(), r.additionalMachineTags()...),
Name: r.infraMachine.Name,
Hostname: r.infraMachine.Name,
Sizeid: &r.infraMachine.Spec.Size,
Imageid: &r.infraMachine.Spec.Image,
Description: fmt.Sprintf("%s/%s for cluster %s/%s", r.infraMachine.Namespace, r.infraMachine.Name, r.infraCluster.Namespace, r.infraCluster.Name),
Networks: nws,
Ips: ips,
UserData: string(bootstrapSecret.Data["value"]),
// TODO: SSHPubKeys, ...
}), nil)
if err != nil {
return nil, fmt.Errorf("failed to allocate machine: %w", err)
}
m = resp.Payload
}

return resp.Payload, nil
return m, nil
}

func (r *machineReconciler) getMachineStatus(mr *models.V1MachineResponse) (bool, error) {
Expand Down