Skip to content

Commit 8705e48

Browse files
authored
docs(bridge): doc renaming updates (#12146)
Signed-off-by: prmellor <pmellor@redhat.com>
1 parent ca842a9 commit 8705e48

46 files changed

Lines changed: 195 additions & 195 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridge.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@ public KafkaBridge(KafkaBridgeSpec spec, KafkaBridgeStatus status) {
111111
}
112112

113113
@Override
114-
@Description("The specification of the Kafka Bridge.")
114+
@Description("The specification of the HTTP Bridge.")
115115
@RequiredInVersions("v1+")
116116
public KafkaBridgeSpec getSpec() {
117117
return super.getSpec();
118118
}
119119

120120
@Override
121-
@Description("The status of the Kafka Bridge.")
121+
@Description("The status of the HTTP Bridge.")
122122
public KafkaBridgeStatus getStatus() {
123123
return super.getStatus();
124124
}

api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeSpec.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void setReplicas(int replicas) {
8989
description = "The `enableMetrics` configuration is deprecated and will be removed in the future.")
9090
@PresentInVersions("v1beta2")
9191
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
92-
@Description("Enable the metrics for the Kafka Bridge. Default is false.")
92+
@Description("Enable the metrics for the HTTP Bridge. Default is false.")
9393
public Boolean getEnableMetrics() {
9494
return enableMetrics;
9595
}
@@ -110,7 +110,7 @@ public void setMetricsConfig(MetricsConfig metricsConfig) {
110110
this.metricsConfig = metricsConfig;
111111
}
112112

113-
@Description("Logging configuration for Kafka Bridge.")
113+
@Description("Logging configuration for HTTP Bridge.")
114114
@JsonInclude(value = JsonInclude.Include.NON_NULL)
115115
@Override
116116
public Logging getLogging() {
@@ -154,7 +154,7 @@ public void setAuthentication(KafkaClientAuthentication authentication) {
154154
this.authentication = authentication;
155155
}
156156

157-
@Description("TLS configuration for connecting Kafka Bridge to the cluster.")
157+
@Description("TLS configuration for connecting HTTP Bridge to the cluster.")
158158
@JsonInclude(JsonInclude.Include.NON_NULL)
159159
public ClientTls getTls() {
160160
return tls;
@@ -214,7 +214,7 @@ public void setHttp(KafkaBridgeHttpConfig http) {
214214
this.http = http;
215215
}
216216

217-
@Description("The container image used for Kafka Bridge pods. "
217+
@Description("The container image used for HTTP Bridge pods. "
218218
+ "If no image name is explicitly specified, the image name corresponds to the image specified in the Cluster Operator configuration. "
219219
+ "If an image name is not defined in the Cluster Operator configuration, a default value is used.")
220220
@JsonInclude(JsonInclude.Include.NON_DEFAULT)
@@ -226,7 +226,7 @@ public void setImage(String image) {
226226
this.image = image;
227227
}
228228

229-
@Description("Template for Kafka Bridge resources. " +
229+
@Description("Template for HTTP Bridge resources. " +
230230
"The template allows users to specify how a `Deployment` and `Pod` is generated.")
231231
@JsonInclude(JsonInclude.Include.NON_EMPTY)
232232
public KafkaBridgeTemplate getTemplate() {
@@ -258,7 +258,7 @@ public void setReadinessProbe(Probe readinessProbe) {
258258
}
259259

260260
@JsonInclude(JsonInclude.Include.NON_NULL)
261-
@Description("The configuration of tracing in Kafka Bridge.")
261+
@Description("The configuration of tracing in HTTP Bridge.")
262262
public Tracing getTracing() {
263263
return tracing;
264264
}

api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeStatus.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class KafkaBridgeStatus extends Status {
2929
private int replicas;
3030
private String labelSelector;
3131

32-
@Description("The URL at which external client applications can access the Kafka Bridge.")
32+
@Description("The URL at which external client applications can access the HTTP Bridge.")
3333
public String getUrl() {
3434
return url;
3535
}

api/src/main/java/io/strimzi/api/kafka/model/bridge/KafkaBridgeTemplate.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class KafkaBridgeTemplate implements UnknownPropertyPreserving {
4444
private ResourceTemplate serviceAccount;
4545
private Map<String, Object> additionalProperties;
4646

47-
@Description("Template for Kafka Bridge `Deployment`.")
47+
@Description("Template for HTTP Bridge `Deployment`.")
4848
@JsonInclude(JsonInclude.Include.NON_EMPTY)
4949
public DeploymentTemplate getDeployment() {
5050
return deployment;
@@ -54,7 +54,7 @@ public void setDeployment(DeploymentTemplate deployment) {
5454
this.deployment = deployment;
5555
}
5656

57-
@Description("Template for Kafka Bridge `Pods`.")
57+
@Description("Template for HTTP Bridge `Pods`.")
5858
@JsonInclude(JsonInclude.Include.NON_EMPTY)
5959
public PodTemplate getPod() {
6060
return pod;
@@ -64,7 +64,7 @@ public void setPod(PodTemplate pod) {
6464
this.pod = pod;
6565
}
6666

67-
@Description("Template for Kafka Bridge API `Service`.")
67+
@Description("Template for HTTP Bridge API `Service`.")
6868
@JsonInclude(JsonInclude.Include.NON_EMPTY)
6969
public InternalServiceTemplate getApiService() {
7070
return apiService;
@@ -74,7 +74,7 @@ public void setApiService(InternalServiceTemplate apiService) {
7474
this.apiService = apiService;
7575
}
7676

77-
@Description("Template for Kafka Bridge `PodDisruptionBudget`.")
77+
@Description("Template for HTTP Bridge `PodDisruptionBudget`.")
7878
@JsonInclude(JsonInclude.Include.NON_EMPTY)
7979
public PodDisruptionBudgetTemplate getPodDisruptionBudget() {
8080
return podDisruptionBudget;
@@ -84,7 +84,7 @@ public void setPodDisruptionBudget(PodDisruptionBudgetTemplate podDisruptionBudg
8484
this.podDisruptionBudget = podDisruptionBudget;
8585
}
8686

87-
@Description("Template for the Kafka Bridge container")
87+
@Description("Template for the HTTP Bridge container")
8888
@JsonInclude(JsonInclude.Include.NON_EMPTY)
8989
public ContainerTemplate getBridgeContainer() {
9090
return bridgeContainer;
@@ -94,7 +94,7 @@ public void setBridgeContainer(ContainerTemplate bridgeContainer) {
9494
this.bridgeContainer = bridgeContainer;
9595
}
9696

97-
@Description("Template for the Kafka Bridge init container")
97+
@Description("Template for the HTTP Bridge init container")
9898
@JsonInclude(JsonInclude.Include.NON_EMPTY)
9999
public ContainerTemplate getInitContainer() {
100100
return initContainer;
@@ -104,7 +104,7 @@ public void setInitContainer(ContainerTemplate initContainer) {
104104
this.initContainer = initContainer;
105105
}
106106

107-
@Description("Template for the Kafka Bridge ClusterRoleBinding.")
107+
@Description("Template for the HTTP Bridge ClusterRoleBinding.")
108108
@JsonInclude(JsonInclude.Include.NON_EMPTY)
109109
public ResourceTemplate getClusterRoleBinding() {
110110
return clusterRoleBinding;
@@ -114,7 +114,7 @@ public void setClusterRoleBinding(ResourceTemplate clusterRoleBinding) {
114114
this.clusterRoleBinding = clusterRoleBinding;
115115
}
116116

117-
@Description("Template for the Kafka Bridge service account.")
117+
@Description("Template for the HTTP Bridge service account.")
118118
@JsonInclude(JsonInclude.Include.NON_EMPTY)
119119
public ResourceTemplate getServiceAccount() {
120120
return serviceAccount;

api/src/test/resources/crds/v1/046-Crd-kafkabridge.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ spec:
6464
description: The number of pods in the `Deployment`. Required in the `v1` version of the Strimzi API. Defaults to `1` in the `v1beta2` version of the Strimzi API.
6565
image:
6666
type: string
67-
description: "The container image used for Kafka Bridge pods. If no image name is explicitly specified, the image name corresponds to the image specified in the Cluster Operator configuration. If an image name is not defined in the Cluster Operator configuration, a default value is used."
67+
description: "The container image used for HTTP Bridge pods. If no image name is explicitly specified, the image name corresponds to the image specified in the Cluster Operator configuration. If an image name is not defined in the Cluster Operator configuration, a default value is used."
6868
bootstrapServers:
6969
type: string
7070
description: A list of host:port pairs for establishing the initial connection to the Kafka cluster.
@@ -97,7 +97,7 @@ spec:
9797
required:
9898
- secretName
9999
description: Trusted certificates for TLS connection.
100-
description: TLS configuration for connecting Kafka Bridge to the cluster.
100+
description: TLS configuration for connecting HTTP Bridge to the cluster.
101101
authentication:
102102
type: object
103103
properties:
@@ -302,7 +302,7 @@ spec:
302302
description: '`ConfigMap` entry where the logging configuration is stored. '
303303
required:
304304
- type
305-
description: Logging configuration for Kafka Bridge.
305+
description: Logging configuration for HTTP Bridge.
306306
clientRackInitImage:
307307
type: string
308308
description: The image of the init container used for initializing the `client.rack`.
@@ -428,7 +428,7 @@ spec:
428428
- RollingUpdate
429429
- Recreate
430430
description: Pod replacement strategy for deployment configuration changes. Valid values are `RollingUpdate` and `Recreate`. Defaults to `RollingUpdate`.
431-
description: Template for Kafka Bridge `Deployment`.
431+
description: Template for HTTP Bridge `Deployment`.
432432
pod:
433433
type: object
434434
properties:
@@ -1073,7 +1073,7 @@ spec:
10731073
csi: {}
10741074
image: {}
10751075
description: Additional volumes that can be mounted to the pod.
1076-
description: Template for Kafka Bridge `Pods`.
1076+
description: Template for HTTP Bridge `Pods`.
10771077
apiService:
10781078
type: object
10791079
properties:
@@ -1106,7 +1106,7 @@ spec:
11061106
- IPv4
11071107
- IPv6
11081108
description: "Specifies the IP Families used by the service. Available options are `IPv4` and `IPv6`. If unspecified, Kubernetes will choose the default value based on the `ipFamilyPolicy` setting."
1109-
description: Template for Kafka Bridge API `Service`.
1109+
description: Template for HTTP Bridge API `Service`.
11101110
podDisruptionBudget:
11111111
type: object
11121112
properties:
@@ -1128,7 +1128,7 @@ spec:
11281128
type: integer
11291129
minimum: 0
11301130
description: "Maximum number of unavailable pods to allow automatic Pod eviction. A Pod eviction is allowed when the `maxUnavailable` number of pods or fewer are unavailable after the eviction. Setting this value to 0 prevents all voluntary evictions, so the pods must be evicted manually. Defaults to 1."
1131-
description: Template for Kafka Bridge `PodDisruptionBudget`.
1131+
description: Template for HTTP Bridge `PodDisruptionBudget`.
11321132
bridgeContainer:
11331133
type: object
11341134
properties:
@@ -1271,7 +1271,7 @@ spec:
12711271
subPathExpr:
12721272
type: string
12731273
description: Additional volume mounts which should be applied to the container.
1274-
description: Template for the Kafka Bridge container.
1274+
description: Template for the HTTP Bridge container.
12751275
clusterRoleBinding:
12761276
type: object
12771277
properties:
@@ -1289,7 +1289,7 @@ spec:
12891289
type: object
12901290
description: Annotations added to the Kubernetes resource.
12911291
description: Metadata applied to the resource.
1292-
description: Template for the Kafka Bridge ClusterRoleBinding.
1292+
description: Template for the HTTP Bridge ClusterRoleBinding.
12931293
serviceAccount:
12941294
type: object
12951295
properties:
@@ -1307,7 +1307,7 @@ spec:
13071307
type: object
13081308
description: Annotations added to the Kubernetes resource.
13091309
description: Metadata applied to the resource.
1310-
description: Template for the Kafka Bridge service account.
1310+
description: Template for the HTTP Bridge service account.
13111311
initContainer:
13121312
type: object
13131313
properties:
@@ -1450,8 +1450,8 @@ spec:
14501450
subPathExpr:
14511451
type: string
14521452
description: Additional volume mounts which should be applied to the container.
1453-
description: Template for the Kafka Bridge init container.
1454-
description: Template for Kafka Bridge resources. The template allows users to specify how a `Deployment` and `Pod` is generated.
1453+
description: Template for the HTTP Bridge init container.
1454+
description: Template for HTTP Bridge resources. The template allows users to specify how a `Deployment` and `Pod` is generated.
14551455
tracing:
14561456
type: object
14571457
properties:
@@ -1462,11 +1462,11 @@ spec:
14621462
description: "Type of the tracing used. Currently the only supported type is `opentelemetry` for OpenTelemetry tracing. As of Strimzi 0.37.0, `jaeger` type is not supported anymore and this option is ignored."
14631463
required:
14641464
- type
1465-
description: The configuration of tracing in Kafka Bridge.
1465+
description: The configuration of tracing in HTTP Bridge.
14661466
required:
14671467
- replicas
14681468
- bootstrapServers
1469-
description: The specification of the Kafka Bridge.
1469+
description: The specification of the HTTP Bridge.
14701470
status:
14711471
type: object
14721472
properties:
@@ -1496,13 +1496,13 @@ spec:
14961496
description: The generation of the CRD that was last reconciled by the operator.
14971497
url:
14981498
type: string
1499-
description: The URL at which external client applications can access the Kafka Bridge.
1499+
description: The URL at which external client applications can access the HTTP Bridge.
15001500
replicas:
15011501
type: integer
15021502
description: The current number of pods being used to provide this resource.
15031503
labelSelector:
15041504
type: string
15051505
description: Label selector for pods providing this resource.
1506-
description: The status of the Kafka Bridge.
1506+
description: The status of the HTTP Bridge.
15071507
required:
15081508
- spec

documentation/api/io.strimzi.api.kafka.model.bridge.KafkaBridgeConsumerSpec.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
:_mod-docs-content-type: CONCEPT
22

3-
Configures consumer options for the Kafka Bridge.
3+
Configures consumer options for the HTTP Bridge.
44

5-
.Example Kafka Bridge consumer configuration
5+
.Example HTTP Bridge consumer configuration
66
[source,yaml,subs="attributes+"]
77
----
88
apiVersion: {KafkaBridgeApiVersion}
@@ -47,10 +47,10 @@ Properties with the following prefixes cannot be set:
4747
* `ssl.`
4848
4949
If the `config` property contains an option that cannot be changed, it is disregarded, and a warning message is logged to the Cluster Operator log file.
50-
All other supported options are forwarded to Kafka Bridge, including the following exceptions to the options configured by Strimzi:
50+
All other supported options are forwarded to HTTP Bridge, including the following exceptions to the options configured by Strimzi:
5151

5252
* Any `ssl` configuration for xref:con-common-configuration-ssl-reference[supported TLS versions and cipher suites]
5353
5454
IMPORTANT: The Cluster Operator does not validate keys or values in the `config` object.
55-
If an invalid configuration is provided, the Kafka Bridge deployment might not start or might become unstable.
56-
In this case, fix the configuration so that the Cluster Operator can roll out the new configuration to all Kafka Bridge nodes.
55+
If an invalid configuration is provided, the HTTP Bridge deployment might not start or might become unstable.
56+
In this case, fix the configuration so that the Cluster Operator can roll out the new configuration to all HTTP Bridge nodes.

documentation/api/io.strimzi.api.kafka.model.bridge.KafkaBridgeHttpConfig.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
:_mod-docs-content-type: CONCEPT
22

3-
Configures HTTP access to a Kafka cluster for the Kafka Bridge.
4-
The default HTTP configuration is for the Kafka Bridge to listen on port 8080.
3+
Configures HTTP access to a Kafka cluster for the HTTP Bridge.
4+
The default HTTP configuration is for the HTTP Bridge to listen on port 8080.
55

6-
.Example Kafka Bridge HTTP configuration
6+
.Example HTTP Bridge HTTP configuration
77
[source,yaml,subs="attributes+"]
88
----
99
apiVersion: {KafkaBridgeApiVersion}
@@ -20,7 +20,7 @@ spec:
2020
# ...
2121
----
2222

23-
As well as enabling HTTP access to a Kafka cluster, HTTP properties provide the capability to enable and define access control for the Kafka Bridge through Cross-Origin Resource Sharing (CORS).
23+
As well as enabling HTTP access to a Kafka cluster, HTTP properties provide the capability to enable and define access control for the HTTP Bridge through Cross-Origin Resource Sharing (CORS).
2424
CORS is a HTTP mechanism that allows browser access to selected resources from more than one origin.
2525
To configure CORS, you define a list of allowed resource origins and HTTP access methods.
2626
For the origins, you can use a URL or a Java regular expression.

documentation/api/io.strimzi.api.kafka.model.bridge.KafkaBridgeProducerSpec.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
:_mod-docs-content-type: CONCEPT
22

3-
Configures producer options for the Kafka Bridge.
3+
Configures producer options for the HTTP Bridge.
44

5-
.Example Kafka Bridge producer configuration
5+
.Example HTTP Bridge producer configuration
66
[source,yaml,subs="attributes+"]
77
----
88
apiVersion: {KafkaBridgeApiVersion}
@@ -45,10 +45,10 @@ Properties with the following prefixes cannot be set:
4545
* `ssl.`
4646
4747
If the `config` property contains an option that cannot be changed, it is disregarded, and a warning message is logged to the Cluster Operator log file.
48-
All other supported options are forwarded to Kafka Bridge, including the following exceptions to the options configured by Strimzi:
48+
All other supported options are forwarded to HTTP Bridge, including the following exceptions to the options configured by Strimzi:
4949

5050
* Any `ssl` configuration for xref:con-common-configuration-ssl-reference[supported TLS versions and cipher suites]
5151
5252
IMPORTANT: The Cluster Operator does not validate the keys or values of `config` properties.
53-
If an invalid configuration is provided, the Kafka Bridge deployment might not start or might become unstable.
54-
In this case, fix the configuration so that the Cluster Operator can roll out the new configuration to all Kafka Bridge nodes.
53+
If an invalid configuration is provided, the HTTP Bridge deployment might not start or might become unstable.
54+
In this case, fix the configuration so that the Cluster Operator can roll out the new configuration to all HTTP Bridge nodes.

documentation/api/io.strimzi.api.kafka.model.bridge.KafkaBridgeSpec.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:_mod-docs-content-type: CONCEPT
22

3-
Configures a Kafka Bridge cluster.
3+
Configures a HTTP Bridge cluster.
44

55
Configuration options relate to:
66

@@ -13,7 +13,7 @@ Configuration options relate to:
1313
[id='property-http-bridge-logging-{context}']
1414
= Logging
1515

16-
Kafka Bridge has its own preconfigured loggers:
16+
HTTP Bridge has its own preconfigured loggers:
1717

1818
[cols="1m,2,1",options="header"]
1919
|===
@@ -76,7 +76,7 @@ spec:
7676
# ...
7777
----
7878

79-
Kafka Bridge uses the Apache `log4j2` logger implementation.
79+
HTTP Bridge uses the Apache `log4j2` logger implementation.
8080
Use the `logging` property to configure loggers and logger levels.
8181

8282
You can set log levels using either the `inline` or `external` logging configuration types.

0 commit comments

Comments
 (0)