Skip to content

Commit a7134da

Browse files
sbernauersbernauer
committed
Rename celeryResultBackend -> ResultBackend and celeryBroker -> broker
1 parent fda8025 commit a7134da

20 files changed

Lines changed: 166 additions & 166 deletions

File tree

‎docs/modules/airflow/examples/example-airflow-incluster.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ spec:
2929
envOverrides: *envOverrides
3030
replicas: 1
3131
celeryExecutors:
32-
celeryResultBackend:
32+
resultBackend:
3333
postgresql:
3434
host: airflow-postgresql
3535
database: airflow
3636
credentialsSecretName: airflow-postgresql-credentials
37-
celeryBroker:
37+
broker:
3838
redis:
3939
host: airflow-redis-master
4040
credentialsSecretName: airflow-redis-credentials

‎docs/modules/airflow/examples/getting_started/code/airflow.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ spec:
2323
default:
2424
replicas: 1
2525
celeryExecutors:
26-
celeryResultBackend:
26+
resultBackend:
2727
postgresql:
2828
host: airflow-postgresql
2929
database: airflow
3030
credentialsSecretName: airflow-postgresql-credentials
31-
celeryBroker:
31+
broker:
3232
redis:
3333
host: airflow-redis-master
3434
credentialsSecretName: airflow-redis-credentials

‎docs/modules/airflow/pages/getting_started/first_steps.adoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ Where:
6666
* `spec.celeryExecutors`: deploy executors managed by Airflow's Celery engine.
6767
Alternatively you can use `kuberenetesExectors` that use Airflow's Kubernetes engine for executor management.
6868
For more information see https://airflow.apache.org/docs/apache-airflow/stable/executor/index.html#executor-types).
69-
* `spec.celeryExecutors.celeryResultBackend`: specifies one of the supported database types (in this case, `postgresql`) along with references to the host, database and the secret containing the connection credentials.
70-
* `spec.celeryExecutors.celeryBroker`: specifies one of the supported queue/broker types (in this case, `redis`) along with references to the host and the secret containing the connection credentials.
69+
* `spec.celeryExecutors.resultBackend`: specifies one of the supported database types (in this case, `postgresql`) along with references to the host, database and the secret containing the connection credentials.
70+
* `spec.celeryExecutors.broker`: specifies one of the supported queue/broker types (in this case, `redis`) along with references to the host and the secret containing the connection credentials.
7171
* `spec.clusterConfig.loadExamples`: this key is optional and defaults to `false`.
7272
It is set to `true` here as the example DAGs are used when verifying the installation.
7373
* `spec.clusterConfig.exposeConfig`: this key is optional and defaults to `false`.

‎docs/modules/airflow/pages/usage-guide/database-connections.adoc‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ spec:
2020
<2> A reference to a Secret which must contain the two fields `username` and `password`.
2121

2222
The queue/broker metadata and URL is only needed when running the celery executor.
23-
The `celeryResultBackend` definition uses the same structure as `metadataDatabase` shown above.
24-
The `celeryBroker` definition is similar but does not require a `databaseName`.
23+
The `resultBackend` definition uses the same structure as `metadataDatabase` shown above.
24+
The `broker` definition requires Redis connection details.
2525

2626
[source,yaml]
2727
----
2828
spec:
2929
celeryExecutors:
30-
celeryResultBackend:
30+
resultBackend:
3131
postgresql: # <1>
3232
host: airflow-postgresql
3333
database: airflow
3434
credentialsSecretName: airflow-postgresql-credentials # <2>
35-
celeryBroker:
35+
broker:
3636
redis: # <3>
3737
host: airflow-redis-master
3838
credentialsSecretName: airflow-redis-credentials # <2>
@@ -57,10 +57,10 @@ spec:
5757
[source,yaml]
5858
----
5959
spec:
60-
celeryResultBackend:
60+
resultBackend:
6161
generic:
6262
connectionUrlSecretName: postgresql-celery # <2>
63-
celeryBroker:
63+
broker:
6464
generic:
6565
connectionUrlSecretName: redis-celery # <3>
6666
----

‎extra/crds.yaml‎

