Skip to content

Commit c13c525

Browse files
committed
merge master into tests_refactoring, fix conflicts
Signed-off-by: Slach <[email protected]>
2 parents d22d63c + 30bd85c commit c13c525

38 files changed

+2080
-1255
lines changed

.github/workflows/check_helm.yaml

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,34 @@ jobs:
3232
- name: Local Helm Test
3333
run: |
3434
set -xe
35+
export CHO_RELEASE=$(cat release)
36+
IMAGES=(
37+
"altinity/clickhouse-operator:${CHO_RELEASE}"
38+
"altinity/metrics-exporter:${CHO_RELEASE}"
39+
)
40+
need_build=false
41+
echo "Checking images in registry…"
42+
for img in "${IMAGES[@]}"; do
43+
if docker manifest inspect "$img" >/dev/null 2>&1; then
44+
echo "✔ Image exists: $img"
45+
else
46+
echo "✖ Image missing: $img"
47+
need_build=true
48+
fi
49+
done
50+
51+
if [[ "$need_build" = true ]]; then
52+
export GO_VERSION=$(grep '^go ' go.mod | awk '{print $2}')
53+
54+
docker build -f dockerfile/operator/Dockerfile --build-arg GO_VERSION=${GO_VERSION} -t altinity/clickhouse-operator:${CHO_RELEASE} --pull .
55+
docker build -f dockerfile/metrics-exporter/Dockerfile --build-arg GO_VERSION=${GO_VERSION} -t altinity/metrics-exporter:${CHO_RELEASE} --pull .
56+
57+
docker image save altinity/clickhouse-operator:${CHO_RELEASE} -o operator.tar
58+
docker image save altinity/metrics-exporter:${CHO_RELEASE} -o metrics-exporter.tar
59+
60+
minikube image load operator.tar
61+
minikube image load metrics-exporter.tar
62+
fi
3563
minikube kubectl create ns test
3664
./dev/generate_helm_chart.sh
3765
helm install -n test test-operator ./deploy/helm/clickhouse-operator/
@@ -48,6 +76,6 @@ jobs:
4876
exit 1
4977
fi
5078
kubectl apply -n test -f ./docs/chi-examples/01-simple-layout-01-1shard-1repl.yaml
51-
kubectl wait -n test --for=create chi/simple-01 --timeout=60s
52-
kubectl wait -n test --for=jsonpath='{.status.status}'=Completed chi/simple-01 --timeout=1m
53-
kubectl wait -n test --for=condition=Ready pod/chi-simple-01-simple-0-0-0
79+
kubectl wait -n test --for=create chi/simple-01 --timeout=1m
80+
kubectl wait -n test --for=jsonpath='{.status.status}'=Completed chi/simple-01 --timeout=3m
81+
kubectl wait -n test --for=condition=Ready pod/chi-simple-01-simple-0-0-0 --timeout=3m

0 commit comments

Comments
 (0)