Skip to content

Add .spec.service.disableTopology to clear topology annotations #833

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

Draft
kabicin wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Add .spec.service.disableTopology to clear topology annotations #833

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
f6717ff
Add RCO/OLO dependencies
kabicin Feb 19, 2026
a9b5540
Implement .spec.service.disableTopology
kabicin Feb 19, 2026
3b465a7
Update CRDs
kabicin Feb 24, 2026
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: 12 additions & 0 deletions api/v1/webspherelibertyapplication_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,10 @@ type WebSphereLibertyApplicationService struct {
// Configure service session affinity.
// +operator-sdk:csv:customresourcedefinitions:order=19,type=spec
SessionAffinity *WebSphereLibertyApplicationServiceSessionAffinity `json:"sessionAffinity,omitempty"`

// Disables topology aware annotations from being added to the Service. Defaults to false.
// +operator-sdk:csv:customresourcedefinitions:order=20,type=spec,displayName="Disable Topology",xDescriptors="urn:alm:descriptor:com.tectonic.ui:booleanSwitch"
DisableTopology *bool `json:"disableTopology,omitempty"`
}

// Configure service session affinity
Expand Down Expand Up @@ -929,6 +933,14 @@ func (cr *WebSphereLibertyApplication) GetManageTLS() *bool {
return cr.Spec.ManageTLS
}

// GetDisableTopology returns whether topology annotations are disabled for the service
func (cr *WebSphereLibertyApplication) GetDisableTopology() *bool {
if cr.Spec.Service != nil {
return cr.Spec.Service.DisableTopology
}
return nil
}

