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
60 changes: 60 additions & 0 deletions internal/controller/core/site_controller_networkpolicies.go
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@ func (r *SiteReconciler) reconcileNetworkPolicies(ctx context.Context, req ctrl.
return err
}

if err := r.reconcileFlightdeckNetworkPolicy(ctx, req.Namespace, l, site); err != nil {
l.Error(err, "error ensuring flightdeck network policy")
return err
}

return nil
}

Expand All @@ -90,6 +95,7 @@ func (r *SiteReconciler) cleanupNetworkPolicies(ctx context.Context, req ctrl.Re
"chronicle",
"connect",
"connect-session",
"flightdeck",
"home",
"keycloak",
"packagemanager",
Expand Down Expand Up @@ -723,3 +729,57 @@ func (r *SiteReconciler) reconcileWorkbenchSessionNetworkPolicy(ctx context.Cont
})
return err
}

func (r *SiteReconciler) reconcileFlightdeckNetworkPolicy(ctx context.Context, namespace string, l logr.Logger, site *v1beta1.Site) error {
policyName := site.Name + "-flightdeck"

policy := &networkingv1.NetworkPolicy{
ObjectMeta: metav1.ObjectMeta{
Name: policyName,
Namespace: namespace,
},
}
_, err := internal.CreateOrUpdateResource(ctx, r.Client, r.Scheme, l, policy, site, func() error {
policy.Labels = site.KubernetesLabels()
policy.Spec = networkingv1.NetworkPolicySpec{
PodSelector: metav1.LabelSelector{
MatchLabels: map[string]string{
v1beta1.SiteLabelKey: site.Name,
v1beta1.KubernetesInstanceLabelKey: policyName,
},
},
PolicyTypes: []networkingv1.PolicyType{
networkingv1.PolicyTypeEgress,
networkingv1.PolicyTypeIngress,
},
Egress: []networkingv1.NetworkPolicyEgressRule{
{},
},
Ingress: []networkingv1.NetworkPolicyIngressRule{
{
From: []networkingv1.NetworkPolicyPeer{
{
NamespaceSelector: &metav1.LabelSelector{
MatchLabels: map[string]string{
v1beta1.KubernetesMetadataNameKey: "traefik",
},
},
},
{
NamespaceSelector: &metav1.LabelSelector{
MatchLabels: map[string]string{
v1beta1.KubernetesMetadataNameKey: grafanaAlloyNamespace,
},
},
},
},
Ports: []networkingv1.NetworkPolicyPort{
internal.DefaultPortFlightdeckHTTP.NetworkPolicyPort(),
},
},
},
}
return nil
})
return err
}
1 change: 1 addition & 0 deletions internal/tcpport.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const (
DefaultPortChronicleHTTP TCPPort = 5252
DefaultPortChronicleMetrics TCPPort = 3030
DefaultPortConnectHTTP TCPPort = 3939
DefaultPortFlightdeckHTTP TCPPort = 8080
DefaultPortConnectMetrics TCPPort = 3232
DefaultPortConnectSession TCPPort = 50734
DefaultPortHomeHTTP TCPPort = 8080
Expand Down