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
12 changes: 12 additions & 0 deletions .github/scripts/deploy-es.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,18 @@ if [ "${#VERSIONS[@]}" -gt "${#NAMES[@]}" ]; then
exit 1
fi

# Pre-pull the ES images on the host and load them into the kind cluster: the node's
# containerd would otherwise pull from docker.elastic.co in-cluster, and the ~1.4 GB
# ES 8/9 images repeatedly hit ImagePullBackOff inside the 300s wait on GitHub runners.
# The Deployment's tagged image + default IfNotPresent then uses the loaded copy, no pull.
KIND_CLUSTER="$(kind get clusters | head -n 1)"
for v in $(printf '%s\n' "${VERSIONS[@]}" | sort -u); do
image="$(es_image "$v")"
echo "Pre-pulling ${image} and loading it into kind cluster '${KIND_CLUSTER}'"
docker pull "$image"
kind load docker-image "$image" --name "$KIND_CLUSTER"
done

deploy_one() {
local name="$1" version="$2" image
image="$(es_image "$version")"
Expand Down
22 changes: 21 additions & 1 deletion .github/workflows/federation-helm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ env:
KIND_NODE_IMAGE: kindest/node:v1.31.0
# The chart's image refs default to the Chart.yaml appVersion. The live jobs pull the
# public DockerHub tags at this version so the chart DEFAULTS resolve the kind-loaded images.
IMAGE_TAG: '0.2.0'
IMAGE_TAG: '0.2.1'
FED_IMAGE: softnetwork/softclient4es-federation
SIDECAR_IMAGE_PREFIX: softnetwork/softclient4es # softclient4es<N>-arrow-flight-sql
# A pre-baked ADBC client image avoids the smoke Job's runtime pip install (air-gap). When
Expand Down Expand Up @@ -206,6 +206,10 @@ jobs:
license: true
steps:
- uses: actions/checkout@v4
- name: Free runner disk (ES + app images + kind-load tarballs exceed the default free space)
run: |
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
df -h /
- name: Set vm.max_map_count (Elasticsearch requirement)
run: sudo sysctl -w vm.max_map_count=262144
- name: Skip if example missing (Story 16.4 not merged)
Expand Down Expand Up @@ -323,6 +327,10 @@ jobs:
es: [6, 7, 8, 9]
steps:
- uses: actions/checkout@v4
- name: Free runner disk (ES + app images + kind-load tarballs exceed the default free space)
run: |
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
df -h /
- name: Set vm.max_map_count (Elasticsearch requirement)
run: sudo sysctl -w vm.max_map_count=262144
- name: Set up Helm
Expand Down Expand Up @@ -370,6 +378,10 @@ jobs:
backend: [raw-secret, sealed-secrets]
steps:
- uses: actions/checkout@v4
- name: Free runner disk (ES + app images + kind-load tarballs exceed the default free space)
run: |
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
df -h /
- name: Set vm.max_map_count (Elasticsearch requirement)
run: sudo sysctl -w vm.max_map_count=262144
- name: Set up Helm
Expand Down Expand Up @@ -425,6 +437,10 @@ jobs:
if: ${{ needs.image-availability.outputs.images_published == 'true' }}
steps:
- uses: actions/checkout@v4
- name: Free runner disk (ES + app images + kind-load tarballs exceed the default free space)
run: |
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
df -h /
- name: Set vm.max_map_count (Elasticsearch requirement)
run: sudo sysctl -w vm.max_map_count=262144
- name: Skip if examples missing or no Pro test license (FACT C + FACT F)
Expand Down Expand Up @@ -499,6 +515,10 @@ jobs:
if: ${{ needs.image-availability.outputs.images_published == 'true' }}
steps:
- uses: actions/checkout@v4
- name: Free runner disk (ES + app images + kind-load tarballs exceed the default free space)
run: |
sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc /opt/hostedtoolcache/CodeQL
df -h /
- name: Set up Helm
uses: azure/setup-helm@v4
with: { version: "${{ env.HELM_VERSION }}" }
Expand Down
6 changes: 4 additions & 2 deletions softclient4es-federation/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ type: application
# 0.2.0: per-ES-version sidecars + federation servers ConfigMap (Story 16.2).
# 0.3.0: Kubernetes Secrets (key-name contract + per-key override + envFrom),
# Secret-backed federation→sidecar creds (CONFIG_FORCE_*), TLS/Ingress (Story 16.3).
version: 0.3.0
# 0.3.1: appVersion 0.2.1 — arrow-extensions JoinExtension priority fix
# (softclient4es-arrow#125) rolled into the federation + sidecar images.
version: 0.3.1
# The federation application/image version this chart deploys by default.
# Keep in sync with docker.io/softnetwork/softclient4es-federation:<tag>.
# NOTE: this appVersion is the future PUBLISHED-release tag (OQ-2) of the public
# DockerHub federation image — set it to whatever tag the release/CI push (OQ-1)
# produces; until then it is PROPOSED.
appVersion: "0.2.0"
appVersion: "0.2.1"
keywords:
- elasticsearch
- flight-sql
Expand Down
18 changes: 9 additions & 9 deletions softclient4es-federation/tests/golden/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ kind: ServiceAccount
metadata:
name: fed-softclient4es-federation
labels:
helm.sh/chart: softclient4es-federation-0.3.0
helm.sh/chart: softclient4es-federation-0.3.1
app.kubernetes.io/name: softclient4es-federation
app.kubernetes.io/instance: fed
app.kubernetes.io/version: "0.2.0"
app.kubernetes.io/version: "0.2.1"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: federation
app.kubernetes.io/part-of: softclient4es
Expand All @@ -20,10 +20,10 @@ kind: Service
metadata:
name: fed-softclient4es-federation
labels:
helm.sh/chart: softclient4es-federation-0.3.0
helm.sh/chart: softclient4es-federation-0.3.1
app.kubernetes.io/name: softclient4es-federation
app.kubernetes.io/instance: fed
app.kubernetes.io/version: "0.2.0"
app.kubernetes.io/version: "0.2.1"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: federation
app.kubernetes.io/part-of: softclient4es
Expand All @@ -44,10 +44,10 @@ kind: Deployment
metadata:
name: fed-softclient4es-federation
labels:
helm.sh/chart: softclient4es-federation-0.3.0
helm.sh/chart: softclient4es-federation-0.3.1
app.kubernetes.io/name: softclient4es-federation
app.kubernetes.io/instance: fed
app.kubernetes.io/version: "0.2.0"
app.kubernetes.io/version: "0.2.1"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: federation
app.kubernetes.io/part-of: softclient4es
Expand All @@ -60,10 +60,10 @@ spec:
template:
metadata:
labels:
helm.sh/chart: softclient4es-federation-0.3.0
helm.sh/chart: softclient4es-federation-0.3.1
app.kubernetes.io/name: softclient4es-federation
app.kubernetes.io/instance: fed
app.kubernetes.io/version: "0.2.0"
app.kubernetes.io/version: "0.2.1"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/component: federation
app.kubernetes.io/part-of: softclient4es
Expand All @@ -78,7 +78,7 @@ spec:
type: RuntimeDefault
containers:
- name: federation
image: "docker.io/softnetwork/softclient4es-federation:0.2.0"
image: "docker.io/softnetwork/softclient4es-federation:0.2.1"
imagePullPolicy: IfNotPresent
securityContext:
allowPrivilegeEscalation: false
Expand Down
Loading
Loading