Lines changed: 124 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
The celery executor.
4040
Deployed with an explicit number of replicas.
4141
properties:
42-
celeryBroker:
42+
broker:
4343
description: Connection information for the celery broker queue.
4444
oneOf:
4545
- required:
@@ -99,65 +99,6 @@ spec:
9999
- host
100100
type: object
101101
type: object
102-
celeryResultBackend:
103-
description: Connection information for the celery backend database.
104-
oneOf:
105-
- required:
106-
- postgresql
107-
- required:
108-
- generic
109-
properties:
110-
generic:
111-
description: |-
112-
A generic Celery database connection for broker or result backend types not covered by a
113-
dedicated variant.
114-
115-
Use this when you need a Celery-compatible connection that does not have a first-class
116-
connection type. The complete connection URL is read from a Secret, giving the user full
117-
control over the connection string.
118-
properties:
119-
connectionUrlSecretName:
120-
description: The name of the Secret that contains an `connectionUrl` key with the complete Celery URL.
121-
type: string
122-
required:
123-
- connectionUrlSecretName
124-
type: object
125-
postgresql:
126-
description: Connection settings for a [PostgreSQL](https://www.postgresql.org/) database.
127-
properties:
128-
credentialsSecretName:
129-
description: |-
130-
Name of a Secret containing the `username` and `password` keys used to authenticate
131-
against the PostgreSQL server.
132-
type: string
133-
database:
134-
description: Name of the database (schema) to connect to.
135-
type: string
136-
host:
137-
description: Hostname or IP address of the PostgreSQL server.
138-
type: string
139-
parameters:
140-
additionalProperties:
141-
type: string
142-
default: {}
143-
description: |-
144-
Additional map of JDBC connection parameters to append to the connection URL. The given
145-
`HashMap<String, String>` will be converted to query parameters in the form of
146-
`?param1=value1&param2=value2`.
147-
type: object
148-
port:
149-
default: 5432
150-
description: Port the PostgreSQL server is listening on. Defaults to `5432`.
151-
format: uint16
152-
maximum: 65535.0
153-
minimum: 0.0
154-
type: integer
155-
required:
156-
- credentialsSecretName
157-
- database
158-
- host
159-
type: object
160-
type: object
161102
cliOverrides:
162103
additionalProperties:
163104
type: string
@@ -634,6 +575,65 @@ spec:
634575
for more information.
635576
type: object
636577
x-kubernetes-preserve-unknown-fields: true
578+
resultBackend:
579+
description: Connection information for the celery backend database.
580+
oneOf:
581+
- required:
582+
- postgresql
583+
- required:
584+
- generic
585+
properties:
586+
generic:
587+
description: |-
588+
A generic Celery database connection for broker or result backend types not covered by a
589+
dedicated variant.
590+
591+
Use this when you need a Celery-compatible connection that does not have a first-class
592+
connection type. The complete connection URL is read from a Secret, giving the user full
593+
control over the connection string.
594+
properties:
595+
connectionUrlSecretName:
596+
description: The name of the Secret that contains an `connectionUrl` key with the complete Celery URL.
597+
type: string
598+
required:
599+
- connectionUrlSecretName
600+
type: object
601+
postgresql:
602+
description: Connection settings for a [PostgreSQL](https://www.postgresql.org/) database.
603+
properties:
604+
credentialsSecretName:
605+
description: |-
606+
Name of a Secret containing the `username` and `password` keys used to authenticate
607+
against the PostgreSQL server.
608+
type: string
609+
database:
610+
description: Name of the database (schema) to connect to.
611+
type: string
612+
host:
613+
description: Hostname or IP address of the PostgreSQL server.
614+
type: string
615+
parameters:
616+
additionalProperties:
617+
type: string
618+
default: {}
619+
description: |-
620+
Additional map of JDBC connection parameters to append to the connection URL. The given
621+
`HashMap<String, String>` will be converted to query parameters in the form of
622+
`?param1=value1&param2=value2`.
623+
type: object
624+
port:
625+
default: 5432
626+
description: Port the PostgreSQL server is listening on. Defaults to `5432`.
627+
format: uint16
628+
maximum: 65535.0
629+
minimum: 0.0
630+
type: integer
631+
required:
632+
- credentialsSecretName
633+
- database
634+
- host
635+
type: object
636+
type: object
637637
roleConfig:
638638
default:
639639
podDisruptionBudget:
@@ -1161,8 +1161,8 @@ spec:
11611161
type: object
11621162
type: object
11631163
required:
1164-
- celeryBroker
1165-
- celeryResultBackend
1164+
- broker
1165+
- resultBackend
11661166
- roleGroups
11671167
type: object
11681168
clusterConfig:
@@ -6222,7 +6222,7 @@ spec:
62226222
The celery executor.
62236223
Deployed with an explicit number of replicas.
62246224
properties:
6225-
celeryBroker:
6225+
broker:
62266226
description: Connection information for the celery broker queue.
62276227
oneOf:
62286228
- required:
@@ -6282,65 +6282,6 @@ spec:
62826282
- host
62836283
type: object
62846284
type: object
6285-
celeryResultBackend:
6286-
description: Connection information for the celery backend database.
6287-
oneOf:
6288-
- required:
6289-
- postgresql
6290-
- required:
6291-
- generic
6292-
properties:
6293-
generic:
6294-
description: |-
6295-
A generic Celery database connection for broker or result backend types not covered by a
6296-
dedicated variant.
6297-
6298-
Use this when you need a Celery-compatible connection that does not have a first-class
6299-
connection type. The complete connection URL is read from a Secret, giving the user full
6300-
control over the connection string.
6301-
properties:
6302-
connectionUrlSecretName:
6303-
description: The name of the Secret that contains an `connectionUrl` key with the complete Celery URL.
6304-
type: string
6305-
required:
6306-
- connectionUrlSecretName
6307-
type: object
6308-
postgresql:
6309-
description: Connection settings for a [PostgreSQL](https://www.postgresql.org/) database.
6310-
properties:
6311-
credentialsSecretName:
6312-
description: |-
6313-
Name of a Secret containing the `username` and `password` keys used to authenticate
6314-
against the PostgreSQL server.
6315-
type: string
6316-
database:
6317-
description: Name of the database (schema) to connect to.
6318-
type: string
6319-
host:
6320-
description: Hostname or IP address of the PostgreSQL server.
6321-
type: string
6322-
parameters:
6323-
additionalProperties:
6324-
type: string
6325-
default: {}
6326-
description: |-
6327-
Additional map of JDBC connection parameters to append to the connection URL. The given
6328-
`HashMap<String, String>` will be converted to query parameters in the form of
6329-
`?param1=value1&param2=value2`.
6330-
type: object
6331-
port:
6332-
default: 5432
6333-
description: Port the PostgreSQL server is listening on. Defaults to `5432`.
6334-
format: uint16
6335-
maximum: 65535.0
6336-
minimum: 0.0
6337-
type: integer
6338-
required:
6339-
- credentialsSecretName
6340-
- database
6341-
- host
6342-
type: object
6343-
type: object
63446285
cliOverrides:
63456286
additionalProperties:
63466287
type: string
@@ -6817,6 +6758,65 @@ spec:
68176758
for more information.
68186759
type: object
68196760
x-kubernetes-preserve-unknown-fields: true
6761+
resultBackend:
6762+
description: Connection information for the celery backend database.
6763+
oneOf:
6764+
- required:
6765+
- postgresql
6766+
- required:
6767+
- generic
6768+
properties:
6769+
generic:
6770+
description: |-
6771+
A generic Celery database connection for broker or result backend types not covered by a
6772+
dedicated variant.
6773+
6774+
Use this when you need a Celery-compatible connection that does not have a first-class
6775+
connection type. The complete connection URL is read from a Secret, giving the user full
6776+
control over the connection string.
6777+
properties:
6778+
connectionUrlSecretName:
6779+
description: The name of the Secret that contains an `connectionUrl` key with the complete Celery URL.
6780+
type: string
6781+
required:
6782+
- connectionUrlSecretName
6783+
type: object
6784+
postgresql:
6785+
description: Connection settings for a [PostgreSQL](https://www.postgresql.org/) database.
6786+
properties:
6787+
credentialsSecretName:
6788+
description: |-
6789+
Name of a Secret containing the `username` and `password` keys used to authenticate
6790+
against the PostgreSQL server.
6791+
type: string
6792+
database:
6793+
description: Name of the database (schema) to connect to.
6794+
type: string
6795+
host:
6796+
description: Hostname or IP address of the PostgreSQL server.
6797+
type: string
6798+
parameters:
6799+
additionalProperties:
6800+
type: string
6801+
default: {}
6802+
description: |-
6803+
Additional map of JDBC connection parameters to append to the connection URL. The given
6804+
`HashMap<String, String>` will be converted to query parameters in the form of
6805+
`?param1=value1&param2=value2`.
6806+
type: object
6807+
port:
6808+
default: 5432
6809+
description: Port the PostgreSQL server is listening on. Defaults to `5432`.
6810+
format: uint16
6811+
maximum: 65535.0
6812+
minimum: 0.0
6813+
type: integer
6814+
required:
6815+
- credentialsSecretName
6816+
- database
6817+
- host
6818+
type: object
6819+
type: object
68206820
roleConfig:
68216821
default:
68226822
podDisruptionBudget:
@@ -7344,8 +7344,8 @@ spec:
73447344
type: object
73457345
type: object
73467346
required:
7347-
- celeryBroker
7348-
- celeryResultBackend
7347+
- broker
7348+
- resultBackend
73497349
- roleGroups
73507350
type: object
73517351
clusterConfig:

‎rust/operator-binary/src/airflow_controller.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -417,8 +417,8 @@ pub async fn reconcile_airflow(
417417
.sqlalchemy_connection_details_with_templating("METADATA", &templating_mechanism);
418418
let celery_database_connection_details = match &airflow.spec.executor {
419419
AirflowExecutor::CeleryExecutors {
420-
celery_result_backend,
421-
celery_broker,
420+
result_backend: celery_result_backend,
421+
broker: celery_broker,
422422
..
423423
} => {
424424
let celery_result_backend = celery_result_backend

0 commit comments

Comments
 (0)