Dennis-Mircea commented on code in PR #1126:
URL:
https://github.com/apache/flink-kubernetes-operator/pull/1126#discussion_r3542291001
##########
helm/flink-kubernetes-operator/tests/controller/configmap_test.yaml:
##########
@@ -68,3 +68,66 @@ tests:
asserts:
- isNotNull:
path: data["log4j-console.properties"]
+
+ # FLINK-39791: the ConfigMap emits a single config-file key, always named
config.yaml,
+ # resolved as config.yaml (when set) > user flink-conf.yaml > the
values.yaml default.
Review Comment:
Comment not needed.
##########
helm/flink-kubernetes-operator/tests/controller/deployment_test.yaml:
##########
@@ -383,3 +383,18 @@ tests:
key: log4j-operator.properties
path: log4j-operator.properties
+# FLINK-39791: the operator config is always mounted as config.yaml (the only
filename Flink 2.x
+# reads), regardless of which defaultConfiguration key the user populates.
Review Comment:
Comment not needed.
##########
helm/flink-kubernetes-operator/values.yaml:
##########
@@ -174,14 +174,27 @@ defaultConfiguration:
# This option has not effect, if create is equal to false.
append: true
-# Uncomment to use the new config.yaml format, but also comment out the
flink-config.yaml key.
+# Operator configuration overrides go under ONE of the two keys below. If both
are set,
+# config.yaml wins; either way the operator mounts the result as config.yaml.
+#
+# config.yaml - modern YAML 1.2 format (Flink 1.19+, required by Flink
2.0). Recommended.
+# flink-conf.yaml - legacy flat "key: value" format (shipped as the default
below).
+#
+# Prefer the nested config.yaml form: a flat, dotted-key override of a key the
chart already
+# ships (e.g. the Java 17 opts in conf/config.yaml) would be a duplicate key
under Flink's
+# strict YAML parser and fail at operator startup. Example, equivalent to the
default below:
+#
# config.yaml: |+
# kubernetes.operator:
# metrics.reporter.slf4j:
# factory.class: org.apache.flink.metrics.slf4j.Slf4jReporterFactory
# interval: 5 MINUTE
# reconcile.interval: 15 s
# observer.progress-check.interval: 5 s
+# taskmanager:
+# numberOfTaskSlots: 1 # default for managed clusters; override per-job
via spec.flinkConfiguration
Review Comment:
Not necessary to specify this property here.
##########
docs/content/docs/operations/helm.md:
##########
@@ -71,9 +71,9 @@ The configurable parameters of the Helm chart and which
default values as detail
| Parameters | Description
| Default Value
|
|------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| defaultConfiguration.append | Whether to append
configuration files with configs.
| true
|
-| defaultConfiguration.config.yaml | The newer configuration
file format for flink that will enforced in Flink 2.0. Note this was introduced
in flink 1.19. |
kubernetes.operator.metrics.reporter.slf4j.factory.class:
org.apache.flink.metrics.slf4j.Slf4jReporterFactory<br/>kubernetes.operator.metrics.reporter.slf4j.interval:
5 MINUTE<br/>kubernetes.operator.reconcile.interval: 15
s<br/>kubernetes.operator.observer.progress-check.interval: 5 s |
+| defaultConfiguration.config.yaml | Modern YAML 1.2 config
format (introduced in Flink 1.19, required by Flink 2.0). Takes precedence over
flink-conf.yaml when set; the resolved config is always mounted as config.yaml.
|
kubernetes.operator.metrics.reporter.slf4j.factory.class:
org.apache.flink.metrics.slf4j.Slf4jReporterFactory<br/>kubernetes.operator.metrics.reporter.slf4j.interval:
5 MINUTE<br/>kubernetes.operator.reconcile.interval: 15
s<br/>kubernetes.operator.observer.progress-check.interval: 5 s |
Review Comment:
The chinese docs can be synced with the same english content.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
