Skip to content

Commit 82365c5

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix/demos-in-namespaces-with-labels
2 parents 3f3a5eb + 68c51d2 commit 82365c5

32 files changed

Lines changed: 227 additions & 235 deletions

File tree

.github/ISSUE_TEMPLATE/pre-release-upgrade-testing.md

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -113,20 +113,14 @@ stackablectl stack install <STACK_NAME>
113113
# --- IMPORTANT ---
114114
# Run through the (still) nightly demo/stack instructions (refer to the list above).
115115
116-
# Get a list of installed operators
117-
stackablectl operator installed --output=plain
116+
# Install nightly version of operators
117+
stackablectl release upgrade dev
118118
119-
# Uninstall operators for the stable release (OO.M)
120-
stackablectl release uninstall OO.M
121-
122-
# Update CRDs to nightly version (on main)
123-
# Repeat this for every operator used by the demo (use the list from the earlier step before deleting the operators)
124-
kubectl replace -f https://raw.githubusercontent.com/stackabletech/commons-operator/main/deploy/helm/commons-operator/crds/crds.yaml
125-
kubectl replace -f https://raw.githubusercontent.com/stackabletech/...-operator/main/deploy/helm/...-operator/crds/crds.yaml
119+
# Bump every stacklet to the version that used by the nightly demo.
120+
# Typically, this is the latest supported version.
121+
kubectl patch hbaseclusters/hbase --type='json' -p='[{"op": "replace", "path": "/spec/image/productVersion", "value":"x.x.x"}]' # changed
126122
127-
# Install nightly version of operators (use the list from the earlier step before deleting the operators)
128-
stackablectl operator install commons ...
123+
# Check that the operator logs look good (no unexpected errors etc.)
129124
130-
# Optionally update the product versions in the CRDs (to the latest non-experimental version for the new release), e.g.:
131-
kubectl patch hbaseclusters/hbase --type='json' -p='[{"op": "replace", "path": "/spec/image/productVersion", "value":"x.x.x"}]' # changed
125+
# Run through the (still) nightly demo/stack instructions again.
132126
```

demos/argo-cd-git-ops/manifests/airflow/airflow.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ spec:
6666
secretKeyRef:
6767
name: airflow-minio-connection
6868
key: airflow-minio-connection
69+
- name: git-sync-0
70+
resources:
71+
limits:
72+
memory: "128Mi"
73+
requests:
74+
memory: "128Mi"
6975
config:
7076
gracefulShutdownTimeout: 30s
7177
resources:
@@ -94,6 +100,13 @@ spec:
94100
secretKeyRef:
95101
name: airflow-minio-connection
96102
key: airflow-minio-connection
103+
initContainers:
104+
- name: git-sync-0-init
105+
resources:
106+
limits:
107+
memory: "128Mi"
108+
requests:
109+
memory: "128Mi"
97110
schedulers:
98111
envOverrides: *envOverrides
99112
podOverrides: *podOverrides

demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
echo 'Waiting for all nifi instances to be ready'
2727
kubectl wait --for=condition=ready --timeout=30m pod -l app.kubernetes.io/name=nifi,app.kubernetes.io/instance=nifi -n {{ NAMESPACE }}
2828
- name: wait-for-kafka-topics
29-
image: oci.stackable.tech/sdp/kafka:4.1.0-stackable0.0.0-dev
29+
image: oci.stackable.tech/sdp/kafka:4.1.1-stackable0.0.0-dev
3030
command:
3131
- bash
3232
- -euo
@@ -255,7 +255,7 @@ data:
255255
spark.sql("CREATE TABLE IF NOT EXISTS lakehouse.smart_city.shared_bikes_station_status (station_id string, num_bikes_available short, is_installed boolean, is_renting boolean, is_returning boolean, last_reported timestamp) USING iceberg PARTITIONED BY (days(last_reported)) TBLPROPERTIES ('format-version' = 2, format = 'PARQUET')")
256256
257257
kafkaOptions = {
258-
"kafka.bootstrap.servers": "kafka-broker-default.{{ NAMESPACE }}.svc.cluster.local:9093",
258+
"kafka.bootstrap.servers": "kafka-broker-default-headless.{{ NAMESPACE }}.svc.cluster.local:9093",
259259
"kafka.security.protocol": "SSL",
260260
"kafka.ssl.truststore.location": "/stackable/tls/truststore.p12",
261261
"kafka.ssl.truststore.password": "changeit",
-3.45 KB
Loading
39.4 KB
Loading
24.2 KB
Loading
36.6 KB
Loading
7.86 KB
Loading
22.4 KB
Loading
342 KB
Loading

0 commit comments

Comments
 (0)