diff --git a/operator/apis/v1alpha4/multiclusterglobalhub_types.go b/operator/apis/v1alpha4/multiclusterglobalhub_types.go index e0b457441..44316ee1b 100644 --- a/operator/apis/v1alpha4/multiclusterglobalhub_types.go +++ b/operator/apis/v1alpha4/multiclusterglobalhub_types.go @@ -179,7 +179,7 @@ type PostgresConfig struct { // KafkaConfig defines the desired state of kafka type KafkaConfig struct { - // KafkaTopics specifies the desired topics. It can endup with '*' + // KafkaTopics specify the desired topics // +kubebuilder:default={"specTopic": "gh-spec", "statusTopic": "gh-event.*"} KafkaTopics KafkaTopics `json:"topics,omitempty"` @@ -188,17 +188,17 @@ type KafkaConfig struct { StorageSize string `json:"storageSize,omitempty"` } -// KafkaTopics is the transport topics for the manager and agent to communicate +// KafkaTopics is the transport topics for the manager and agent to communicate to one another type KafkaTopics struct { - // SpecTopic is the topic to distribute workload from global hub to managed hubs. The default value is "gh-spec" + // SpecTopic is the topic to distribute workloads from global hub to managed hubs. The default value is "gh-spec" // +kubebuilder:default="gh-spec" SpecTopic string `json:"specTopic,omitempty"` - // StatusTopic specifies the topic where an agent reports events and status updates to a manager. Specially, the topic - // can end up with an asterisk '*', indicating topics for individual managed hubs. - // For example: the default value is "gh-event.*" for the global hub built-in kafka. Thus, the topic for hub cluster - // named "hub1" whould be "gh-event.hub1". - // As for the BYO case, the default value is simply "gh-event" for all the managed hubs. + // StatusTopic specifies the topic where an agent reports events and status updates to a manager. + // Specifically, the topic can end up with an asterisk (*), indicating topics for individual managed hubs. + // For example: the default value is "gh-event.*" for the global hub built-in kafka. Therefore, the topic + // for the hub cluster named "hub1" would be "gh-event.hub1"; In the BYO case, the default value for all + // managed hubs is "gh-event" // +kubebuilder:default="gh-event.*" StatusTopic string `json:"statusTopic,omitempty"` } diff --git a/operator/bundle/manifests/multicluster-global-hub-operator.clusterserviceversion.yaml b/operator/bundle/manifests/multicluster-global-hub-operator.clusterserviceversion.yaml index 4d549abd9..0e5357d48 100644 --- a/operator/bundle/manifests/multicluster-global-hub-operator.clusterserviceversion.yaml +++ b/operator/bundle/manifests/multicluster-global-hub-operator.clusterserviceversion.yaml @@ -23,7 +23,7 @@ metadata: categories: Integration & Delivery,OpenShift Optional certified: "false" containerImage: quay.io/stolostron/multicluster-global-hub-operator:latest - createdAt: "2024-08-02T02:49:27Z" + createdAt: "2024-08-08T01:35:13Z" description: Manages the installation and upgrade of the Multicluster Global Hub. olm.skipRange: '>=1.2.0 <1.3.0' operatorframework.io/initialization-resource: '{"apiVersion":"operator.open-cluster-management.io/v1alpha4", diff --git a/operator/bundle/manifests/operator.open-cluster-management.io_multiclusterglobalhubs.yaml b/operator/bundle/manifests/operator.open-cluster-management.io_multiclusterglobalhubs.yaml index f8514ad33..d901b8f5e 100644 --- a/operator/bundle/manifests/operator.open-cluster-management.io_multiclusterglobalhubs.yaml +++ b/operator/bundle/manifests/operator.open-cluster-management.io_multiclusterglobalhubs.yaml @@ -266,12 +266,11 @@ spec: default: specTopic: gh-spec statusTopic: gh-event.* - description: KafkaTopics specifies the desired topics. It - can endup with '*' + description: KafkaTopics specify the desired topics properties: specTopic: default: gh-spec - description: SpecTopic is the topic to distribute workload + description: SpecTopic is the topic to distribute workloads from global hub to managed hubs. The default value is "gh-spec" type: string @@ -279,13 +278,13 @@ spec: default: gh-event.* description: 'StatusTopic specifies the topic where an agent reports events and status updates to a manager. - Specially, the topic can end up with an asterisk ''*'', - indicating topics for individual managed hubs. For example: - the default value is "gh-event.*" for the global hub - built-in kafka. Thus, the topic for hub cluster named - "hub1" whould be "gh-event.hub1". As for the BYO case, - the default value is simply "gh-event" for all the managed - hubs.' + Specifically, the topic can end up with an asterisk + (*), indicating topics for individual managed hubs. + For example: the default value is "gh-event.*" for the + global hub built-in kafka. Therefore, the topic for + the hub cluster named "hub1" would be "gh-event.hub1"; + In the BYO case, the default value for all managed hubs + is "gh-event"' type: string type: object type: object diff --git a/operator/config/crd/bases/operator.open-cluster-management.io_multiclusterglobalhubs.yaml b/operator/config/crd/bases/operator.open-cluster-management.io_multiclusterglobalhubs.yaml index eddef74d1..ad4ac74b6 100644 --- a/operator/config/crd/bases/operator.open-cluster-management.io_multiclusterglobalhubs.yaml +++ b/operator/config/crd/bases/operator.open-cluster-management.io_multiclusterglobalhubs.yaml @@ -266,12 +266,11 @@ spec: default: specTopic: gh-spec statusTopic: gh-event.* - description: KafkaTopics specifies the desired topics. It - can endup with '*' + description: KafkaTopics specify the desired topics properties: specTopic: default: gh-spec - description: SpecTopic is the topic to distribute workload + description: SpecTopic is the topic to distribute workloads from global hub to managed hubs. The default value is "gh-spec" type: string @@ -279,13 +278,13 @@ spec: default: gh-event.* description: 'StatusTopic specifies the topic where an agent reports events and status updates to a manager. - Specially, the topic can end up with an asterisk ''*'', - indicating topics for individual managed hubs. For example: - the default value is "gh-event.*" for the global hub - built-in kafka. Thus, the topic for hub cluster named - "hub1" whould be "gh-event.hub1". As for the BYO case, - the default value is simply "gh-event" for all the managed - hubs.' + Specifically, the topic can end up with an asterisk + (*), indicating topics for individual managed hubs. + For example: the default value is "gh-event.*" for the + global hub built-in kafka. Therefore, the topic for + the hub cluster named "hub1" would be "gh-event.hub1"; + In the BYO case, the default value for all managed hubs + is "gh-event"' type: string type: object type: object