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

Fix DNS based CWNPs for network-isolated Clusters #394

Merged
merged 5 commits into from
Apr 22, 2024
Merged

Fix DNS based CWNPs for network-isolated Clusters #394

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a48f4e
fix: initial dns for proxy
vknabel Mar 22, 2024
268fb61
Merge branch 'master' of github.com:metal-stack/gardener-extension-pr…
vknabel Apr 3, 2024
b8ea3d3
Merge branch 'master' of github.com:metal-stack/gardener-extension-pr…
vknabel Apr 9, 2024
df925cb
Merge branch 'master' into fix-initial-dns
Gerrit91 Apr 15, 2024
5d1e38e
fix: only change isolated clusters
vknabel Apr 15, 2024
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
20 changes: 20 additions & 0 deletions pkg/controller/worker/firewall_reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ package worker
import (
"context"
"fmt"
"strconv"
"strings"

extensionscontroller "github.com/gardener/gardener/extensions/pkg/controller"
extensionsv1alpha1 "github.com/gardener/gardener/pkg/apis/extensions/v1alpha1"
Expand Down Expand Up @@ -136,6 +138,24 @@ func (a *actuator) ensureFirewallDeployment(ctx context.Context, log logr.Logger
deploy.Spec.Template.Spec.LogAcceptedConnections = d.infrastructureConfig.Firewall.LogAcceptedConnections
deploy.Spec.Template.Spec.SSHPublicKeys = []string{sshKey}

if d.partition.NetworkIsolation != nil &&
len(d.partition.NetworkIsolation.DNSServers) > 0 &&
networkAccessType != apismetal.NetworkAccessBaseline {
dnsAddr, portStr, ok := strings.Cut(d.partition.NetworkIsolation.DNSServers[0], ":")
deploy.Spec.Template.Spec.DNSServerAddress = dnsAddr

if ok {
p, err := strconv.ParseUint(portStr, 10, 64)
if err != nil {
return fmt.Errorf("invalid dns port:%q", portStr)
}
port := uint(p)
deploy.Spec.Template.Spec.DNSPort = &port
}
} else {
deploy.Spec.Template.Spec.DNSServerAddress = ""
}

if networkAccessType == apismetal.NetworkAccessForbidden {
if d.partition.NetworkIsolation == nil || len(d.partition.NetworkIsolation.AllowedNetworks.Egress) == 0 {
// we need at least some egress rules to reach our own registry etcpp, so no single egress rule MUST be an error
Expand Down