Skip to content

fix(operator): networkpolicies correctly set Swift port for objstore NP #20129

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

Open
JoaoBraveCoding wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(operator): networkpolicies correctly set Swift port for objstore NP #20129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions operator/internal/manifests/networkpolicy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ func buildLokiAllowGatewayIngress(opts Options) *networkingv1.NetworkPolicy {
// components that need to access object storage to object storage
func buildLokiAllowBucketEgress(opts Options) *networkingv1.NetworkPolicy {
objstorePort := int32(443) // Default HTTPS port
if port := getEndpointPort(opts.ObjectStorage); port != 0 {
if port := getEndpointPort(opts.ObjectStorage, opts.Gates.OpenShift.Enabled); port != 0 {
objstorePort = port
}

Expand Down Expand Up @@ -629,7 +629,7 @@ func buildLokiAllowQueryFrontend(opts Options) *networkingv1.NetworkPolicy {
}
}

func getEndpointPort(storageOpts storage.Options) int32 {
func getEndpointPort(storageOpts storage.Options, openShiftEnabled bool) int32 {
extractPort := func(endpoint string) int32 {
if strings.HasPrefix(endpoint, "http://") || strings.HasPrefix(endpoint, "https://") {
if u, err := url.Parse(endpoint); err == nil && u.Port() != "" {
Expand Down Expand Up @@ -667,7 +667,12 @@ func getEndpointPort(storageOpts storage.Options) int32 {

// Swift AuthURL might includes ports
if storageOpts.Swift != nil && storageOpts.Swift.AuthURL != "" {
return extractPort(storageOpts.Swift.AuthURL)
swiftObjectPort := int32(443)
if openShiftEnabled {
// Swift Proxy SSL (Red Hat OpenStack deployments)
swiftObjectPort = int32(13808)
}
return swiftObjectPort
}

return 0
Expand Down
23 changes: 21 additions & 2 deletions operator/internal/manifests/networkpolicy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ func TestBuildLokiAllowBucketEgress(t *testing.T) {
expectedPort: 8080,
},
{
name: "Swift endpoint with custom port",
name: "Swift endpoint with default SSL port",
opts: Options{
Name: "test",
Namespace: "test-ns",
Expand All @@ -373,7 +373,26 @@ func TestBuildLokiAllowBucketEgress(t *testing.T) {
},
},
},
expectedPort: 5000,
expectedPort: 443,
},
{
name: "Swift endpoint with OpenStack OpenShift default SSL port",
opts: Options{
Name: "test",
Namespace: "test-ns",
Gates: configv1.FeatureGates{
OpenShift: configv1.OpenShiftFeatureGates{
Enabled: true,
},
},
ObjectStorage: storage.Options{
SharedStore: lokiv1.ObjectStorageSecretSwift,
Swift: &storage.SwiftStorageConfig{
AuthURL: "http://keystone.openstack.svc.cluster.local:5000/v3",
},
},
},
expectedPort: 13808,
},
{
name: "AlibabaCloud endpoint with custom port",
Expand Down
Loading