Skip to content

Revert version-drift change (#34) to restore working baseline #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
klagrida merged 1 commit into from
Jun 6, 2026
Merged

Revert version-drift change (#34) to restore working baseline #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions airflow/plugins/custom_operators/iceberg_operator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,11 @@ def __init__(
def _get_spark_conf(self) -> Dict[str, str]:
"""Get Spark configuration for Iceberg."""
return {
'spark.jars.packages': 'org.apache.iceberg:iceberg-spark-runtime-4.0_2.13:1.10.0,'
'org.apache.hadoop:hadoop-aws:3.4.1',
'spark.jars.packages': 'org.apache.iceberg:iceberg-spark-runtime-3.5_2.12:1.10.0,'
'org.apache.hadoop:hadoop-aws:3.3.4',
'spark.sql.extensions': 'org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions',
'spark.sql.catalog.spark_catalog': 'org.apache.iceberg.spark.SparkSessionCatalog',
'spark.sql.catalog.spark_catalog.type': 'hive',
'spark.sql.catalog.local': 'org.apache.iceberg.spark.SparkCatalog',
'spark.sql.catalog.local.type': 'hadoop',
'spark.sql.catalog.local.warehouse': self.warehouse_path,
Expand Down
2 changes: 1 addition & 1 deletion docker/airflow/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM apache/airflow:3.1.7-python3.13
FROM apache/airflow:3.1.5-python3.13

USER root

Expand Down
2 changes: 1 addition & 1 deletion docker/airflow/requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Airflow providers (Airflow 3.1 compatible)
# Airflow providers (Airflow 3.0 compatible)
apache-airflow-providers-apache-spark>=5.0.0
apache-airflow-providers-amazon>=9.0.0

Expand Down
2 changes: 2 additions & 0 deletions spark/config/log4j.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO
log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO
log4j.logger.org.apache.parquet=ERROR
log4j.logger.parquet=ERROR
log4j.logger.org.apache.hadoop.hive.metastore.RetryingHMSHandler=FATAL
log4j.logger.org.apache.hadoop.hive.ql.exec.FunctionRegistry=ERROR
2 changes: 2 additions & 0 deletions spark/config/spark-defaults.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ spark.hadoop.fs.s3a.connection.ssl.enabled false

# Iceberg Configuration
spark.sql.extensions org.apache.iceberg.spark.extensions.IcebergSparkSessionExtensions
spark.sql.catalog.spark_catalog org.apache.iceberg.spark.SparkSessionCatalog
spark.sql.catalog.spark_catalog.type hive
spark.sql.catalog.local org.apache.iceberg.spark.SparkCatalog
spark.sql.catalog.local.type hadoop
spark.sql.catalog.local.warehouse s3a://warehouse/
Expand Down
6 changes: 3 additions & 3 deletions terraform/modules/airflow/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ resource "helm_release" "airflow" {
repository = "https://airflow.apache.org"
chart = "airflow"
namespace = var.namespace
version = "1.19.0"
version = "1.18.0"

values = [
<<-EOT
executor: "KubernetesExecutor"

airflowVersion: "3.1.7"
airflowVersion: "3.0.2"

defaultAirflowRepository: apache/airflow
defaultAirflowTag: "3.1.7"
defaultAirflowTag: "3.0.2"

webserver:
service:
Expand Down
4 changes: 2 additions & 2 deletions terraform/modules/spark/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ resource "kubernetes_stateful_set_v1" "spark_master" {

container {
name = "spark-master"
image = "apache/spark:4.0.1"
image = "apache/spark:3.5.0"
command = ["/opt/spark/bin/spark-class"]
args = ["org.apache.spark.deploy.master.Master"]

Expand Down Expand Up @@ -156,7 +156,7 @@ resource "kubernetes_deployment_v1" "spark_worker" {
spec {
container {
name = "spark-worker"
image = "apache/spark:4.0.1"
image = "apache/spark:3.5.0"
command = ["/opt/spark/bin/spark-class"]
args = ["org.apache.spark.deploy.worker.Worker", "spark://spark-master:7077"]

Expand Down
Loading