change databaseName to database

adwk67 · adwk67 · commit a462a978bb98 · 2026-02-11T10:12:31.000+01:00
diff --git a/docs/modules/airflow/examples/example-airflow-dags-configmap.yaml b/docs/modules/airflow/examples/example-airflow-dags-configmap.yaml
@@ -11,7 +11,7 @@ spec:
     metadataDatabase:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
     volumes:
       - name: cm-dag # <3>
diff --git a/docs/modules/airflow/examples/example-airflow-incluster.yaml b/docs/modules/airflow/examples/example-airflow-incluster.yaml
@@ -13,7 +13,7 @@ spec:
     metadataDatabase:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
   webservers:
     roleConfig:
@@ -32,7 +32,7 @@ spec:
     celeryResultBackend:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
     celeryBrokerUrl:
       redis:
diff --git a/docs/modules/airflow/examples/getting_started/code/airflow.yaml b/docs/modules/airflow/examples/getting_started/code/airflow.yaml
@@ -14,7 +14,7 @@ spec:
     metadataDatabase:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: airflow-postgresql-credentials
   webservers:
     roleConfig:
@@ -26,7 +26,7 @@ spec:
     celeryResultBackend:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: airflow-postgresql-credentials
     celeryBrokerUrl:
       redis:
diff --git a/docs/modules/airflow/pages/usage-guide/db-connect.adoc b/docs/modules/airflow/pages/usage-guide/db-connect.adoc
@@ -14,7 +14,7 @@ spec:
     metadataDatabase:
       postgresql: # <1>
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials # <2>
 ----
 <1> A reference to one of the supported database backends (e.g. `postgresql`).
@@ -32,7 +32,7 @@ spec:
     celeryResultBackend:
       postgresql: # <1>
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials # <2>
     celeryBrokerUrl:
       redis: # <3>
diff --git a/extra/crds.yaml b/extra/crds.yaml
@@ -96,7 +96,7 @@ spec:
                         properties:
                           credentialsSecret:
                             type: string
-                          databaseName:
+                          database:
                             type: string
                           host:
                             type: string
@@ -113,7 +113,7 @@ spec:
                             type: integer
                         required:
                         - credentialsSecret
-                        - databaseName
+                        - database
                         - host
                         type: object
                     type: object
@@ -860,7 +860,7 @@ spec:
                         properties:
                           credentialsSecret:
                             type: string
-                          databaseName:
+                          database:
                             type: string
                           host:
                             type: string
@@ -877,7 +877,7 @@ spec:
                             type: integer
                         required:
                         - credentialsSecret
-                        - databaseName
+                        - database
                         - host
                         type: object
                     type: object
@@ -3414,7 +3414,7 @@ spec:
                         properties:
                           credentialsSecret:
                             type: string
-                          databaseName:
+                          database:
                             type: string
                           host:
                             type: string
@@ -3431,7 +3431,7 @@ spec:
                             type: integer
                         required:
                         - credentialsSecret
-                        - databaseName
+                        - database
                         - host
                         type: object
                     type: object
@@ -4154,7 +4154,7 @@ spec:
                         properties:
                           credentialsSecret:
                             type: string
-                          databaseName:
+                          database:
                             type: string
                           host:
                             type: string
@@ -4171,7 +4171,7 @@ spec:
                             type: integer
                         required:
                         - credentialsSecret
-                        - databaseName
+                        - database
                         - host
                         type: object
                     type: object
diff --git a/rust/operator-binary/src/connections/database.rs b/rust/operator-binary/src/connections/database.rs
@@ -26,7 +26,7 @@ pub struct Postgresql {
     pub host: String,
     #[serde(default = "default_postgres_port")]
     pub port: u16,
-    pub database_name: String,
+    pub database: String,
     pub credentials_secret: String,
     #[serde(default)]
     pub parameters: BTreeMap<String, String>,
@@ -75,7 +75,7 @@ impl Postgresql {
             "{prefix}://${username_env}:${password_env}@{host}:{port}/{database_name}{params}",
             host = self.host,
             port = self.port,
-            database_name = self.database_name
+            database_name = self.database
         )
     }
 
