Skip to content

Commit 6e553c5

Browse files
authored
Merge branch 'main' into docs/demu-upgrade-issue-template
2 parents b7f0eb9 + 1f8b934 commit 6e553c5

4 files changed

Lines changed: 15 additions & 18 deletions

File tree

demos/airflow-scheduled-job/create-trino-tables.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ spec:
99
serviceAccountName: demo-serviceaccount
1010
containers:
1111
- name: create-tables-in-trino
12-
image: oci.stackable.tech/sdp/testing-tools:0.3.0-stackable0.0.0-dev
12+
image: oci.stackable.tech/sdp/testing-tools/trino:0.3.0-stackable0.0.0-dev
1313
command: ["bash", "-c", "python -u /tmp/script/script.py"]
1414
volumeMounts:
1515
- name: script

docs/modules/demos/pages/airflow-scheduled-job.adoc

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33

44
Install this demo on an existing Kubernetes cluster:
55

6-
[source,console]
7-
----
8-
$ stackablectl demo install airflow-scheduled-job
9-
----
10-
11-
You can also deploy it to a specific namespace (the namespace `airflow-demo` will be assumed in this guide):
6+
[NOTE]
7+
====
8+
The namespace `airflow-demo` will be assumed in this guide.
9+
It will be created if it doesn't exist.
10+
====
1211

1312
[source,console]
1413
----
@@ -225,7 +224,7 @@ image::airflow-scheduled-job/airflow_17.png[]
225224

226225
Click on the DAG, switching to the task view.
227226
This DAG uses a deferrable operator which, in conjunction with the triggerer process, "offloads" the DAG from its worker for a specfic period of time, before being picked up and again and executed.
228-
You will see the task cycle through the following states:
227+
From the Task Instances view (under Dags), you will see the task cycle through the following states:
229228

230229
image::airflow-scheduled-job/deferrable_01_running.png[]
231230
image::airflow-scheduled-job/deferrable_02_queued.png[]
@@ -284,7 +283,7 @@ The patch also sets some environment variables that can be used to change the fr
284283
[source,yaml]
285284
----
286285
---
287-
apiVersion: airflow.stackable.tech/v1alpha1
286+
apiVersion: airflow.stackable.tech/v1alpha2
288287
kind: AirflowCluster
289288
metadata:
290289
name: airflow
@@ -294,8 +293,6 @@ spec:
294293
- name: airflow-dags
295294
mountPath: /dags/dag_factory.py
296295
subPath: dag_factory.py
297-
- name: kafka-tls-pem
298-
mountPath: /stackable/kafka-tls-pem
299296
webservers:
300297
roleGroups:
301298
default:
@@ -315,13 +312,15 @@ spec:
315312
envOverrides: *envOverrides
316313
----
317314

318-
THe patch can be applied like this:
315+
The patch can be applied like this:
319316

320317
[source,console]
321318
----
322319
kubectl patch airflowcluster airflow --type="merge" --patch-file stacks/airflow/patch_airflow.yaml -n airflow-demo
323320
----
324321

322+
Wait for Airflow to come back up, and you should now see the generated DAGs.
323+
325324
[NOTE]
326325
====
327326
The scheduled job runs every minute and so an instance of it may be running while the scheduler is being re-started as a result of the patch, in which case that instance may fail.

stacks/airflow/airflow.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
# {% raw %}
3-
apiVersion: airflow.stackable.tech/v1alpha1
3+
apiVersion: airflow.stackable.tech/v1alpha2
44
kind: AirflowCluster
55
metadata:
66
name: airflow
@@ -74,7 +74,7 @@ spec:
7474
spec:
7575
containers:
7676
- name: airflow
77-
image: oci.stackable.tech/sdp/airflow:3.0.6-stackable0.0.0-dev
77+
image: oci.stackable.tech/sdp/airflow:3.1.6-stackable0.0.0-dev
7878
imagePullPolicy: IfNotPresent
7979
env:
8080
- name: NAMESPACE
@@ -102,7 +102,7 @@ spec:
102102
spec:
103103
containers:
104104
- name: base
105-
image: oci.stackable.tech/sdp/airflow:3.0.6-stackable0.0.0-dev
105+
image: oci.stackable.tech/sdp/airflow:3.1.6-stackable0.0.0-dev
106106
imagePullPolicy: IfNotPresent
107107
env:
108108
- name: AWS_SECRET_ACCESS_KEY

stacks/airflow/patch_airflow.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: airflow.stackable.tech/v1alpha1
2+
apiVersion: airflow.stackable.tech/v1alpha2
33
kind: AirflowCluster
44
metadata:
55
name: airflow
@@ -9,8 +9,6 @@ spec:
99
- name: airflow-dags
1010
mountPath: /dags/dag_factory.py
1111
subPath: dag_factory.py
12-
- name: kafka-tls-pem
13-
mountPath: /stackable/kafka-tls-pem
1412
webservers:
1513
roleGroups:
1614
default:

0 commit comments

Comments
 (0)