Skip to content

Commit 68819ae

Browse files
committed
[werft] Support observability with Installer
1 parent dc78a19 commit 68819ae

File tree

2 files changed

+10
-19
lines changed

2 files changed

+10
-19
lines changed

.werft/build.ts

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -316,17 +316,14 @@ interface DeploymentConfig {
316316

317317
/*
318318
* Deploy a preview environment using the Installer
319-
*
320-
* TODO: add support for tracing, if needed, use with-helm for now
321-
* TODO: add support for k3sWsCluster, if needed, use with-helm for now
322319
*/
323320
export async function deployToDevWithInstaller(deploymentConfig: DeploymentConfig, workspaceFeatureFlags: string[], dynamicCPULimits, storage) {
324321
// to test this function, change files in your workspace, and sideload (-s) changed files into werft like so
325-
// werft run github -f -j ./.werft/build.yaml -s ./.werft/post-process.sh -s ./.werft/build.ts -a with-clean-slate-deployment=true
322+
// werft run github -f -j ./.werft/build.yaml -s ./.werft/util/kubectl.ts -a with-clean-slate-deployment=true
326323

327324
werft.phase(phases.DEPLOY, "deploying to dev")
328325

329-
const { version, destname, namespace, domain, monitoringDomain, url } = deploymentConfig;
326+
const { version, destname, namespace, domain, monitoringDomain, url, withObservability } = deploymentConfig;
330327

331328
// find free ports
332329
werft.log(installerSlices.FIND_FREE_HOST_PORTS, "Check for some free ports.");
@@ -432,8 +429,10 @@ export async function deployToDevWithInstaller(deploymentConfig: DeploymentConfi
432429

433430
// TODO: add analytics
434431

435-
// TODO: try adding honeycomb, if with-tracing is set
436-
// exec(`yq w -i config.yaml jaegerOperator.inCluster ${false}`, {slice: installerSlices.INSTALLER_RENDER});
432+
if (withObservability) {
433+
const tracingEndpoint = exec(`yq r ./.werft/values.dev.yaml tracing.endpoint`,{slice: installerSlices.INSTALLER_RENDER}).stdout.trim();
434+
exec(`yq w -i config.yaml observability.tracing.endpoint ${tracingEndpoint}`, {slice: installerSlices.INSTALLER_RENDER});
435+
}
437436

438437
// TODO: Remove this after #6867 is done
439438
werft.log("authProviders", "copy authProviders")
@@ -483,7 +482,7 @@ export async function deployToDevWithInstaller(deploymentConfig: DeploymentConfi
483482
exec(`werft log result -d "dev installation" -c github-check-preview-env url ${url}/projects`);
484483
}
485484

486-
// TODO: test sweeper is installed
485+
// TODO: test sweeper is working (check on Monday)
487486
werft.log('sweeper', 'installing Sweeper');
488487
const sweeperVersion = deploymentConfig.sweeperImage.split(":")[1];
489488
werft.log('sweeper', `Sweeper version: ${sweeperVersion}`);
@@ -515,17 +514,9 @@ export async function deployToDevWithInstaller(deploymentConfig: DeploymentConfi
515514
| kubectl apply -f -`);
516515
exec(`/usr/local/bin/helm3 upgrade --install --set image.version=${sweeperVersion} --set command="werft run github -a namespace=${namespace} --remote-job-path .werft/wipe-devstaging.yaml github.com/gitpod-io/gitpod:main" ${allArgsStr} sweeper ./dev/charts/sweeper`);
517516

518-
// TODO: Additional post processing needs
519-
// adding a license (Simon created #6868) - ADD THIS IN VIA POST PROCESSING
520-
// intergrating with charge bees (get feedback from meta team) - WON'T FIX NOW
521-
// analytics (get feedback from meta team) - WILL TRY SETTING AS CONFIG
522-
// Server feature flags (get feedback from meta team) - TRY ADDING IN AS POST PROCESSING
523-
// disk paths are set for for ws-daemon and image builder (test and see if this works "as is")
524-
525517
werft.done(phases.DEPLOY);
526518

527519
async function cleanStateEnv(shellOpts: ExecOptions) {
528-
// TODO: check to see if anything lingers after this point ... mysql, minio, jaeger, etc.
529520
await wipeAndRecreateNamespace(helmInstallName, namespace, { ...shellOpts, slice: installerSlices.CLEAN_ENV_STATE });
530521
// cleanup non-namespace objects
531522
werft.log(installerSlices.CLEAN_ENV_STATE, "removing old unnamespaced objects - this might take a while");

.werft/post-process.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,9 @@ while [ "$i" -le "$DOCS" ]; do
230230
fi
231231

232232
# TODO: list
233-
# honeycomb
234-
# license
235-
# server feature flags
233+
# adding a license (Simon created #6868) - ADD THIS IN VIA POST PROCESSING
234+
# intergrating with charge bees (get feedback from meta team) - WON'T FIX NOW
235+
# Server feature flags (get feedback from meta team) - TRY ADDING IN AS POST PROCESSING
236236

237237
i=$((i + 1))
238238
done

0 commit comments

Comments
 (0)