Skip to content

Commit 6cee205

Browse files
authored
Merge branch 'main' into spark-templates-migration-guide
2 parents eec26bc + bf29896 commit 6cee205

15 files changed

Lines changed: 53 additions & 28 deletions

File tree

Makefile

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,20 +54,28 @@ clean:
5454
rm -rf cache
5555

5656
# The netlify repo is checked out without any blobs. Antora needs local
57-
# release branches and their blobs in the object database, so this target
58-
# creates/updates the local branches and materializes their blobs via
59-
# pathspec checkouts - without ever switching HEAD (enabling branch previews!).
60-
# ui/ is excluded: release branches still reference it as a submodule and
61-
# its blobs are not needed (the UI bundle is built from the current checkout).
57+
# release branches and their complete tip trees in the object database (it
58+
# reads them with isomorphic-git, which cannot fetch missing objects on
59+
# demand), so this target creates/updates the local branches and
60+
# materializes their blobs via pathspec checkouts - without ever switching
61+
# HEAD (enabling branch previews!).
6262
netlify-fetch:
6363
# netlify messes with some files, restore everything to how it was:
6464
git reset --hard
6565
# fetch, because netlify does caching and we want to get the latest commits
66-
git fetch --all
67-
for remote in $(shell git branch -r | grep -E 'release[/-]'); do \
68-
branch="$${remote#origin/}"; \
69-
git fetch -q origin "+refs/heads/$$branch:refs/heads/$$branch"; \
70-
git checkout -q "$$branch" -- ':(exclude)ui' . ; \
66+
git fetch --all --prune
67+
# The branch list comes from the remote so it is current even on the first
68+
# build after a new release branch appears (the cached remote-tracking refs
69+
# lag behind). Auto-gc is disabled inside the loop: a background gc can
70+
# race the ref updates and silently leave a stale local branch behind,
71+
# which only surfaces much later as a missing-object error from antora.
72+
# Failures abort the build immediately instead.
73+
set -eu; \
74+
branches="$$(git ls-remote --heads origin | sed 's|.*refs/heads/||' | grep -E 'release[/-]')"; \
75+
[ -n "$$branches" ] || { echo "netlify-fetch: no release branches from ls-remote - refusing to continue"; exit 1; }; \
76+
for branch in $$branches; do \
77+
git -c gc.auto=0 fetch origin "+refs/heads/$$branch:refs/heads/$$branch"; \
78+
git -c gc.auto=0 checkout -q "$$branch" -- . ; \
7179
done
7280
# restore the working tree of the current commit and drop files that
7381
# only exist on other branches (ignored files like node_modules stay)

antora-playbook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ asciidoc:
327327
attributes:
328328
base-repo: https://github.com/stackabletech
329329
# an external icon. Create a link opening in a new tab like this: http://my-url.com[Text {external-link-icon}^]
330-
external-link-icon: "<svg class=\"svg-icon\" style=\"width: 0.75em; height: 0.75em; margin-left: 3px;\" aria-hidden=\"true\"><use href=\"/_/img/icons.svg#icon-external-link\"/></svg>"
330+
external-link-icon: "<svg class=\"svg-icon\" style=\"width: 0.75em; height: 0.75em; margin-left: 3px;\" aria-hidden=\"true\"><use href=\"#icon-external-link\"/></svg>"
331331
# the default caching directory is ./.cache/antora
332332
# Antora caches the git repos, this can sometimes lead to stale content
333333
# use 'make clean' to remove the build and cache directory

local-antora-playbook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ asciidoc:
312312
attributes:
313313
base-repo: https://github.com/stackabletech
314314
# an external icon. Create a link opening in a new tab like this: http://my-url.com[Text {external-link-icon}^]
315-
external-link-icon: "<svg class=\"svg-icon\" style=\"width: 0.75em; height: 0.75em; margin-left: 3px;\" aria-hidden=\"true\"><use href=\"/_/img/icons.svg#icon-external-link\"/></svg>"
315+
external-link-icon: "<svg class=\"svg-icon\" style=\"width: 0.75em; height: 0.75em; margin-left: 3px;\" aria-hidden=\"true\"><use href=\"#icon-external-link\"/></svg>"
316316
# the default caching directory is ./.cache/antora
317317
# Antora caches the git repos, this can sometimes lead to stale content
318318
# use 'make clean' to remove the build and cache directory

