Skip to content

Commit 44c70cf

Browse files
committed
fix: align to namespaces other than cluster-cognition
1 parent d7ca6f2 commit 44c70cf

File tree

1 file changed

+10
-16
lines changed

1 file changed

+10
-16
lines changed

k8s/test.sh

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,6 @@ kubectl config set-context --current --namespace=$KUBERNETES_NAMESPACE
5353
echo "Context set to namespace: \"$KUBERNETES_NAMESPACE\""
5454
kubectl apply --kustomize infrastructure/test
5555
__safe_migration_rollout test-postgres
56-
kubectl apply --kustomize apps/refinery-gateway/test
57-
__safe_migration_rollout test-${KUBERNETES_DEPLOYMENT_NAME}
5856
echo "::endgroup::"
5957

6058

@@ -75,6 +73,9 @@ upgrade_alembic_migrations() {
7573
echo "::group::Upgrade alembic migrations for test"
7674
if [ $KUBERNETES_DEPLOYMENT_NAME != "refinery-gateway" ] && [ $KUBERNETES_DEPLOYMENT_NAME != "gates-gateway" ] && [ $KUBERNETES_DEPLOYMENT_NAME != "hosted-inference-api" ]; then
7775
if [ -n "$REFINERY_IMAGE_TAG_EXISTS" ]; then
76+
kubectl apply --kustomize apps/${REFINERY_DEPLOYMENT_NAME}/test
77+
__safe_migration_rollout test-${REFINERY_DEPLOYMENT_NAME}
78+
7879
REFINERY_ALEMBIC_VERSION=$(kubectl exec -i deployment/test-${REFINERY_DEPLOYMENT_NAME} -c test-${REFINERY_DEPLOYMENT_NAME} -- alembic current)
7980
REFINERY_ALEMBIC_VERSION=${REFINERY_ALEMBIC_VERSION:0:12}
8081
echo "::warning::current $REFINERY_DEPLOYMENT_NAME alembic version: $REFINERY_ALEMBIC_VERSION"
@@ -87,6 +88,9 @@ upgrade_alembic_migrations() {
8788
echo "::warning::upgraded $REFINERY_DEPLOYMENT_NAME alembic version: $_REFINERY_ALEMBIC_VERSION"
8889
fi
8990
else
91+
kubectl apply --kustomize apps/${KUBERNETES_DEPLOYMENT_NAME}/test
92+
__safe_migration_rollout test-${KUBERNETES_DEPLOYMENT_NAME}
93+
9094
KUBERNETES_DEPLOYMENT_ALEMBIC_VERSION=$(kubectl exec -i deployment/test-${KUBERNETES_DEPLOYMENT_NAME} -c test-${KUBERNETES_DEPLOYMENT_NAME} -- alembic current)
9195
KUBERNETES_DEPLOYMENT_ALEMBIC_VERSION=${KUBERNETES_DEPLOYMENT_ALEMBIC_VERSION:0:12}
9296
echo "::warning::current $KUBERNETES_DEPLOYMENT_NAME alembic version: $KUBERNETES_DEPLOYMENT_ALEMBIC_VERSION"
@@ -106,21 +110,13 @@ downgrade_alembic_migrations() {
106110
if [ $KUBERNETES_DEPLOYMENT_NAME != "refinery-gateway" ] && [ $KUBERNETES_DEPLOYMENT_NAME != "gates-gateway" ] && [ $KUBERNETES_DEPLOYMENT_NAME != "hosted-inference-api" ]; then
107111
if [ -n "$REFINERY_IMAGE_TAG_EXISTS" ]; then
108112
kubectl exec -i deployment/test-${REFINERY_DEPLOYMENT_NAME} -c test-${REFINERY_DEPLOYMENT_NAME} -- alembic downgrade $REFINERY_ALEMBIC_VERSION
109-
echo "::warning::downgraded $REFINERY_DEPLOYMENT_NAME alembic version to $REFINERY_ALEMBIC_VERSION"
110-
kubectl set image deployment/test-${REFINERY_DEPLOYMENT_NAME} \
111-
test-${REFINERY_DEPLOYMENT_NAME}-migrate=${REFINERY_POD_EXISTING_IMAGE} \
112-
test-${REFINERY_DEPLOYMENT_NAME}=${REFINERY_POD_EXISTING_IMAGE}
113-
__safe_migration_rollout test-${REFINERY_DEPLOYMENT_NAME}
114-
echo "::warning::using ${REFINERY_POD_EXISTING_IMAGE}"
113+
echo "::warning::downgraded test-$REFINERY_DEPLOYMENT_NAME alembic version to $REFINERY_ALEMBIC_VERSION"
114+
kubectl delete --kustomize apps/${REFINERY_DEPLOYMENT_NAME}/test
115115
fi
116116
else
117117
kubectl exec -i deployment/test-${KUBERNETES_DEPLOYMENT_NAME} -c test-${KUBERNETES_DEPLOYMENT_NAME} -- alembic downgrade $KUBERNETES_DEPLOYMENT_ALEMBIC_VERSION
118-
echo "::warning::downgraded $KUBERNETES_DEPLOYMENT_NAME alembic version to $KUBERNETES_DEPLOYMENT_ALEMBIC_VERSION"
119-
kubectl set image deployment/test-${KUBERNETES_DEPLOYMENT_NAME} \
120-
test-${KUBERNETES_DEPLOYMENT_NAME}-migrate=${KUBERNETES_POD_EXISTING_IMAGE} \
121-
test-${KUBERNETES_DEPLOYMENT_NAME}=${KUBERNETES_POD_EXISTING_IMAGE}
122-
__safe_migration_rollout test-${KUBERNETES_DEPLOYMENT_NAME}
123-
echo "::warning::using ${KUBERNETES_POD_EXISTING_IMAGE}"
118+
echo "::warning::downgraded test-$KUBERNETES_DEPLOYMENT_NAME alembic version to $KUBERNETES_DEPLOYMENT_ALEMBIC_VERSION"
119+
kubectl delete --kustomize apps/${KUBERNETES_DEPLOYMENT_NAME}/test
124120
fi
125121
echo "::endgroup::"
126122
}
@@ -148,8 +144,6 @@ if [ "$ENABLE_ALEMBIC_MIGRATIONS" = "true" ]; then
148144
fi
149145

150146
echo "::group::Delete Test Infrastructure"
151-
kubectl delete --kustomize apps/${KUBERNETES_DEPLOYMENT_NAME}/test
152-
kubectl delete --kustomize apps/refinery-gateway/test
153147
kubectl delete --kustomize infrastructure/test
154148
echo "::endgroup::"
155149

0 commit comments

Comments
 (0)