Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create a deploy directory per kubeconfig in CI release scripts #2020

Merged
merged 1 commit into from
Jul 15, 2024
Merged

Create a deploy directory per kubeconfig in CI release scripts #2020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion hack/.ci/run-e2e-gke-release.sh
View file
Open in desktop
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]}" ARTIFACTS_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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ fi

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

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

mkdir -p "${ARTIFACTS_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 > "${ARTIFACTS_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 "${ARTIFACTS_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 > "${ARTIFACTS_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 "${ARTIFACTS_DEPLOY_DIR}/manager" | kubectl_create -n=scylla-manager -f=-
else
mkdir "${ARTIFACTS}/manager"
cat > "${ARTIFACTS}/manager/kustomization.yaml" << EOF
cat > "${ARTIFACTS_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 "${ARTIFACTS_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