Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ jobs:

steps:
- name: Log in to the container registry
uses: docker/login-action@v3
uses: docker/login-action@v4
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Setup Go
uses: actions/setup-go@v5
uses: actions/setup-go@v7
with:
go-version-file: 'go.mod'
cache: false
Expand All @@ -49,10 +49,10 @@ jobs:
[ "${GITHUB_EVENT_NAME}" == 'push' ] && echo "tag=latest" >> $GITHUB_ENV || true

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@v4

- name: Build and push image
uses: docker/build-push-action@v6
uses: docker/build-push-action@v7
with:
context: .
push: true
Expand All @@ -68,7 +68,7 @@ jobs:
uses: actions/checkout@v6

- name: Setup Go
uses: actions/setup-go@v5
uses: actions/setup-go@v7
with:
go-version-file: 'go.mod'
cache: false
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Build the firewall-controller-manager binary
FROM golang:1.26 AS builder
FROM golang:1.27 AS builder

WORKDIR /work
COPY . .
RUN make

FROM gcr.io/distroless/static-debian12:nonroot
FROM gcr.io/distroless/static-debian13:nonroot
COPY --from=builder /work/bin/firewall-controller-manager /firewall-controller-manager
ENTRYPOINT ["/firewall-controller-manager"]
2 changes: 1 addition & 1 deletion Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.23
FROM alpine:3.24
COPY bin/firewall-controller-manager /firewall-controller-manager
USER 65534
ENTRYPOINT ["/firewall-controller-manager"]
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GITVERSION := $(shell git describe --long --all)
BUILDDATE := $(shell date -Iseconds)
VERSION := $(or ${VERSION},$(shell git describe --tags --exact-match 2> /dev/null || git symbolic-ref -q --short HEAD || git rev-parse --short HEAD))

CONTROLLER_TOOLS_VERSION ?= v0.20.0
CONTROLLER_TOOLS_VERSION ?= v0.21.0
LOCALBIN ?= $(shell pwd)/bin
CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
ENVTEST ?= $(LOCALBIN)/setup-envtest
Expand Down
7 changes: 2 additions & 5 deletions api/v2/defaults/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"github.com/metal-stack/firewall-controller-manager/api/v2/config"
"github.com/metal-stack/firewall-controller-manager/api/v2/helper"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
)
Expand Down Expand Up @@ -151,10 +150,8 @@ func defaultFirewallSpec(f *v2.FirewallSpec) {

func getSSHPublicKey(ctx context.Context, seedClient client.Client, secretName, namespace string) (string, error) {
sshSecret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: secretName,
Namespace: namespace,
},
Name: secretName,
Namespace: namespace,
}

err := seedClient.Get(ctx, client.ObjectKeyFromObject(sshSecret), sshSecret)
Expand Down
51 changes: 16 additions & 35 deletions api/v2/helper/seed_access.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (

corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/rest"
configlatest "k8s.io/client-go/tools/clientcmd/api/latest"
configv1 "k8s.io/client-go/tools/clientcmd/api/v1"
Expand All @@ -36,22 +35,16 @@ func ensureSeedRBAC(ctx context.Context, seedConfig *rest.Config, deploy *v2.Fir
var (
name = seedAccessResourceName(deploy)
serviceAccount = &corev1.ServiceAccount{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: deploy.Namespace,
},
Name: name,
Namespace: deploy.Namespace,
}
role = &rbacv1.Role{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: deploy.Namespace,
},
Name: name,
Namespace: deploy.Namespace,
}
roleBinding = &rbacv1.RoleBinding{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: deploy.Namespace,
},
Name: name,
Namespace: deploy.Namespace,
}
)

Expand All @@ -73,10 +66,8 @@ func ensureSeedRBAC(ctx context.Context, seedConfig *rest.Config, deploy *v2.Fir
}

serviceAccountSecret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: deploy.Namespace,
},
Name: name,
Namespace: deploy.Namespace,
}

_, err = controllerutil.CreateOrUpdate(ctx, seed, serviceAccountSecret, func() error {
Expand Down Expand Up @@ -149,20 +140,14 @@ func ensureShootRBAC(ctx context.Context, shootConfig *rest.Config, shootNamespa
var (
name = shootAccessResourceName(deploy)
serviceAccount = &corev1.ServiceAccount{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: shootNamespace,
},
Name: name,
Namespace: shootNamespace,
}
clusterRole = &rbacv1.ClusterRole{
ObjectMeta: metav1.ObjectMeta{
Name: name,
},
Name: name,
}
clusterRoleBinding = &rbacv1.ClusterRoleBinding{
ObjectMeta: metav1.ObjectMeta{
Name: name,
},
Name: name,
}
)

Expand All @@ -181,10 +166,8 @@ func ensureShootRBAC(ctx context.Context, shootConfig *rest.Config, shootNamespa
}

serviceAccountSecret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: shootNamespace,
},
Name: name,
Namespace: shootNamespace,
}

_, err = controllerutil.CreateOrUpdate(ctx, shoot, serviceAccountSecret, func() error {
Expand Down Expand Up @@ -307,10 +290,8 @@ func GetAccessKubeconfig(c *AccessConfig) ([]byte, error) {
}

saSecret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: name,
Namespace: c.Namespace,
},
Name: name,
Namespace: c.Namespace,
}
err = cl.Get(c.Ctx, controllerclient.ObjectKeyFromObject(saSecret), saSecret, &controllerclient.GetOptions{})
if err != nil {
Expand Down
13 changes: 4 additions & 9 deletions api/v2/helper/shoot_access.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"github.com/go-logr/logr"
v2 "github.com/metal-stack/firewall-controller-manager/api/v2"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/rest"
controllerclient "sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -83,10 +82,8 @@ func (s *ShootAccessHelper) Config(ctx context.Context) (*configv1.Config, error
}

kubeconfigTemplate := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: s.access.GenericKubeconfigSecretName,
Namespace: s.access.Namespace,
},
Name: s.access.GenericKubeconfigSecretName,
Namespace: s.access.Namespace,
}

err := s.seed.Get(ctx, controllerclient.ObjectKeyFromObject(kubeconfigTemplate), kubeconfigTemplate)
Expand Down Expand Up @@ -178,10 +175,8 @@ func (s *ShootAccessHelper) Client(ctx context.Context) (controllerclient.Client

func (s *ShootAccessHelper) readTokenSecret(ctx context.Context) (string, error) {
tokenSecret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: s.access.TokenSecretName,
Namespace: s.access.Namespace,
},
Name: s.access.TokenSecretName,
Namespace: s.access.Namespace,
}

err := s.seed.Get(ctx, controllerclient.ObjectKeyFromObject(tokenSecret), tokenSecret)
Expand Down
7 changes: 2 additions & 5 deletions api/v2/helper/shoot_access_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/fake"
)
Expand All @@ -32,10 +31,8 @@ func TestNewShootConfig(t *testing.T) {
APIServerURL: "https://shoot-name",
},
seed: fake.NewClientBuilder().WithObjects(&corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Name: "generic-token-kubeconfig",
Namespace: "shoot-namespace",
},
Name: "generic-token-kubeconfig",
Namespace: "shoot-namespace",
Data: map[string][]byte{
"kubeconfig": []byte(`apiVersion: v1
clusters:
Expand Down
Loading
Loading