Skip to content

Commit bd23972

Browse files
Merge branch 'feat/delta' of github.com:stackabletech/spark-k8s-operator into feat/delta
2 parents d78b3d2 + fc86d7a commit bd23972

File tree

3 files changed

+2
-86
lines changed

3 files changed

+2
-86
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ All notable changes to this project will be documented in this file.
1616
- [BREAKING] Remove `userClassPathFirst` properties from `spark-submit`. This is an experimental feature that was
1717
introduced to support logging in XML format. The side effect of this removal is that the vector agent cannot
1818
aggregate output from the `spark-submit` containers. On the other side, it enables dynamic provisionining of
19-
delta.io packages (among others) with Stackable stock images which is much more important. ([#355])
19+
java packages (such as Delta Lake) with Stackable stock images which is much more important. ([#355])
2020

2121
### Fixed
2222

deploy/helm/spark-k8s-operator/crds/crds.yaml

Lines changed: 0 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -7061,90 +7061,6 @@ spec:
70617061
config:
70627062
default: {}
70637063
properties:
7064-
logging:
7065-
default:
7066-
enableVectorAgent: null
7067-
containers: {}
7068-
description: Logging configuration, learn more in the [logging concept documentation](https://docs.stackable.tech/home/nightly/concepts/logging).
7069-
properties:
7070-
containers:
7071-
additionalProperties:
7072-
anyOf:
7073-
- required:
7074-
- custom
7075-
- {}
7076-
description: Log configuration of the container
7077-
properties:
7078-
console:
7079-
description: Configuration for the console appender
7080-
nullable: true
7081-
properties:
7082-
level:
7083-
description: The log level threshold. Log events with a lower log level are discarded.
7084-
enum:
7085-
- TRACE
7086-
- DEBUG
7087-
- INFO
7088-
- WARN
7089-
- ERROR
7090-
- FATAL
7091-
- NONE
7092-
nullable: true
7093-
type: string
7094-
type: object
7095-
custom:
7096-
description: Custom log configuration provided in a ConfigMap
7097-
properties:
7098-
configMap:
7099-
description: ConfigMap containing the log configuration files
7100-
nullable: true
7101-
type: string
7102-
type: object
7103-
file:
7104-
description: Configuration for the file appender
7105-
nullable: true
7106-
properties:
7107-
level:
7108-
description: The log level threshold. Log events with a lower log level are discarded.
7109-
enum:
7110-
- TRACE
7111-
- DEBUG
7112-
- INFO
7113-
- WARN
7114-
- ERROR
7115-
- FATAL
7116-
- NONE
7117-
nullable: true
7118-
type: string
7119-
type: object
7120-
loggers:
7121-
additionalProperties:
7122-
description: Configuration of a logger
7123-
properties:
7124-
level:
7125-
description: The log level threshold. Log events with a lower log level are discarded.
7126-
enum:
7127-
- TRACE
7128-
- DEBUG
7129-
- INFO
7130-
- WARN
7131-
- ERROR
7132-
- FATAL
7133-
- NONE
7134-
nullable: true
7135-
type: string
7136-
type: object
7137-
default: {}
7138-
description: Configuration per logger
7139-
type: object
7140-
type: object
7141-
description: Log configuration per container.
7142-
type: object
7143-
enableVectorAgent:
7144-
description: Wether or not to deploy a container with the Vector log agent.
7145-
nullable: true
7146-
type: boolean
7147-
type: object
71487064
resources:
71497065
default:
71507066
memory:

docs/modules/spark-k8s/pages/usage-guide/logging.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
= Logging
22

3-
The Spark operator installs a https://vector.dev/docs/setup/deployment/roles/#agent[vector agent] as a side-car container in every application Pod except the `job` Pod that runs `spark-submit`. It also configures the logging framework to output logs in XML format. This is the same https://logging.apache.org/log4j/2.x/manual/layouts.html#XMLLayout[format] used across all Stackable products and it enables the https://vector.dev/docs/setup/deployment/roles/#aggregator[vector aggregator] to collect logs across the entire platform.
3+
The Spark operator installs a https://vector.dev/docs/setup/deployment/roles/#agent[vector agent] as a side-car container in every application Pod except the `job` Pod that runs `spark-submit`. It also configures the logging framework to output logs in XML format. This is the same https://logging.apache.org/log4j/2.x/manual/layouts.html#XMLLayout[format] used across all Stackable products and it enables the https://vector.dev/docs/setup/deployment/roles/#aggregator[vector aggregator] to collect logs across the entire platform.
44

55
It is the user's responsibility to install and configure the vector aggregator, but the agents can discover the aggregator automatically using a discovery ConfigMap as described in the xref:concepts:logging.adoc[logging concepts].
66

0 commit comments

Comments
 (0)