@@ -103,7 +103,6 @@ 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"
107
106
# overrides for server-config
108
107
if [[ " server-config" == " $NAME " ]] && [[ " $KIND " == " ConfigMap" ]]; then
109
108
WORK=" overrides for $NAME $KIND "
@@ -114,6 +113,12 @@ while [ "$documentIndex" -le "$DOCS" ]; do
114
113
DEV_BRANCH_EXPR=" s/\" devBranch\" : \"\" /\" devBranch\" : \" $DEV_BRANCH \" /"
115
114
sed -i " $DEV_BRANCH_EXPR " /tmp/" $NAME " overrides.yaml
116
115
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
117
122
# Stage
118
123
STAGE=$( yq r ./.werft/jobs/build/helm/values.dev.yaml installation.stage)
119
124
STAGE_EXPR=" s/\" stage\" : \" production\" /\" stage\" : \" $STAGE \" /"
@@ -149,6 +154,10 @@ while [ "$documentIndex" -le "$DOCS" ]; do
149
154
touch /tmp/" $NAME " overrides.yaml
150
155
yq r k8s.yaml -d " $documentIndex " data | yq prefix - data > /tmp/" $NAME " overrides.yaml
151
156
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
152
161
yq m -x -i k8s.yaml -d " $documentIndex " /tmp/" $NAME " overrides.yaml
153
162
fi
154
163
@@ -166,6 +175,7 @@ while [ "$documentIndex" -le "$DOCS" ]; do
166
175
touch /tmp/" $NAME " overrides.yaml
167
176
yq r k8s.yaml -d " $documentIndex " data | yq prefix - data > /tmp/" $NAME " overrides.yaml
168
177
178
+ SHORT_NAME=$( yq r ./.werft/jobs/build/helm/values.dev.yaml installation.shortname)
169
179
STAGING_HOST_NAME=$( yq r ./.werft/jobs/build/helm/values.dev.yaml hostname)
170
180
CURRENT_WS_HOST_NAME=" ws.$DEV_BRANCH .$STAGING_HOST_NAME "
171
181
NEW_WS_HOST_NAME=" ws-$SHORT_NAME .$DEV_BRANCH .$STAGING_HOST_NAME "
@@ -212,6 +222,7 @@ while [ "$documentIndex" -le "$DOCS" ]; do
212
222
yq r k8s.yaml -d " $documentIndex " data | yq prefix - data > /tmp/" $NAME " overrides.yaml
213
223
214
224
# 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)
215
226
STAGING_HOST_NAME=$( yq r ./.werft/jobs/build/helm/values.dev.yaml hostname)
216
227
CURRENT_WS_HOST_NAME=" ws.$DEV_BRANCH .$STAGING_HOST_NAME "
217
228
NEW_WS_HOST_NAME=" ws-$SHORT_NAME .$DEV_BRANCH .$STAGING_HOST_NAME "
0 commit comments