modules/ROOT/pages/kubernetes/openshift.adoc

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ SDP operators are certified for the OpenShift platform and can be installed from
77

88
IMPORTANT: OpenShift installations with FIPS mode enabled are not supported. This is because neither the SDP operators, nor the supported Apache products are FIPS-compliant.
99

10+
IMPORTANT: The operators deployed with OLM might have higher memory requests (and limits) compared to our Helm charts, as we have seen typical production OpenShift clusters being larger than typical non-Openshift clusters.
11+
The reason is that memory usage of some of our operators scales with the number of objects in your Kubernetes cluster.
12+
However, you can fine-tune the operator memory requirements using a custom Subscription object as described below, so this note is only about the default resources!
13+
1014
== Customizing operator installations
1115

1216
As described in the https://github.com/operator-framework/operator-lifecycle-manager/blob/master/doc/design/subscription-config.md[Openshift Subscription documentation{external-link-icon}^] you can configure the deployed operators.
@@ -53,7 +57,12 @@ spec:
5357
value: kafka-namespace
5458
----
5559

56-
IMPORTANT: The described configuration mechanism currently does not work for secret and listener-operator due to restrictions on deploying DaemonSets.
60+
=== secret and listener-operator
61+
62+
The secret and listener operator are not deployed by OLM directly but rather by a helper tool called `olm-deployer`. This tool is needed to work around some OLM limitations that prevent it from directly installing these operators.
63+
In this case, `olm-deployer` takes **it's own** resource requests and applies them to all containers on the `DaemonSets` of these operators..
64+
65+
This allows you to customize the resources of the DaemonSet in the same way as for the other operators - but doesn't allow individual resources for each container.
5766

5867
== Security context constraints
5968

modules/ROOT/partials/release-notes/release-26.7.adoc

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,5 +620,10 @@ The operators are installed directly, without adding the Helm Chart repository f
620620
helm install --wait <PRODUCT>-operator oci://oci.stackable.tech/sdp-charts/<PRODUCT>-operator --version 26.7.0
621621
----
622622

