Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .scripts/update_refs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ function prepend {
function maybe_commit {
[ "$COMMIT" == "true" ] || return 0
local MESSAGE="$1"
PATCH=$(mktemp)
PATCH=$(mktemp --suffix=.diff)
git add -u
git diff --staged > "$PATCH"
git commit -S -m "$MESSAGE" --no-verify
git diff-index --quiet HEAD -- || git commit -S -m "$MESSAGE" --no-verify
echo "patch written to: $PATCH" | prepend "\t"
}

Expand All @@ -55,8 +55,8 @@ if [[ "$CURRENT_BRANCH" == release-* ]]; then

# Replace 0.0.0-dev refs with ${STACKABLE_RELEASE}.0
# TODO (@NickLarsenNZ): handle patches later, and what about release-candidates?
SEARCH='stackable(0\.0\.0-dev|24\.7\.[0-9]+)' # TODO (@NickLarsenNZ): After https://github.com/stackabletech/stackable-cockpit/issues/310, only search for 0.0.0-dev
REPLACEMENT="stackable${STACKABLE_RELEASE}.0" # TODO (@NickLarsenNZ): Be a bit smarter about patch releases.
SEARCH='stackable(0\.0\.0-dev|24\.7\.[0-9]+|24\.11\.0)' # TODO (@NickLarsenNZ): After https://github.com/stackabletech/stackable-cockpit/issues/310, only search for 0.0.0-dev
REPLACEMENT="stackable${STACKABLE_RELEASE}.1" # TODO (@NickLarsenNZ): Be a bit smarter about patch releases.
MESSAGE="Update image references with $REPLACEMENT"
echo "$MESSAGE"
find demos stacks -type f \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: start-pyspark-job
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.0
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.1
# N.B. it is possible for the scheduler to report that a DAG exists, only for the worker task to fail if a pod is unexpectedly
# restarted. Additionally, the db-init job takes a few minutes to complete before the cluster is deployed. The wait/watch steps
# below are not "water-tight" but add a layer of stability by at least ensuring that the db is initialized and ready and that
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: start-date-job
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.0
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.1
# N.B. it is possible for the scheduler to report that a DAG exists, only for the worker task to fail if a pod is unexpectedly
# restarted. Additionally, the db-init job takes a few minutes to complete before the cluster is deployed. The wait/watch steps
# below are not "water-tight" but add a layer of stability by at least ensuring that the db is initialized and ready and that
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ spec:
serviceAccountName: demo-serviceaccount
initContainers:
- name: wait-for-kafka
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.0
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.1
command: ["bash", "-c", "echo 'Waiting for all kafka brokers to be ready' && kubectl wait --for=condition=ready --timeout=30m pod -l app.kubernetes.io/instance=kafka -l app.kubernetes.io/name=kafka"]
containers:
- name: create-nifi-ingestion-job
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["bash", "-c", "curl -O https://raw.githubusercontent.com/stackabletech/demos/release-24.11/demos/data-lakehouse-iceberg-trino-spark/LakehouseKafkaIngest.xml && python -u /tmp/script/script.py"]
volumeMounts:
- name: script
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ spec:
serviceAccountName: demo-serviceaccount
initContainers:
- name: wait-for-kafka
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.0
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.1
command: ["bash", "-c", "echo 'Waiting for all kafka brokers to be ready' && kubectl wait --for=condition=ready --timeout=30m pod -l app.kubernetes.io/name=kafka -l app.kubernetes.io/instance=kafka"]
containers:
- name: create-spark-ingestion-job
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.0
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.1
command: ["bash", "-c", "echo 'Submitting Spark job' && kubectl apply -f /tmp/manifest/spark-ingestion-job.yaml"]
volumeMounts:
- name: manifest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ spec:
serviceAccountName: demo-serviceaccount
initContainers:
- name: wait-for-testdata
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.0
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.1
command: ["bash", "-c", "echo 'Waiting for job load-test-data to finish' && kubectl wait --for=condition=complete --timeout=30m job/load-test-data"]
containers:
- name: create-tables-in-trino
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["bash", "-c", "python -u /tmp/script/script.py"]
volumeMounts:
- name: script
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: setup-superset
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["bash", "-c", "curl -o superset-assets.zip https://raw.githubusercontent.com/stackabletech/demos/release-24.11/demos/data-lakehouse-iceberg-trino-spark/superset-assets.zip && python -u /tmp/script/script.py"]
volumeMounts:
- name: script
Expand Down
4 changes: 2 additions & 2 deletions demos/end-to-end-security/create-spark-report.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
serviceAccountName: demo-serviceaccount
initContainers:
- name: wait-for-trino-tables
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command:
- bash
- -euo
Expand All @@ -23,7 +23,7 @@ spec:
kubectl wait --timeout=30m --for=condition=complete job/create-tables-in-trino
containers:
- name: create-spark-report
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command:
- bash
- -euo
Expand Down
2 changes: 1 addition & 1 deletion demos/end-to-end-security/create-trino-tables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: create-tables-in-trino
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["bash", "-c", "python -u /tmp/script/script.py"]
volumeMounts:
- name: script
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
spec:
containers:
- name: create-hfile-and-import-to-hbase
image: docker.stackable.tech/stackable/hbase:2.4.18-stackable24.11.0
image: docker.stackable.tech/stackable/hbase:2.4.18-stackable24.11.1
env:
- name: HADOOP_USER_NAME
value: stackable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: load-ny-taxi-data
image: docker.stackable.tech/stackable/hadoop:3.4.0-stackable24.11.0
image: docker.stackable.tech/stackable/hadoop:3.4.0-stackable24.11.1
# yamllint disable rule:line-length
command: ["bash", "-c", "/stackable/hadoop/bin/hdfs dfs -mkdir -p /ny-taxi-data/raw \
&& cd /tmp \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: create-druid-ingestion-job
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["bash", "-c", "curl -X POST --insecure -H 'Content-Type: application/json' -d @/tmp/ingestion-job-spec/ingestion-job-spec.json https://druid-coordinator:8281/druid/indexer/v1/supervisor"]
volumeMounts:
- name: ingestion-job-spec
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: create-nifi-ingestion-job
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["bash", "-c", "curl -O https://raw.githubusercontent.com/stackabletech/demos/release-24.11/demos/nifi-kafka-druid-earthquake-data/IngestEarthquakesToKafka.xml && python -u /tmp/script/script.py"]
volumeMounts:
- name: script
Expand Down
2 changes: 1 addition & 1 deletion demos/nifi-kafka-druid-earthquake-data/setup-superset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: setup-superset
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["bash", "-c", "curl -o superset-assets.zip https://raw.githubusercontent.com/stackabletech/demos/release-24.11/demos/nifi-kafka-druid-earthquake-data/superset-assets.zip && python -u /tmp/script/script.py"]
volumeMounts:
- name: script
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: create-druid-ingestion-job
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["bash", "-c", "curl -X POST --insecure -H 'Content-Type: application/json' -d @/tmp/ingestion-job-spec/stations-ingestion-job-spec.json https://druid-coordinator:8281/druid/indexer/v1/supervisor && curl -X POST --insecure -H 'Content-Type: application/json' -d @/tmp/ingestion-job-spec/measurements-ingestion-job-spec.json https://druid-coordinator:8281/druid/indexer/v1/supervisor && curl -X POST --insecure -H 'Content-Type: application/json' -d @/tmp/ingestion-job-spec/measurements-compaction-job-spec.json https://druid-coordinator:8281/druid/coordinator/v1/config/compaction"]
volumeMounts:
- name: ingestion-job-spec
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: create-nifi-ingestion-job
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["bash", "-c", "curl -O https://raw.githubusercontent.com/stackabletech/demos/release-24.11/demos/nifi-kafka-druid-water-level-data/IngestWaterLevelsToKafka.xml && python -u /tmp/script/script.py"]
volumeMounts:
- name: script
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: setup-superset
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["bash", "-c", "curl -o superset-assets.zip https://raw.githubusercontent.com/stackabletech/demos/release-24.11/demos/nifi-kafka-druid-water-level-data/superset-assets.zip && python -u /tmp/script/script.py"]
volumeMounts:
- name: script
Expand Down
2 changes: 1 addition & 1 deletion demos/signal-processing/Dockerfile-nifi
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM docker.stackable.tech/stackable/nifi:1.27.0-stackable24.11.0
FROM docker.stackable.tech/stackable/nifi:1.27.0-stackable24.11.1

RUN curl --fail -o /stackable/nifi/postgresql-42.6.0.jar "https://repo.stackable.tech/repository/misc/postgresql-timescaledb/postgresql-42.6.0.jar"
4 changes: 2 additions & 2 deletions demos/signal-processing/create-nifi-ingestion-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ spec:
serviceAccountName: demo-serviceaccount
initContainers:
- name: wait-for-timescale-job
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.0
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.1
command: ["bash", "-c", "echo 'Waiting for timescaleDB tables to be ready'
&& kubectl wait --for=condition=complete job/create-timescale-tables-job"
]
containers:
- name: create-nifi-ingestion-job
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["bash", "-c", "export PGPASSWORD=$(cat /timescale-admin-credentials/password) && \
curl -O https://raw.githubusercontent.com/stackabletech/demos/release-24.11/demos/signal-processing/DownloadAndWriteToDB.xml && \
sed -i \"s/PLACEHOLDERPGPASSWORD/$PGPASSWORD/g\" DownloadAndWriteToDB.xml && \
Expand Down
2 changes: 1 addition & 1 deletion demos/signal-processing/create-timescale-tables.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
serviceAccountName: demo-serviceaccount
initContainers:
- name: wait-for-timescale
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.0
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.1
command: ["bash", "-c", "echo 'Waiting for timescaleDB to be ready'
&& kubectl wait --for=condition=ready --timeout=30m pod -l app.kubernetes.io/name=postgresql-timescaledb"
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ spec:
spec:
initContainers:
- name: wait-for-testdata
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["bash", "-c", "echo 'Waiting for job load-ny-taxi-data to finish' && kubectl wait --for=condition=complete --timeout=30m job/load-ny-taxi-data"]
containers:
- name: create-spark-anomaly-detection-job
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["bash", "-c", "echo 'Submitting Spark job' && kubectl apply -f /tmp/manifest/spark-ad-job.yaml"]
volumeMounts:
- name: manifest
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: setup-superset
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["bash", "-c", "curl -o superset-assets.zip https://raw.githubusercontent.com/stackabletech/demos/release-24.11/demos/spark-k8s-anomaly-detection-taxi-data/superset-assets.zip && python -u /tmp/script/script.py"]
volumeMounts:
- name: script
Expand Down
2 changes: 1 addition & 1 deletion demos/trino-taxi-data/create-table-in-trino.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: create-ny-taxi-data-table-in-trino
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["bash", "-c", "python -u /tmp/script/script.py"]
volumeMounts:
- name: script
Expand Down
2 changes: 1 addition & 1 deletion demos/trino-taxi-data/setup-superset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: setup-superset
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["bash", "-c", "curl -o superset-assets.zip https://raw.githubusercontent.com/stackabletech/demos/release-24.11/demos/trino-taxi-data/superset-assets.zip && python -u /tmp/script/script.py"]
volumeMounts:
- name: script
Expand Down
2 changes: 1 addition & 1 deletion stacks/_templates/jupyterhub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ options:
HADOOP_CONF_DIR: "/home/jovyan/hdfs"
initContainers:
- name: download-notebook
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.0
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.1
command: ['sh', '-c', 'curl https://raw.githubusercontent.com/stackabletech/demos/release-24.11/stacks/jupyterhub-pyspark-hdfs/notebook.ipynb -o /notebook/notebook.ipynb']
volumeMounts:
- mountPath: /notebook
Expand Down
2 changes: 1 addition & 1 deletion stacks/_templates/keycloak.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ spec:
- name: tls
mountPath: /tls/
- name: create-auth-class
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command: ["/bin/bash", "-c"]
args:
- |
Expand Down
8 changes: 4 additions & 4 deletions stacks/end-to-end-security/krb5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
spec:
initContainers:
- name: init
image: docker.stackable.tech/stackable/krb5:1.21.1-stackable24.11.0
image: docker.stackable.tech/stackable/krb5:1.21.1-stackable24.11.1
args:
- sh
- -euo
Expand All @@ -35,7 +35,7 @@ spec:
name: data
containers:
- name: kdc
image: docker.stackable.tech/stackable/krb5:1.21.1-stackable24.11.0
image: docker.stackable.tech/stackable/krb5:1.21.1-stackable24.11.1
args:
- krb5kdc
- -n
Expand All @@ -48,7 +48,7 @@ spec:
- mountPath: /var/kerberos/krb5kdc
name: data
- name: kadmind
image: docker.stackable.tech/stackable/krb5:1.21.1-stackable24.11.0
image: docker.stackable.tech/stackable/krb5:1.21.1-stackable24.11.1
args:
- kadmind
- -nofork
Expand All @@ -61,7 +61,7 @@ spec:
- mountPath: /var/kerberos/krb5kdc
name: data
- name: client
image: docker.stackable.tech/stackable/krb5:1.21.1-stackable24.11.0
image: docker.stackable.tech/stackable/krb5:1.21.1-stackable24.11.1
tty: true
stdin: true
env:
Expand Down
2 changes: 1 addition & 1 deletion stacks/end-to-end-security/superset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
initContainers:
# The postgres image does not contain curl or wget...
- name: download-dump
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command:
- bash
- -c
Expand Down
2 changes: 1 addition & 1 deletion stacks/keycloak-opa-poc/keycloak.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ spec:
spec:
containers:
- name: propagate-keycloak-address
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
command:
- bash
- -x
Expand Down
2 changes: 1 addition & 1 deletion stacks/keycloak-opa-poc/setup-keycloak.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ spec:
spec:
containers:
- name: setup-keycloak
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
env:
- name: KEYCLOAK_ADMIN_PASSWORD
valueFrom:
Expand Down
2 changes: 1 addition & 1 deletion stacks/logging/setup-opensearch-dashboards.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
spec:
containers:
- name: setup-opensearch-dashboards
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.0
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.11.1
env:
- name: OPEN_SEARCH_ADMIN_PASSWORD
valueFrom:
Expand Down
4 changes: 2 additions & 2 deletions stacks/signal-processing/jupyterhub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ options:
singleuser:
cmd: null
image:
# TODO (@NickLarsenNZ): Use a versioned image with stackable24.11.0 or stackableXX.X.X so that
# TODO (@NickLarsenNZ): Use a versioned image with stackable24.11.1 or stackableXX.X.X so that
# the demo is reproducable for the release and it will be automatically replaced for the release branch.
name: docker.stackable.tech/demos/jupyter-pyspark-with-alibi-detect
tag: python-3.9
Expand All @@ -41,7 +41,7 @@ options:
stackable.tech/vendor: Stackable
initContainers:
- name: download-notebook
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.0
image: docker.stackable.tech/stackable/tools:1.0.0-stackable24.11.1
command: ['sh', '-c', 'curl https://raw.githubusercontent.com/stackabletech/demos/release-24.11/stacks/signal-processing/tsdb.ipynb -o /notebook/tsdb.ipynb']
volumeMounts:
- mountPath: /notebook
Expand Down
Loading
Loading