Skip to content

Commit 66f9203

Browse files
amoralejopenshift-merge-bot[bot]
authored andcommitted
Remove route creation from the watcher-operator
This is part of the integration in the OpenStack Operator. Once integrated on it, the route will be managed by it so we need to get rid of all the logic existing in the operator for it and the apiOverride parameter which was intended to pass all the parameters required for the Watcher controller to manage it. This patch is also adjusting functional and kuttl tests and ci deployment files for it. Jira: OSPRH-16238
1 parent 4091039 commit 66f9203

37 files changed

Lines changed: 152 additions & 1605 deletions

api/bases/watcher.openstack.org_watchers.yaml

Lines changed: 0 additions & 267 deletions
Large diffs are not rendered by default.

api/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ require (
3535
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3636
github.com/modern-go/reflect2 v1.0.2 // indirect
3737
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
38-
github.com/openshift/api v3.9.0+incompatible // indirect
3938
github.com/pkg/errors v0.9.1 // indirect
4039
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
4140
github.com/prometheus/client_golang v1.19.0 // indirect

api/go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ github.com/onsi/ginkgo/v2 v2.20.1 h1:YlVIbqct+ZmnEph770q9Q7NVAz4wwIiVNahee6JyUzo
7373
github.com/onsi/ginkgo/v2 v2.20.1/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI=
7474
github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
7575
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
76-
github.com/openshift/api v3.9.0+incompatible h1:fJ/KsefYuZAjmrr3+5U9yZIZbTOpVkDDLDLFresAeYs=
77-
github.com/openshift/api v3.9.0+incompatible/go.mod h1:dh9o4Fs58gpFXGSYfnVxGR9PnV53I8TW84pQaJDdGiY=
7876
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250630125044-4cb24968c1a6 h1:L5xl8ocn3DqAuRF26dbh+FWKAjWC+Oc1MqmERTFseLM=
7977
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250630125044-4cb24968c1a6/go.mod h1:HMeEFVPJOatbQQc4XcpVrF6BpCEOEq9EPG9jSxcyQXw=
8078
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250605082218-a58074898dd7 h1:bx5LfMQHLnYE3QvY8aRXHVfgTwDROnTqH96UL84a9Mw=

api/v1beta1/common_types.go

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ limitations under the License.
1717
package v1beta1
1818

1919
import (
20-
"github.com/openstack-k8s-operators/lib-common/modules/common/route"
2120
"github.com/openstack-k8s-operators/lib-common/modules/common/util"
2221

2322
topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
@@ -119,37 +118,11 @@ type WatcherSpecCore struct {
119118
// DecisionEngineServiceTemplate - define the watcher-decision-engine service
120119
DecisionEngineServiceTemplate WatcherDecisionEngineTemplate `json:"decisionengineServiceTemplate"`
121120

122-
// +kubebuilder:validation:Optional
123-
// +operator-sdk:csv:customresourcedefinitions:type=spec
124-
// APIOverride, provides the ability to override the generated
125-
// manifest of several child resources.
126-
APIOverride Override `json:"apiOverride,omitempty"`
127-
128121
// +kubebuilder:validation:Optional
129122
// DBPurge defines the parameters for the Watcher DB purging cron job
130123
DBPurge WatcherDBPurge `json:"dbPurge"`
131124
}
132125

133-
type Override struct {
134-
// +kubebuilder:validation:Optional
135-
// Route overrides to use when creating the public service endpoint
136-
Route *route.OverrideSpec `json:"route,omitempty"`
137-
138-
// +kubebuilder:validation:Optional
139-
// +operator-sdk:csv:customresourcedefinitions:type=spec
140-
// TLS - overrides tls parameters for public endpoint
141-
TLS *TLSServiceOverride `json:"tls,omitempty"`
142-
}
143-
144-
// TLSServiceOverride overrides tls parameters for public endpoint
145-
type TLSServiceOverride struct {
146-
// +kubebuilder:validation:Optional
147-
// Name of a Secret in the same Namespace as the service, containing the server's private key, public certificate
148-
// and CA certificate for TLS.
149-
// The Secret must store these as tls.key, tls.crt and ca.crt respectively.
150-
SecretName string `json:"secretName,omitempty"`
151-
}
152-
153126
// PasswordSelector to identify the DB and AdminUser password from the Secret
154127
type PasswordSelector struct {
155128
// +kubebuilder:validation:Optional

api/v1beta1/zz_generated.deepcopy.go

Lines changed: 0 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/watcher_v1beta1_watcher_tlse.yaml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,6 @@ spec:
2020
---
2121
apiVersion: cert-manager.io/v1
2222
kind: Certificate
23-
metadata:
24-
name: watcher-public-route
25-
spec:
26-
dnsNames:
27-
- watcher-public-openstack.apps-crc.testing
28-
issuerRef:
29-
group: cert-manager.io
30-
kind: Issuer
31-
name: rootca-public
32-
secretName: cert-watcher-public-route
33-
usages:
34-
- key encipherment
35-
- digital signature
36-
- server auth
37-
---
38-
apiVersion: cert-manager.io/v1
39-
kind: Certificate
4023
metadata:
4124
name: watcher-public-svc
4225
spec:
@@ -60,14 +43,7 @@ metadata:
6043
name: watcher
6144
spec:
6245
databaseInstance: "openstack"
63-
apiOverride:
64-
tls:
65-
secretName: cert-watcher-public-route
6646
apiServiceTemplate:
67-
override:
68-
service:
69-
public:
70-
endpointURL: https://watcher-public-openstack.apps-crc.testing
7147
tls:
7248
caBundleSecretName: "combined-ca-bundle"
7349
api:

0 commit comments

Comments
 (0)