Skip to content

Commit 8ce7fc9

Browse files
committed
chore: Merge branch 'main' into chore/add-issue-template
2 parents 716d3c8 + ce6243a commit 8ce7fc9

File tree

4 files changed

+39
-37
lines changed

4 files changed

+39
-37
lines changed

docs/modules/demos/pages/nifi-kafka-druid-earthquake-data.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ You can execute a command on the Kafka broker to list the available topics as fo
114114
// However, the kcat-prober container has TLS certificates mounted, which can be used by kcat to connect to Kafka.
115115
[source,console]
116116
----
117-
$ kubectl exec -it kafka-broker-default-0 -c kcat-prober -- /bin/bash -c "/stackable/kcat -b localhost:9093 -X security.protocol=SSL -X ssl.key.location=/stackable/tls_cert_server_mount/tls.key -X ssl.certificate.location=/stackable/tls_cert_server_mount/tls.crt -X ssl.ca.location=/stackable/tls_cert_server_mount/ca.crt -L"
117+
$ kubectl exec -it kafka-broker-default-0 -c kcat-prober -- /bin/bash -c "/stackable/kcat -b localhost:9093 -X security.protocol=SSL -X ssl.key.location=/stackable/tls-kcat/tls.key -X ssl.certificate.location=/stackable/tls-kcat/tls.crt -X ssl.ca.location=/stackable/tls-kcat/ca.crt -L"
118118
Metadata for all topics (from broker -1: ssl://localhost:9093/bootstrap):
119119
1 brokers:
120120
broker 1001 at 172.18.0.2:32175 (controller)
@@ -136,7 +136,7 @@ parameter.
136136

137137
[source,console]
138138
----
139-
$ kubectl exec -it kafka-broker-default-0 -c kcat-prober -- /bin/bash -c "/stackable/kcat -b localhost:9093 -X security.protocol=SSL -X ssl.key.location=/stackable/tls_cert_server_mount/tls.key -X ssl.certificate.location=/stackable/tls_cert_server_mount/tls.crt -X ssl.ca.location=/stackable/tls_cert_server_mount/ca.crt -C -t earthquakes -c 1"
139+
$ kubectl exec -it kafka-broker-default-0 -c kcat-prober -- /bin/bash -c "/stackable/kcat -b localhost:9093 -X security.protocol=SSL -X ssl.key.location=/stackable/tls-kcat/tls.key -X ssl.certificate.location=/stackable/tls-kcat/tls.crt -X ssl.ca.location=/stackable/tls-kcat/ca.crt -C -t earthquakes -c 1"
140140
----
141141

142142
Below is an example of the output of one record:
@@ -175,7 +175,7 @@ The given pattern will print some metadata of the record.
175175

176176
[source,console]
177177
----
178-
$ kubectl exec -it kafka-broker-default-0 -c kcat-prober -- /bin/bash -c "/stackable/kcat -b localhost:9093 -X security.protocol=SSL -X ssl.key.location=/stackable/tls_cert_server_mount/tls.key -X ssl.certificate.location=/stackable/tls_cert_server_mount/tls.crt -X ssl.ca.location=/stackable/tls_cert_server_mount/ca.crt -C -t earthquakes -o -8 -c 8 -f 'Topic %t / Partition %p / Offset: %o / Timestamp: %T\n'"
178+
$ kubectl exec -it kafka-broker-default-0 -c kcat-prober -- /bin/bash -c "/stackable/kcat -b localhost:9093 -X security.protocol=SSL -X ssl.key.location=/stackable/tls-kcat/tls.key -X ssl.certificate.location=/stackable/tls-kcat/tls.crt -X ssl.ca.location=/stackable/tls-kcat/ca.crt -C -t earthquakes -o -8 -c 8 -f 'Topic %t / Partition %p / Offset: %o / Timestamp: %T\n'"
179179
Topic earthquakes / Partition 0 / Offset: 385011 / Timestamp: 1680607795568
180180
Topic earthquakes / Partition 0 / Offset: 385012 / Timestamp: 1680607795568
181181
Topic earthquakes / Partition 0 / Offset: 385013 / Timestamp: 1680607795570

stacks/airflow/airflow.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,9 @@ data:
142142
143143
class SparkKubernetesSensor(BaseSensorOperator):
144144
template_fields = ("application_name", "namespace")
145-
FAILURE_STATES = ("Failed", "Unknown")
145+
# See https://github.com/stackabletech/spark-k8s-operator/pull/460/files#diff-d737837121132af6b60f50279a78464b05dcfd06c05d1d090f4198a5e962b5f6R371
146+
# Unknown is set immediately so it must be excluded from the failed states.
147+
FAILURE_STATES = ("Failed")
146148
SUCCESS_STATES = ("Succeeded")
147149
148150
def __init__(

stacks/end-to-end-security/superset.yaml

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: superset
66
spec:
77
image:
8-
productVersion: 3.1.3
8+
productVersion: 4.0.2
99
clusterConfig:
1010
listenerClass: external-unstable
1111
credentialsSecret: superset-credentials
@@ -24,38 +24,38 @@ spec:
2424
# We need to restore the postgres state before the superset container itself starts some database migrations
2525
initContainers:
2626
# The postgres image does not contain curl or wget...
27-
- name: download-dump
28-
image: docker.stackable.tech/stackable/testing-tools:0.1.0-stackable0.1.0
29-
command:
30-
- bash
31-
- -c
32-
- |
33-
cd /tmp
34-
curl --fail -O https://raw.githubusercontent.com/stackabletech/demos/main/stacks/end-to-end-security/postgres_superset_dump.sql.gz
35-
gunzip postgres_superset_dump.sql.gz
27+
- name: download-dump
28+
image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable24.7.0
29+
command:
30+
- bash
31+
- -c
32+
- |
33+
cd /tmp
34+
curl --fail -O https://raw.githubusercontent.com/stackabletech/demos/main/stacks/end-to-end-security/postgres_superset_dump.sql.gz
35+
gunzip postgres_superset_dump.sql.gz
3636
37-
# We need to omit changing the users password, as otherwise the content in the Secrets does not match
38-
# the actual password in Postgres.
39-
grep -vwE '(CREATE ROLE postgres;|CREATE ROLE superset;|ALTER ROLE postgres|ALTER ROLE superset)' postgres_superset_dump.sql > /dump/postgres_superset_dump.sql
40-
volumeMounts:
41-
- name: dump
42-
mountPath: /dump/
43-
- name: restore-postgres
44-
image: docker.io/bitnami/postgresql:16.1.0-debian-11-r11 # Same image as the bitnami postgres helm-chart is using
45-
command:
46-
- bash
47-
- -c
48-
- |
49-
psql --host postgresql-superset --user postgres < /dump/postgres_superset_dump.sql
50-
env:
51-
- name: PGPASSWORD
52-
valueFrom:
53-
secretKeyRef:
54-
name: postgresql-superset
55-
key: postgres-password
56-
volumeMounts:
57-
- name: dump
58-
mountPath: /dump/
37+
# We need to omit changing the users password, as otherwise the content in the Secrets does not match
38+
# the actual password in Postgres.
39+
grep -vwE '(CREATE ROLE postgres;|CREATE ROLE superset;|ALTER ROLE postgres|ALTER ROLE superset)' postgres_superset_dump.sql > /dump/postgres_superset_dump.sql
40+
volumeMounts:
41+
- name: dump
42+
mountPath: /dump/
43+
- name: restore-postgres
44+
image: docker.io/bitnami/postgresql:16.1.0-debian-11-r11 # Same image as the bitnami postgres helm-chart is using
45+
command:
46+
- bash
47+
- -c
48+
- |
49+
psql --host postgresql-superset --user postgres < /dump/postgres_superset_dump.sql
50+
env:
51+
- name: PGPASSWORD
52+
valueFrom:
53+
secretKeyRef:
54+
name: postgresql-superset
55+
key: postgres-password
56+
volumeMounts:
57+
- name: dump
58+
mountPath: /dump/
5959
volumes:
6060
- name: dump
6161
emptyDir: {}

stacks/keycloak-opa-poc/superset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ metadata:
1919
name: superset
2020
spec:
2121
image:
22-
productVersion: 3.0.1
22+
productVersion: 4.0.2
2323
clusterConfig:
2424
credentialsSecret: superset-credentials
2525
listenerClass: external-unstable

0 commit comments

Comments
 (0)