merge conflicts

Author: adwk67

CHANGELOG.md

@@ -5,13 +5,20 @@
 ### Added
 
 - Support for passing CAs to GitSync ([#750]).
+- Support setting `clientAuthenticationMethod` for OIDC authentication. The value is passed through to the Flask-AppBuilder config as `token_endpoint_auth_method` ([#765]).
 
 ### Changed
 
 - Document Helm deployed RBAC permissions and remove unnecessary permissions ([#767]).
 
+### Fixed
+
+- Do not use immutable Secret objects for internal secrets. Migrate existing secrets to mutable versions ([#770]).
+
 [#750]: https://github.com/stackabletech/airflow-operator/pull/750
+[#765]: https://github.com/stackabletech/airflow-operator/pull/765
 [#767]: https://github.com/stackabletech/airflow-operator/pull/767
+[#770]: https://github.com/stackabletech/airflow-operator/pull/770
 
 ## [26.3.0] - 2026-03-16