// GetEnv returns slice of environment variables
func (cr *WebSphereLibertyApplication) GetEnv() []corev1.EnvVar {
return cr.Spec.Env
Expand Down
5 changes: 5 additions & 0 deletions api/v1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion bundle/manifests/ibm-websphere-liberty.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ metadata:
capabilities: Auto Pilot
categories: Application Runtime
containerImage: icr.io/cpopen/websphere-liberty-operator:daily
createdAt: "2025-12-03T04:52:57Z"
createdAt: "2026-02-24T19:17:00Z"
description: Deploy and manage containerized Liberty applications
features.operators.openshift.io/disconnected: "true"
olm.skipRange: '>=1.0.0 <1.5.2'
Expand Down Expand Up @@ -386,6 +386,12 @@ spec:
compilation requests from the application.
displayName: Semeru Cloud Compiler
path: semeruCloudCompiler
- description: Disables topology aware annotations from being added to the Service.
Defaults to false.
displayName: Disable Topology
path: service.disableTopology
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:booleanSwitch
- description: Setting to maintain session affinity. Must be ClientIP or None.
Defaults to None.
displayName: Session Affinity Type
Expand Down
4 changes: 4 additions & 0 deletions bundle/manifests/liberty.websphere.ibm.com_webspherelibertyapplications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5321,6 +5321,10 @@ spec:
certificate and CA to be mounted in the pod. The following keys
are valid in the secret: ca.crt, tls.crt, and tls.key.'
type: string
disableTopology:
description: Disables topology aware annotations from being added
to the Service. Defaults to false.
type: boolean
nodePort:
description: Node proxies this port into your service.
format: int32
Expand Down
4 changes: 4 additions & 0 deletions config/crd/bases/liberty.websphere.ibm.com_webspherelibertyapplications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5317,6 +5317,10 @@ spec:
certificate and CA to be mounted in the pod. The following keys
are valid in the secret: ca.crt, tls.crt, and tls.key.'
type: string
disableTopology:
description: Disables topology aware annotations from being added
to the Service. Defaults to false.
type: boolean
nodePort:
description: Node proxies this port into your service.
format: int32
Expand Down
6 changes: 6 additions & 0 deletions config/manifests/bases/ibm-websphere-liberty.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,12 @@ spec:
compilation requests from the application.
displayName: Semeru Cloud Compiler
path: semeruCloudCompiler
- description: Disables topology aware annotations from being added to the Service.
Defaults to false.
displayName: Disable Topology
path: service.disableTopology
x-descriptors:
- urn:alm:descriptor:com.tectonic.ui:booleanSwitch
- description: Setting to maintain session affinity. Must be ClientIP or None.
Defaults to None.
displayName: Session Affinity Type
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ module github.com/WASdev/websphere-liberty-operator
go 1.25

require (
github.com/OpenLiberty/open-liberty-operator v0.8.1-0.20251124214343-4fee1b0d8d1e
github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20251120112423-05f65c81aa36
github.com/OpenLiberty/open-liberty-operator v0.8.1-0.20260219153907-af11c5cbb3c1
github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20260219135930-1ec2ade9b9fe
github.com/cert-manager/cert-manager v1.16.5
github.com/go-logr/logr v1.4.3
github.com/openshift/api v0.0.0-20250710004639-926605d3338b
Expand Down
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,14 @@ github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ
github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
github.com/OpenLiberty/open-liberty-operator v0.8.1-0.20251124214343-4fee1b0d8d1e h1:7pCncY3KcsAge1E1E9tYo1ZM2bcfsg7dJ4XLKraVmkI=
github.com/OpenLiberty/open-liberty-operator v0.8.1-0.20251124214343-4fee1b0d8d1e/go.mod h1:ghwA2Fvfq6YphR93lp8vKEJ7mLYT1+sEvI6re16Kn0c=
github.com/OpenLiberty/open-liberty-operator v0.8.1-0.20260219153907-af11c5cbb3c1 h1:NBjUzphdFgTZif5vqE5ywoN9sBy25JhL3vAg/jYJL+A=
github.com/OpenLiberty/open-liberty-operator v0.8.1-0.20260219153907-af11c5cbb3c1/go.mod h1:CB+RG8pXFsfQ9kYzbCyDDBmLekY1KDvyqOzDvRtDoU0=
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20251120112423-05f65c81aa36 h1:fweyU4TX3vSrbWecLy6FYjIgnoybPdoJbOiZsoV+iDw=
github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20251120112423-05f65c81aa36/go.mod h1:Hs5AbE9J+rLM34IAc75X7dtxnrzFg2AvG1XYLcX/ApU=
github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20260219135930-1ec2ade9b9fe h1:m4tVFVOSveGaJpPi39n6cwvZvZcypEj2lNhRd5CiviU=
github.com/application-stacks/runtime-component-operator v1.0.0-20220602-0850.0.20260219135930-1ec2ade9b9fe/go.mod h1:pmfannSJv1Tby0uSPXLPg3A+mC1WahsMJTNa2oU3SHk=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/semeru_compiler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,7 @@ func reconcileSemeruService(svc *corev1.Service, wlva *wlv1.WebSphereLibertyAppl
var timeout int32 = 86400
svc.Labels = getLabels(wlva)
svc.Spec.Selector = getSelectors(wlva)
utils.CustomizeServiceAnnotations(svc)
utils.CustomizeServiceAnnotations(svc, wlva.GetDisableTopology())
if len(svc.Spec.Ports) == 0 {
svc.Spec.Ports = append(svc.Spec.Ports, corev1.ServicePort{})
}
Expand Down
4 changes: 4 additions & 0 deletions internal/deploy/kubectl/websphereliberty-app-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5320,6 +5320,10 @@ spec:
certificate and CA to be mounted in the pod. The following keys
are valid in the secret: ca.crt, tls.crt, and tls.key.'
type: string
disableTopology:
description: Disables topology aware annotations from being added
to the Service. Defaults to false.
type: boolean
nodePort:
description: Node proxies this port into your service.
format: int32
Expand Down
4 changes: 4 additions & 0 deletions internal/deploy/kustomize/daily/base/websphere-liberty-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5320,6 +5320,10 @@ spec:
certificate and CA to be mounted in the pod. The following keys
are valid in the secret: ca.crt, tls.crt, and tls.key.'
type: string
disableTopology:
description: Disables topology aware annotations from being added
to the Service. Defaults to false.
type: boolean
nodePort:
description: Node proxies this port into your service.
format: int32
Expand Down