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 safe RFC1123 for network policy names #515

Merged
merged 3 commits into from
Nov 17, 2024
Merged

Use safe RFC1123 for network policy names #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
079edb1
Use safe RFC1123 for network policy names
orishavit Nov 10, 2024
0c9d13b
use GetRFC1123NameWithKind in two other controllers
orishavit Nov 12, 2024
e9b2508
use dots in RFC1123
orishavit Nov 12, 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
9 changes: 6 additions & 3 deletions src/operator/controllers/intents_reconcilers/networkpolicy/reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,12 @@ func (r *Reconciler) applyServiceEffectivePolicy(ctx context.Context, ep effecti

func (r *Reconciler) applyNetpol(ctx context.Context, ep effectivepolicy.ServiceEffectivePolicy, netpol v1.NetworkPolicy) error {
existingPolicy := &v1.NetworkPolicy{}

err := r.Get(ctx, types.NamespacedName{
Name: netpol.Name,
Namespace: ep.Service.Namespace},
existingPolicy)

if err != nil && !k8serrors.IsNotFound(err) {
r.RecordWarningEventf(existingPolicy, consts.ReasonGettingNetworkPolicyFailed, "failed to get network policy: %s", err.Error())
return errors.Wrap(err)
Expand Down Expand Up @@ -353,9 +355,10 @@ func (r *Reconciler) buildSinglePolicy(ep effectivepolicy.ServiceEffectivePolicy
if shouldCreateEgress {
policyTypes = append(policyTypes, v1.PolicyTypeEgress)
}

return v1.NetworkPolicy{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf(otterizev2alpha1.OtterizeSingleNetworkPolicyNameTemplate, ep.Service.GetNameWithKind()),
Name: fmt.Sprintf(otterizev2alpha1.OtterizeSingleNetworkPolicyNameTemplate, ep.Service.GetRFC1123NameWithKind()),
Namespace: ep.Service.Namespace,
Labels: map[string]string{
otterizev2alpha1.OtterizeNetworkPolicy: ep.Service.GetFormattedOtterizeIdentityWithKind(),
Expand All @@ -375,7 +378,7 @@ func (r *Reconciler) buildSeparatePolicies(ep effectivepolicy.ServiceEffectivePo
if shouldCreateIngress {
ingressPolicy := v1.NetworkPolicy{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf(otterizev2alpha1.OtterizeNetworkPolicyIngressNameTemplate, ep.Service.GetNameWithKind()),
Name: fmt.Sprintf(otterizev2alpha1.OtterizeNetworkPolicyIngressNameTemplate, ep.Service.GetRFC1123NameWithKind()),
Namespace: ep.Service.Namespace,
Labels: map[string]string{
otterizev2alpha1.OtterizeNetworkPolicy: ep.Service.GetFormattedOtterizeIdentityWithKind(),
Expand All @@ -392,7 +395,7 @@ func (r *Reconciler) buildSeparatePolicies(ep effectivepolicy.ServiceEffectivePo
if shouldCreateEgress {
egressPolicy := v1.NetworkPolicy{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf(otterizev2alpha1.OtterizeNetworkPolicyEgressNameTemplate, ep.Service.GetNameWithKind()),
Name: fmt.Sprintf(otterizev2alpha1.OtterizeNetworkPolicyEgressNameTemplate, ep.Service.GetRFC1123NameWithKind()),
Namespace: ep.Service.Namespace,
Labels: map[string]string{
otterizev2alpha1.OtterizeNetworkPolicy: ep.Service.GetFormattedOtterizeIdentityWithKind(),
Expand Down
4 changes: 2 additions & 2 deletions src/operator/controllers/istiopolicy/policy_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,9 @@ func (c *PolicyManagerImpl) updatePolicy(ctx context.Context, existingPolicy *v1

func (c *PolicyManagerImpl) getPolicyName(intents *v2alpha1.ClientIntents, intent v2alpha1.Target) string {
clientIdentity := intents.ToServiceIdentity()
clientName := fmt.Sprintf("%s.%s", clientIdentity.GetNameWithKind(), intents.Namespace)
clientName := fmt.Sprintf("%s.%s", clientIdentity.GetRFC1123NameWithKind(), intents.Namespace)
serverIdentity := intent.ToServiceIdentity(intents.Namespace)
policyName := fmt.Sprintf(OtterizeIstioPolicyNameTemplate, serverIdentity.GetNameWithKind(), clientName)
policyName := fmt.Sprintf(OtterizeIstioPolicyNameTemplate, serverIdentity.GetRFC1123NameWithKind(), clientName)
return policyName
}

Expand Down
2 changes: 1 addition & 1 deletion src/operator/controllers/protected_service_reconcilers/default_deny.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func (r *DefaultDenyReconciler) updateIfNeeded(
}

func (r *DefaultDenyReconciler) buildNetworkPolicyObjectForIntent(ctx context.Context, serviceId serviceidentity.ServiceIdentity) (v1.NetworkPolicy, bool, error) {
policyName := fmt.Sprintf("default-deny-%s", serviceId.GetNameWithKind())
policyName := fmt.Sprintf("default-deny-%s", serviceId.GetRFC1123NameWithKind())
podSelectorLabels, ok, err := otterizev2alpha1.ServiceIdentityToLabelsForWorkloadSelection(ctx, r.Client, serviceId)
if err != nil {
return v1.NetworkPolicy{}, false, errors.Wrap(err)
Expand Down
4 changes: 4 additions & 0 deletions src/shared/serviceidresolver/serviceidentity/serviceidentity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ func (si ServiceIdentity) GetNameWithKind() string {
return lo.Ternary(si.Kind == "" || si.Kind == KindOtterizeLegacy, si.Name, fmt.Sprintf("%s-%s", si.Name, strings.ToLower(si.Kind)))
}

func (si ServiceIdentity) GetRFC1123NameWithKind() string {
return strings.ReplaceAll(si.GetNameWithKind(), "_", ".")
}

func (si ServiceIdentity) Equals(other ServiceIdentity) bool {
return si.Name == other.Name && si.Namespace == other.Namespace && si.Kind == other.Kind
}
Expand Down
Loading