Skip to content

Commit 99ca85a

Browse files
authored
ci(kubernetes): stabilize HA e2e setup (#1659)
* ci(kubernetes): pin mise in e2e workflow Signed-off-by: Taylor Mutch <taylormutch@gmail.com> * ci(kubernetes): mirror postgres image for ha e2e Signed-off-by: Taylor Mutch <taylormutch@gmail.com> * ci(kubernetes): reuse e2e workflow for ha Signed-off-by: Taylor Mutch <taylormutch@gmail.com> --------- Signed-off-by: Taylor Mutch <taylormutch@gmail.com>
1 parent 2d78503 commit 99ca85a

4 files changed

Lines changed: 28 additions & 39 deletions

File tree

.github/workflows/branch-e2e.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,11 @@ jobs:
117117
permissions:
118118
contents: read
119119
packages: read
120-
uses: ./.github/workflows/e2e-kubernetes-ha-test.yml
120+
uses: ./.github/workflows/e2e-kubernetes-test.yml
121121
with:
122122
image-tag: ${{ github.sha }}
123+
job-name: Kubernetes HA E2E (Rust smoke)
124+
extra-helm-values: deploy/helm/openshell/ci/values-high-availability.yaml
123125

124126
core-e2e-result:
125127
name: Core E2E result

.github/workflows/e2e-kubernetes-ha-test.yml

Lines changed: 0 additions & 37 deletions
This file was deleted.

.github/workflows/e2e-kubernetes-test.yml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,29 @@ on:
1717
required: false
1818
type: string
1919
default: ""
20+
job-name:
21+
description: "Display name for the Kubernetes e2e job"
22+
required: false
23+
type: string
24+
default: "Kubernetes E2E (Rust smoke)"
2025
extra-helm-values:
2126
description: "Colon-separated Helm values files to layer on the Kubernetes e2e chart install"
2227
required: false
2328
type: string
2429
default: ""
30+
mise-version:
31+
description: "mise version to install on the bare Kubernetes e2e runner"
32+
required: false
33+
type: string
34+
default: "v2026.4.25"
2535

2636
permissions:
2737
contents: read
2838
packages: read
2939

3040
jobs:
3141
e2e-kubernetes:
32-
name: Kubernetes E2E (Rust smoke)
42+
name: ${{ inputs.job-name }}
3343
# Bare runner: running kind-in-container hits nested-Docker / kubeconfig
3444
# complications. The runner has Docker; mise installs helm, kubectl, and
3545
# the Rust toolchain.
@@ -40,6 +50,8 @@ jobs:
4050
packages: read
4151
env:
4252
MISE_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
53+
# Keep bare-runner installs aligned with the project CI image.
54+
MISE_VERSION: ${{ inputs.mise-version }}
4355
KIND_CLUSTER_NAME: kube-e2e-${{ github.run_id }}
4456
steps:
4557
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6

deploy/helm/openshell/ci/values-high-availability.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,19 @@
66
# this overlay enables the bundled PostgreSQL dependency added by the chart.
77
replicaCount: 2
88

9+
global:
10+
security:
11+
# The mirror serves the same pinned Bitnami PostgreSQL digest, but Bitnami's
12+
# chart verification treats non-Docker-Hub registries as unrecognized.
13+
allowInsecureImages: true
14+
915
postgres:
1016
enabled: true
17+
# Keep the HA CI/dev overlay off Docker Hub's unauthenticated pull path.
18+
# The Bitnami subchart defaults to registry-1.docker.io/bitnami/postgresql:latest.
19+
image:
20+
registry: mirror.gcr.io
21+
repository: bitnami/postgresql
22+
digest: sha256:7651d7f24aad83fe68a222f7f20eded10d325c96ebee285ca5bf8162eddcba64
1123
auth:
1224
password: openshell-ha-ci

0 commit comments

Comments
 (0)