Skip to content

Commit 9632cdb

Browse files
authored
Merge branch 'main' into stack/observability
2 parents 1f5980b + 0dd7c45 commit 9632cdb

File tree

4 files changed

+33
-13
lines changed

4 files changed

+33
-13
lines changed

demos/data-lakehouse-iceberg-trino-spark/LakehouseKafkaIngest.json

Lines changed: 0 additions & 1 deletion
This file was deleted.

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

Lines changed: 15 additions & 7 deletions
Large diffs are not rendered by default.

stacks/argo-cd-git-ops/applicationsets/stackable-operators.yaml

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ kind: ApplicationSet
44
metadata:
55
name: stackable-operators
66
spec:
7+
goTemplate: true
78
generators:
89
- matrix:
910
generators:
@@ -33,7 +34,7 @@ spec:
3334
# {% raw %}
3435
template:
3536
metadata:
36-
name: "{{ operator }}-operator"
37+
name: "{{ .operator }}-operator"
3738
spec:
3839
project: stackable-operators
3940
ignoreDifferences:
@@ -46,12 +47,12 @@ spec:
4647
- .spec.versions[].additionalPrinterColumns | select(. == [])
4748
source:
4849
repoURL: "oci.stackable.tech"
49-
targetRevision: "{{ targetRevision }}"
50-
chart: "sdp-charts/{{ operator }}-operator"
50+
targetRevision: "{{ .targetRevision }}"
51+
chart: "sdp-charts/{{ .operator }}-operator"
5152
helm:
52-
releaseName: "{{ operator }}-operator"
53+
releaseName: "{{ .operator }}-operator"
5354
destination:
54-
server: "{{ server }}"
55+
server: "{{ .server }}"
5556
namespace: stackable-operators
5657
syncPolicy:
5758
syncOptions:
@@ -61,4 +62,12 @@ spec:
6162
automated:
6263
selfHeal: true
6364
prune: true
65+
templatePatch: |
66+
{{- if eq .operator "listener" }}
67+
spec:
68+
source:
69+
helm:
70+
values: |
71+
preset: stable-nodes
72+
{{- end }}
6473
# {% endraw %}

stacks/data-lakehouse-iceberg-trino-spark/nifi.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ spec:
3333
capacity: "4Gi"
3434
stateRepo:
3535
capacity: "1Gi"
36+
configOverrides:
37+
nifi.properties:
38+
nifi.web.https.sni.required: "false"
39+
nifi.web.https.sni.host.check: "false"
3640
roleGroups:
3741
default:
3842
replicas: 2

0 commit comments

Comments
 (0)