Skip to content

Commit

Permalink
Create a deploy directory per kubeconfig in CI release scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
rzetelskik committed Jul 15, 2024
1 parent 9de01cf commit 3b8dc7f
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion hack/.ci/run-e2e-gke-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ SCYLLA_OPERATOR_FEATURE_GATES="${SCYLLA_OPERATOR_FEATURE_GATES:-AllAlpha=true,Al
export SCYLLA_OPERATOR_FEATURE_GATES

for i in "${!KUBECONFIGS[@]}"; do
KUBECONFIG="${KUBECONFIGS[$i]}" timeout --foreground -v 10m "${parent_dir}/../ci-deploy-release.sh" "${SO_IMAGE}" &
KUBECONFIG="${KUBECONFIGS[$i]}" DEPLOY_DIR="${ARTIFACTS}/deploy/${i}" timeout --foreground -v 10m "${parent_dir}/../ci-deploy-release.sh" "${SO_IMAGE}" &
ci_deploy_bg_pids["${i}"]=$!
done

Expand Down
21 changes: 12 additions & 9 deletions hack/ci-deploy-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ fi

ARTIFACTS="${ARTIFACTS:-$( mktemp -d )}"

if [ -z "${DEPLOY_DIR+x}" ]; then
DEPLOY_DIR="${ARTIFACTS}/deploy"
fi

mkdir -p "${DEPLOY_DIR}/"{operator,manager}

kubectl_create -n=prometheus-operator -f="${source_url}/${revision}/examples/third-party/prometheus-operator.yaml"
kubectl_create -n=haproxy-ingress -f="${source_url}/${revision}/examples/third-party/haproxy-ingress.yaml"

Expand All @@ -44,8 +50,7 @@ for d in cert-manager{,-cainjector,-webhook}; do
done
wait-for-object-creation cert-manager secret/cert-manager-webhook-ca

mkdir "${ARTIFACTS}/operator"
cat > "${ARTIFACTS}/operator/kustomization.yaml" << EOF
cat > "${DEPLOY_DIR}/operator/kustomization.yaml" << EOF
resources:
- ${source_url}/${revision}/deploy/operator.yaml
patches:
Expand All @@ -65,7 +70,7 @@ patches:
- name: SCYLLA_OPERATOR_IMAGE
value: "${operator_image_ref}"
EOF
kubectl kustomize "${ARTIFACTS}/operator" | kubectl_create -n=scylla-operator -f=-
kubectl kustomize "${DEPLOY_DIR}/operator" | kubectl_create -n=scylla-operator -f=-

# Manager needs scylla CRD registered and the webhook running
kubectl wait --for condition=established crd/{scyllaclusters,nodeconfigs}.scylla.scylladb.com
Expand All @@ -91,8 +96,7 @@ fi
if [[ -z "${SO_SCYLLACLUSTER_STORAGECLASS_NAME+x}" ]]; then
kubectl_create -n=scylla-manager -f="${source_url}/${revision}/deploy/manager-prod.yaml"
elif [[ -n "${SO_SCYLLACLUSTER_STORAGECLASS_NAME}" ]]; then
mkdir "${ARTIFACTS}/manager"
cat > "${ARTIFACTS}/manager/kustomization.yaml" << EOF
cat > "${DEPLOY_DIR}/manager/kustomization.yaml" << EOF
resources:
- ${source_url}/${revision}/deploy/manager-prod.yaml
patches:
Expand All @@ -106,10 +110,9 @@ patches:
path: /spec/datacenter/racks/0/storage/storageClassName
value: "${SO_SCYLLACLUSTER_STORAGECLASS_NAME}"
EOF
kubectl kustomize "${ARTIFACTS}/manager" | kubectl_create -n=scylla-manager -f=-
kubectl kustomize "${DEPLOY_DIR}/manager" | kubectl_create -n=scylla-manager -f=-
else
mkdir "${ARTIFACTS}/manager"
cat > "${ARTIFACTS}/manager/kustomization.yaml" << EOF
cat > "${DEPLOY_DIR}/manager/kustomization.yaml" << EOF
resources:
- ${source_url}/${revision}/deploy/manager-prod.yaml
patches:
Expand All @@ -122,7 +125,7 @@ patches:
- op: remove
path: /spec/datacenter/racks/0/storage/storageClassName
EOF
kubectl kustomize "${ARTIFACTS}/manager" | kubectl_create -n=scylla-manager -f=-
kubectl kustomize "${DEPLOY_DIR}/manager" | kubectl_create -n=scylla-manager -f=-
fi

kubectl -n=scylla-manager wait --timeout=5m --for='condition=Progressing=False' scyllaclusters.scylla.scylladb.com/scylla-manager-cluster
Expand Down

0 comments on commit 3b8dc7f

Please sign in to comment.