From dfca5885a3a72644ced677953825a05f9228227c Mon Sep 17 00:00:00 2001 From: Simon Mayer Date: Thu, 11 Dec 2025 10:53:11 +0100 Subject: [PATCH] FCM with initial rule set --- ....x-k8s.io_metalstackfirewalltemplates.yaml | 73 ------------------- go.mod | 2 +- go.sum | 4 +- 3 files changed, 3 insertions(+), 76 deletions(-) diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_metalstackfirewalltemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_metalstackfirewalltemplates.yaml index 8ed558f..6d79661 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_metalstackfirewalltemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_metalstackfirewalltemplates.yaml @@ -269,79 +269,6 @@ spec: Userdata contains the userdata used for the creation of the firewall. It gets defaulted to a userdata matching for the firewall-controller with connection to Gardener shoot and seed. type: string - userdataContents: - description: |- - UserdataContents contains the unprocessed userdata as separate files. - This is meant as an alternative to `Userdata`. - items: - description: UserdataContent represents a file at a specific path - with either direct content or content sourced from a secret or - configmap. - properties: - content: - description: Content is the direct content of the file. - type: string - contentFrom: - description: ContentFrom represents the source from which to - obtain the content of the file. - properties: - configMapKeyRef: - description: ConfigMapKeyRef is a reference to a key within - a configmap. - properties: - key: - description: Key is the key within the configmap. - type: string - name: - description: Name is the name of the configmap. - type: string - required: - - key - - name - type: object - firewallControllerKubeconfigSecret: - description: FirewallControllerKubeconfigSecret is a reference - to the desired kubeconfig secret for the firewall-controller - to access the seed cluster. This kubeconfig will be generated - by the firewall-controller-manager. - properties: - key: - description: Key is the key within the secret. - type: string - name: - description: Name is the name of the secret. - type: string - required: - - key - - name - type: object - secretKeyRef: - description: SecretKeyRef is a reference to a key within - a secret. - properties: - key: - description: Key is the key within the secret. - type: string - name: - description: Name is the name of the secret. - type: string - required: - - key - - name - type: object - required: - - configMapKeyRef - - secretKeyRef - type: object - path: - description: Path is the file path where the content should - be placed. - type: string - required: - - contentFrom - - path - type: object - type: array required: - image - networks diff --git a/go.mod b/go.mod index 835a25f..69bcb39 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.24 require ( github.com/go-logr/logr v1.4.2 - github.com/metal-stack/firewall-controller-manager v0.5.2-0.20251113135313-f52a9d6c782c + github.com/metal-stack/firewall-controller-manager v0.5.2-0.20251211092714-a4e5cb245f46 github.com/metal-stack/metal-go v0.41.0 github.com/metal-stack/metal-lib v0.21.0 github.com/onsi/ginkgo/v2 v2.23.4 diff --git a/go.sum b/go.sum index b877c70..32f4d26 100644 --- a/go.sum +++ b/go.sum @@ -198,8 +198,8 @@ github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= -github.com/metal-stack/firewall-controller-manager v0.5.2-0.20251113135313-f52a9d6c782c h1:GR1ra9iAGjM+n0DsRRwEuV/SdwhXf4mZb7AH4SudSS4= -github.com/metal-stack/firewall-controller-manager v0.5.2-0.20251113135313-f52a9d6c782c/go.mod h1:gXD4ExLo4IdcuiwojauT1NgMGwAGSV6YoS4Fu1ZM9k0= +github.com/metal-stack/firewall-controller-manager v0.5.2-0.20251211092714-a4e5cb245f46 h1:6xLUd6bKsX4+B6QufGQgPqY+6DjxQ2GsJW9pEn95nUc= +github.com/metal-stack/firewall-controller-manager v0.5.2-0.20251211092714-a4e5cb245f46/go.mod h1:gXD4ExLo4IdcuiwojauT1NgMGwAGSV6YoS4Fu1ZM9k0= github.com/metal-stack/metal-go v0.41.0 h1:A8G/lmglviKObvGIFglV4RzY2u+g/eSCepX+roH68Uk= github.com/metal-stack/metal-go v0.41.0/go.mod h1:ltItf/Md/z588c7Dr3X6iemCeOFh3rJ8nDL5Dpb9zFQ= github.com/metal-stack/metal-lib v0.21.0 h1:oJSexA0czpS4aAUqCgymESWBsqG7BbjSceogsWowbPg=