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.

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

[installer] Allow extra service annotations for ide-proxy and openvsx-proxy #9788

Merged
merged 3 commits into from
May 5, 2022

Conversation

andrew-farries
Copy link
Contributor

@andrew-farries andrew-farries commented May 5, 2022

Description

One of the Webapp team's epics for Q2 is to use the Gitpod installer to deploy to Gitpod SaaS. In order to do that we will need to add additional configuration to the installer to make the output suitable for a SaaS deployment as opposed to a self-hosted deployment.

This PR allows for extra annotations to configured on the ide-proxy and openvsx-proxy components so that we can configure GCP annotations for Gitpod SaaS.

It's exactly the same as #9773 but for the ide-proxy and openvsx-proxy components.

Related Issue(s)

Part of #9097

How to test

Create an installer config file containing this experimental section:

experimental:
  ide:
    ideProxy:
      serviceAnnotations:
        someKey: someValue
    openvsxProxy:
       serviceAnnotations:
        someKey2: someValue2

Get a versions.yaml for use with the installer:

docker run -it --rm "eu.gcr.io/gitpod-core-dev/build/versions:${version}" cat versions.yaml > versions.yaml

Then invoke the installer as:

go run . render --debug-version-file versions.yaml --config /path/to/config --use-experimental-config

The Service resources for ide-proxy and openvsx-proxy will contain the extra annotation.

Release Notes

Allow setting `ide-proxy` and `openvsx-proxy` service annotations via the installer.

Documentation

None.

Andrew Farries added 3 commits May 5, 2022 10:25
To allow the proxies to have extra annotations on their service.
Ensure that annotations added through the experimental config are
present on the rendered services.
@andrew-farries andrew-farries requested review from a team May 5, 2022 10:33
@github-actions github-actions bot added team: IDE team: delivery Issue belongs to the self-hosted team labels May 5, 2022
Copy link
Member

@akosyakov akosyakov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@roboquat roboquat merged commit 82a229a into main May 5, 2022
@roboquat roboquat deleted the af/installer-service-annotations branch May 5, 2022 11:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note size/L team: delivery Issue belongs to the self-hosted team team: IDE
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants