@@ -103,6 +103,7 @@ while [ "$documentIndex" -le "$DOCS" ]; do
103
103
yq m --arrays=overwrite -i k8s.yaml -d " $documentIndex " /tmp/" $NAME " pool.yaml
104
104
fi
105
105
106
+ SHORT_NAME=" dev"
106
107
# overrides for server-config
107
108
if [[ " server-config" == " $NAME " ]] && [[ " $KIND " == " ConfigMap" ]]; then
108
109
WORK=" overrides for $NAME $KIND "
@@ -113,12 +114,6 @@ while [ "$documentIndex" -le "$DOCS" ]; do
113
114
DEV_BRANCH_EXPR=" s/\" devBranch\" : \"\" /\" devBranch\" : \" $DEV_BRANCH \" /"
114
115
sed -i " $DEV_BRANCH_EXPR " /tmp/" $NAME " overrides.yaml
115
116
116
- # InstallationShortname
117
- # is expected to look like ws-dev.<branch-name-with-dashes>.staging.gitpod-dev.com
118
- SHORT_NAME=$( yq r ./.werft/jobs/build/helm/values.dev.yaml installation.shortname)
119
- NAMESPACE=$( kubens -c)
120
- INSTALL_SHORT_NAME_EXPR=" s/\" installationShortname\" : \" $NAMESPACE \" /\" installationShortname\" : \" $SHORT_NAME \" /"
121
- sed -i " $INSTALL_SHORT_NAME_EXPR " /tmp/" $NAME " overrides.yaml
122
117
# Stage
123
118
STAGE=$( yq r ./.werft/jobs/build/helm/values.dev.yaml installation.stage)
124
119
STAGE_EXPR=" s/\" stage\" : \" production\" /\" stage\" : \" $STAGE \" /"
@@ -154,10 +149,6 @@ while [ "$documentIndex" -le "$DOCS" ]; do
154
149
touch /tmp/" $NAME " overrides.yaml
155
150
yq r k8s.yaml -d " $documentIndex " data | yq prefix - data > /tmp/" $NAME " overrides.yaml
156
151
157
- # simliar to server, except the ConfigMap hierarchy, key, and value are different
158
- SHORT_NAME=$( yq r ./.werft/jobs/build/helm/values.dev.yaml installation.shortname)
159
- INSTALL_SHORT_NAME_EXPR=" s/\" installation\" : \"\" /\" installation\" : \" $SHORT_NAME \" /"
160
- sed -i " $INSTALL_SHORT_NAME_EXPR " /tmp/" $NAME " overrides.yaml
161
152
yq m -x -i k8s.yaml -d " $documentIndex " /tmp/" $NAME " overrides.yaml
162
153
fi
163
154
@@ -175,7 +166,6 @@ while [ "$documentIndex" -le "$DOCS" ]; do
175
166
touch /tmp/" $NAME " overrides.yaml
176
167
yq r k8s.yaml -d " $documentIndex " data | yq prefix - data > /tmp/" $NAME " overrides.yaml
177
168
178
- SHORT_NAME=$( yq r ./.werft/jobs/build/helm/values.dev.yaml installation.shortname)
179
169
STAGING_HOST_NAME=$( yq r ./.werft/jobs/build/helm/values.dev.yaml hostname)
180
170
CURRENT_WS_HOST_NAME=" ws.$DEV_BRANCH .$STAGING_HOST_NAME "
181
171
NEW_WS_HOST_NAME=" ws-$SHORT_NAME .$DEV_BRANCH .$STAGING_HOST_NAME "
@@ -222,7 +212,6 @@ while [ "$documentIndex" -le "$DOCS" ]; do
222
212
yq r k8s.yaml -d " $documentIndex " data | yq prefix - data > /tmp/" $NAME " overrides.yaml
223
213
224
214
# simliar to server, except the ConfigMap hierarchy, key, and value are different
225
- SHORT_NAME=$( yq r ./.werft/jobs/build/helm/values.dev.yaml installation.shortname)
226
215
STAGING_HOST_NAME=$( yq r ./.werft/jobs/build/helm/values.dev.yaml hostname)
227
216
CURRENT_WS_HOST_NAME=" ws.$DEV_BRANCH .$STAGING_HOST_NAME "
228
217
NEW_WS_HOST_NAME=" ws-$SHORT_NAME .$DEV_BRANCH .$STAGING_HOST_NAME "
0 commit comments