Skip to content
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

Use firewall-controller v2 #346

Merged
merged 8 commits into from
Oct 23, 2023
Merged

Use firewall-controller v2 #346

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b523ae8
Use firewall-controller v2
majst01 Oct 12, 2023
8be0347
Remove old code
majst01 Oct 12, 2023
0747217
Remove orphan
majst01 Oct 12, 2023
1f4fa4d
Pin firewallcontroller
majst01 Oct 13, 2023
38d38f2
Remove usued files
majst01 Oct 17, 2023
fe5e021
Do not delete namespace
majst01 Oct 17, 2023
419395a
Wrong folder
majst01 Oct 17, 2023
15520e3
Wrong folder
majst01 Oct 17, 2023
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
257 changes: 0 additions & 257 deletions charts/internal/crds-firewall/templates/firewall-controller/metal-stack.io_firewalls.yaml
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions charts/internal/shoot-control-plane/templates/firewall/firewall.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,5 @@ kind: Firewall
metadata:
Gerrit91 marked this conversation as resolved.
Show resolved Hide resolved
namespace: firewall
name: firewall
spec:
{{ toYaml .Values.firewallSpec | indent 2 }}
status:
stats: {}
9 changes: 0 additions & 9 deletions charts/internal/shoot-control-plane/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,6 @@ images:

imagePullPolicy: IfNotPresent

firewallSpec:
interval: 10s
dryrun: false
logAcceptedConnections: false
rateLimits: []
internalprefixes: []
egressRules: []
firewallNetworks: []

duros:
enabled: false
endpoints: []
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ require (
github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.5.9
github.com/metal-stack/duros-controller v0.6.2
github.com/metal-stack/firewall-controller v1.3.0
github.com/metal-stack/firewall-controller-manager v0.2.3
github.com/metal-stack/firewall-controller/v2 v2.1.0
github.com/metal-stack/machine-controller-manager-provider-metal v0.1.14
github.com/metal-stack/metal-go v0.24.1
github.com/metal-stack/metal-lib v0.13.3
Expand Down Expand Up @@ -50,7 +50,7 @@ require (
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fatih/color v1.15.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
Expand Down Expand Up @@ -136,7 +136,7 @@ require (
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.13.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,10 +433,10 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zk
github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
github.com/metal-stack/duros-controller v0.6.2 h1:P/KpOvNlSsqXf0Qucbar/wFR7wMmqZTwoaN3F8YhD7M=
github.com/metal-stack/duros-controller v0.6.2/go.mod h1:4sN2SQfzMp1x3ylL+ATxb8nmrxMh2JZThDZYPy4k5WU=
github.com/metal-stack/firewall-controller v1.3.0 h1:K6QSP74BrKW0tmTCwT0xS5oByE2CqtyL6roTsvSbuDg=
github.com/metal-stack/firewall-controller v1.3.0/go.mod h1:Ltmu4CWekOqd1m4GD/XlYtPl9p0q7U/an1WGqR1w+vc=
github.com/metal-stack/firewall-controller-manager v0.2.3 h1:FZSg+y/RyHYQ053GpHTpIP/E+8z7JtJ5Wb5049Op3iA=
github.com/metal-stack/firewall-controller-manager v0.2.3/go.mod h1:ppoOJE3sLiwROVhB4Yui5tuWylctT+lEa0S70PGCb0k=
github.com/metal-stack/firewall-controller/v2 v2.1.0 h1:ekVEnUBRDl3YYHV4a13mktjSy47WQvkKsPccz5iIB28=
github.com/metal-stack/firewall-controller/v2 v2.1.0/go.mod h1:IQASxGZld7wxaW1TaFiQQCrjt/vOFK/uIV2ALQjlxyg=
github.com/metal-stack/machine-controller-manager-provider-metal v0.1.14 h1:qbbdnGXSDP5Fagliheh73rGm+NaYCEBd/oRsydrqHbI=
github.com/metal-stack/machine-controller-manager-provider-metal v0.1.14/go.mod h1:d36VmegtqJd7AKv8FVFvuimRPK+M93odICUUbTXg8CU=
github.com/metal-stack/metal-go v0.24.1 h1:S4g3LXeWBELCKIyyCsRMa9B1pC5EClqcX35oV/8xv2U=
Expand Down Expand Up @@ -936,8 +936,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gomodules.xyz/jsonpatch/v2 v2.3.0 h1:8NFhfS6gzxNqjLIYnZxg319wZ5Qjnx4m/CcX+Klzazc=
gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw=
gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/metal/install/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package install
import (
durosv1 "github.com/metal-stack/duros-controller/api/v1"
fcmv2 "github.com/metal-stack/firewall-controller-manager/api/v2"
firewallv1 "github.com/metal-stack/firewall-controller/api/v1"
firewallv1 "github.com/metal-stack/firewall-controller/v2/api/v1"
"github.com/metal-stack/gardener-extension-provider-metal/pkg/apis/metal"
"github.com/metal-stack/gardener-extension-provider-metal/pkg/apis/metal/v1alpha1"

Expand Down
Loading