@@ -102,7 +102,7 @@ mod tests {
     fn test_postgresql_alchemy() {
         let db_type = Postgresql {
             host: "airflow-postgresql".to_string(),
-            database_name: "airflow".to_string(),
+            database: "airflow".to_string(),
             credentials_secret: "airflow-credentials".to_string(),
             port: default_postgres_port(),
             parameters: BTreeMap::new(),
diff --git a/rust/operator-binary/src/crd/affinity.rs b/rust/operator-binary/src/crd/affinity.rs
@@ -75,7 +75,7 @@ mod tests {
             metadataDatabase:
               postgresql:
                 host: airflow-postgresql
-                databaseName: airflow
+                database: airflow
                 credentialsSecret: postgresql-credentials
           webservers:
             roleGroups:
@@ -85,7 +85,7 @@ mod tests {
             celeryResultBackend:
               postgresql:
                 host: airflow-postgresql
-                databaseName: airflow
+                database: airflow
                 credentialsSecret: postgresql-credentials
             celeryBrokerUrl:
               redis:
@@ -183,7 +183,7 @@ mod tests {
             metadataDatabase:
               postgresql:
                 host: airflow-postgresql
-                databaseName: airflow
+                database: airflow
                 credentialsSecret: postgresql-credentials
           webservers:
             roleGroups:
diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs
@@ -1127,7 +1127,7 @@ mod tests {
             metadataDatabase:
               postgresql:
                 host: airflow-postgresql
-                databaseName: airflow
+                database: airflow
                 credentialsSecret: postgresql-credentials
           webservers:
             roleGroups:
diff --git a/tests/templates/kuttl/cluster-operation/08-install-airflow.yaml.j2 b/tests/templates/kuttl/cluster-operation/08-install-airflow.yaml.j2
@@ -53,7 +53,7 @@ spec:
     metadataDatabase:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
   webservers:
     roleConfig:
@@ -68,7 +68,7 @@ spec:
     celeryResultBackend:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
     celeryBrokerUrl:
       redis:
diff --git a/tests/templates/kuttl/cluster-operation/10-pause-airflow.yaml.j2 b/tests/templates/kuttl/cluster-operation/10-pause-airflow.yaml.j2
@@ -28,7 +28,7 @@ spec:
     metadataDatabase:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
   webservers:
     roleConfig:
@@ -43,7 +43,7 @@ spec:
     celeryResultBackend:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
     celeryBrokerUrl:
       redis:
diff --git a/tests/templates/kuttl/cluster-operation/20-stop-airflow.yaml.j2 b/tests/templates/kuttl/cluster-operation/20-stop-airflow.yaml.j2
@@ -28,7 +28,7 @@ spec:
     metadataDatabase:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
   webservers:
     roleConfig:
@@ -43,7 +43,7 @@ spec:
     celeryResultBackend:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
     celeryBrokerUrl:
       redis:
diff --git a/tests/templates/kuttl/cluster-operation/30-restart-airflow.yaml.j2 b/tests/templates/kuttl/cluster-operation/30-restart-airflow.yaml.j2
@@ -28,7 +28,7 @@ spec:
     metadataDatabase:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
     databaseInitialization:
       enabled: false
@@ -45,7 +45,7 @@ spec:
     celeryResultBackend:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
     celeryBrokerUrl:
       redis:
diff --git a/tests/templates/kuttl/external-access/install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/external-access/install-airflow-cluster.yaml.j2
@@ -46,7 +46,7 @@ spec:
     metadataDatabase:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
   webservers:
     roleConfig:
@@ -66,7 +66,7 @@ spec:
     celeryResultBackend:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
     celeryBrokerUrl:
       redis:
diff --git a/tests/templates/kuttl/ldap/60-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/ldap/60-install-airflow-cluster.yaml.j2
@@ -69,7 +69,7 @@ commands:
           metadataDatabase:
             postgresql:
               host: airflow-postgresql
-              databaseName: airflow
+              database: airflow
               credentialsSecret: postgresql-credentials
           authentication:
             - authenticationClass: {% if test_scenario['values']['ldap-authentication'] == 'no-tls' -%}
@@ -95,7 +95,7 @@ commands:
           celeryResultBackend:
             postgresql:
               host: airflow-postgresql
-              databaseName: airflow
+              database: airflow
               credentialsSecret: postgresql-credentials
           celeryBrokerUrl:
             redis:
diff --git a/tests/templates/kuttl/logging/41-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/logging/41-install-airflow-cluster.yaml.j2
@@ -87,7 +87,7 @@ spec:
     metadataDatabase:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
     dagsGitSync:
       - repo: https://github.com/stackabletech/example-dags
@@ -158,7 +158,7 @@ spec:
     celeryResultBackend:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
     celeryBrokerUrl:
       redis:
diff --git a/tests/templates/kuttl/mount-dags-configmap/30-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/mount-dags-configmap/30-install-airflow-cluster.yaml.j2
@@ -91,7 +91,7 @@ spec:
     metadataDatabase:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
     volumes:
       - name: test-cm-dag
@@ -117,7 +117,7 @@ spec:
     celeryResultBackend:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
     celeryBrokerUrl:
       redis:
diff --git a/tests/templates/kuttl/mount-dags-gitsync/30-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/mount-dags-gitsync/30-install-airflow-cluster.yaml.j2
@@ -90,7 +90,7 @@ spec:
     metadataDatabase:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
     dagsGitSync:
 {% if test_scenario['values']['access'] == 'ssh' %}
@@ -137,7 +137,7 @@ spec:
     celeryResultBackend:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
     celeryBrokerUrl:
       redis:
diff --git a/tests/templates/kuttl/oidc/install-airflow.yaml.j2 b/tests/templates/kuttl/oidc/install-airflow.yaml.j2
@@ -63,7 +63,7 @@ spec:
     metadataDatabase:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
 {% if lookup('env', 'VECTOR_AGGREGATOR') %}
     vectorAggregatorConfigMapName: vector-aggregator-discovery
diff --git a/tests/templates/kuttl/opa/30-install-airflow.yaml.j2 b/tests/templates/kuttl/opa/30-install-airflow.yaml.j2
@@ -57,7 +57,7 @@ spec:
     metadataDatabase:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
     exposeConfig: true
     loadExamples: true
diff --git a/tests/templates/kuttl/orphaned-resources/30-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/orphaned-resources/30-install-airflow-cluster.yaml.j2
@@ -53,7 +53,7 @@ spec:
     metadataDatabase:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
   webservers:
     roleConfig:
@@ -68,7 +68,7 @@ spec:
     celeryResultBackend:
       postgresql:
         host: airflow-postgresql
-        databaseName: airflow
+        database: airflow
         credentialsSecret: postgresql-credentials
     celeryBrokerUrl:
       redis:
diff --git a/tests/templates/kuttl/overrides/10-install-airflow.yaml.j2 b/tests/templates/kuttl/overrides/10-install-airflow.yaml.j2
diff --git a/tests/templates/kuttl/overrides/20-install-airflow2.yaml.j2 b/tests/templates/kuttl/overrides/20-install-airflow2.yaml.j2
diff --git a/tests/templates/kuttl/remote-logging/40-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/remote-logging/40-install-airflow-cluster.yaml.j2
diff --git a/tests/templates/kuttl/resources/30-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/resources/30-install-airflow-cluster.yaml.j2
diff --git a/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/smoke/40-install-airflow-cluster.yaml.j2
diff --git a/tests/templates/kuttl/triggerer/30-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/triggerer/30-install-airflow-cluster.yaml.j2
diff --git a/tests/templates/kuttl/versioning/30-install-airflow-cluster.yaml.j2 b/tests/templates/kuttl/versioning/30-install-airflow-cluster.yaml.j2