623-
// [#known-issues-26_7_0]
624-
// ==== Known issues
623+
[#known-issues-26_7_0]
624+
==== Known issues
625+
626+
Failed Apache Spark applications are reported as successful.
627+
The entrypoint of the Spark images does not propagate the exit code of the Spark process, so the driver Pod always terminates with exit code `0` and the SparkApplication ends up in the `Succeeded` state even if the application failed.
628+
Until the fix is released, the driver logs must be checked to determine whether an application actually succeeded.
629+
Fixed in https://github.com/stackabletech/docker-images/pull/1595[docker-images#1595].

modules/reference/pages/glossary.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
= Glossary
2-
:li: pass:[<svg class="svg-icon" style="width: 0.875em; height: 0.875em; margin-left: 5px;" aria-hidden="true"><use href="/_/img/icons.svg#icon-link"/></svg>]
2+
:li: pass:[<svg class="svg-icon" style="width: 0.875em; height: 0.875em; margin-left: 5px;" aria-hidden="true"><use href="#icon-link"/></svg>]
33
:description: Glossary of Stackable terms, including Role, Role Group, and Stacklet, with definitions and links to detailed explanations.
44

55
// refined styling for the glossary

only-dev-antora-playbook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ asciidoc:
105105
attributes:
106106
base-repo: https://github.com/stackabletech
107107
# an external icon. Create a link opening in a new tab like this: http://my-url.com[Text {external-link-icon}^]
108-
external-link-icon: "<svg class=\"svg-icon\" style=\"width: 0.75em; height: 0.75em; margin-left: 3px;\" aria-hidden=\"true\"><use href=\"/_/img/icons.svg#icon-external-link\"/></svg>"
108+
external-link-icon: "<svg class=\"svg-icon\" style=\"width: 0.75em; height: 0.75em; margin-left: 3px;\" aria-hidden=\"true\"><use href=\"#icon-external-link\"/></svg>"
109109
# the default caching directory is ./.cache/antora
110110
# Antora caches the git repos, this can sometimes lead to stale content
111111
# use 'make clean' to remove the build and cache directory

supplemental-ui/partials/navbar.hbs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<a class="navbar-item" href="{{{ relativize (versioned "home" page "reference/index.html") }}}">CRD Reference</a>
1919
{{else}}
2020
<a class="navbar-item" href="{{{ page.attributes.crd-docs }}}" target="_blank">
21-
CRD Reference <svg class="svg-icon" style="width: 0.875em; height: 0.875em; margin-left: 5px;" aria-hidden="true"><use href="{{{uiRootPath}}}/img/icons.svg#icon-external-link"/></svg>
21+
CRD Reference <svg class="svg-icon" style="width: 0.875em; height: 0.875em; margin-left: 5px;" aria-hidden="true"><use href="#icon-external-link"/></svg>
2222
</a>
2323
{{/if}}
2424
<hr class="navbar-divider">
@@ -95,13 +95,13 @@
9595
<a class="navbar-link" href="#">Community</a>
9696
<div class="navbar-dropdown">
9797
<a class="navbar-item" href="https://stackable.tech/en/" target="_blank">
98-
Homepage <svg class="svg-icon" style="width: 0.875em; height: 0.875em; margin-left: 5px;" aria-hidden="true"><use href="{{{uiRootPath}}}/img/icons.svg#icon-external-link"/></svg>
98+
Homepage <svg class="svg-icon" style="width: 0.875em; height: 0.875em; margin-left: 5px;" aria-hidden="true"><use href="#icon-external-link"/></svg>
9999
</a>
100100
<a class="navbar-item" href="https://github.com/stackabletech/" target="_blank">
101-
GitHub <svg class="svg-icon" style="width: 0.875em; height: 0.875em; margin-left: 5px;" aria-hidden="true"><use href="{{{uiRootPath}}}/img/icons.svg#icon-external-link"/></svg>
101+
GitHub <svg class="svg-icon" style="width: 0.875em; height: 0.875em; margin-left: 5px;" aria-hidden="true"><use href="#icon-external-link"/></svg>
102102
</a>
103103
<a class="navbar-item" href="https://discord.com/invite/7kZ3BNnCAF" target="_blank">
104-
Discord <svg class="svg-icon" style="width: 0.875em; height: 0.875em; margin-left: 5px;" aria-hidden="true"><use href="{{{uiRootPath}}}/img/icons.svg#icon-external-link"/></svg>
104+
Discord <svg class="svg-icon" style="width: 0.875em; height: 0.875em; margin-left: 5px;" aria-hidden="true"><use href="#icon-external-link"/></svg>
105105
</a>
106106
<hr class="navbar-divider">
107107
<a class="navbar-item" href="{{{ relativize (versioned "home" page "contributor/index.html") }}}">Contributing</a>

truly-local-playbook.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ asciidoc:
7070
attributes:
7171
base-repo: https://github.com/stackabletech
7272
# an external icon. Create a link opening in a new tab like this: http://my-url.com[Text {external-link-icon}^]
73-
external-link-icon: "<svg class=\"svg-icon\" style=\"width: 0.75em; height: 0.75em; margin-left: 3px;\" aria-hidden=\"true\"><use href=\"/_/img/icons.svg#icon-external-link\"/></svg>"
73+
external-link-icon: "<svg class=\"svg-icon\" style=\"width: 0.75em; height: 0.75em; margin-left: 3px;\" aria-hidden=\"true\"><use href=\"#icon-external-link\"/></svg>"
7474
# the default caching directory is ./.cache/antora
7575
# Antora caches the git repos, this can sometimes lead to stale content
7676
# use 'make clean' to remove the build and cache directory

ui/src/layouts/404.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
{{> head defaultPageTitle='Page Not Found'}}
55
</head>
66
<body class="status-404">
7+
{{> icons}}
78
{{> universal-nav}}
89
{{> header}}
910
{{> body}}

0 commit comments

Comments
 (0)