Skip to content

Commit 9f78d85

Browse files
amoralejopenshift-merge-bot[bot]
authored andcommitted
Rename WatcherTemplate to WatcherSpecCore
To be consistent with the convention in openstack operators to be integrated in the openstack-operator. Note that, the content of the struct is exactly what we need to import inside the watcher template definition for the control plane, which is the entire CRD struct except the images part which come from the openstackversion object. Currently, it has some content related to route definition which will be removed before integrating it into the openstack-operator. Jira: https://issues.redhat.com/browse/OSPRH-16235
1 parent a0c3768 commit 9f78d85

3 files changed

Lines changed: 35 additions & 35 deletions

File tree

api/v1beta1/common_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ type WatcherCommon struct {
7777
TopologyRef *topologyv1.TopoRef `json:"topologyRef,omitempty"`
7878
}
7979

80-
// WatcherTemplate defines the fields used in the top level CR
81-
type WatcherTemplate struct {
80+
// WatcherSpecCore defines the fields used from the OpenStackControlPlane CR (does not include images)
81+
type WatcherSpecCore struct {
8282
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
8383
// Important: Run "make" to regenerate code after modifying this file
8484
WatcherCommon `json:",inline"`

api/v1beta1/watcher_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ type WatcherSpec struct {
3131
// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
3232
// Important: Run "make" to regenerate code after modifying this file
3333

34-
WatcherTemplate `json:",inline"`
34+
WatcherSpecCore `json:",inline"`
3535

3636
WatcherImages `json:",inline"`
3737
}

api/v1beta1/zz_generated.deepcopy.go

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

0 commit comments

Comments
 (0)