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

upstream merge #2

Merged
merged 26 commits into from
Oct 15, 2020
Merged

upstream merge #2

merged 26 commits into from
Oct 15, 2020

Conversation

arleif-dfactory
Copy link
Collaborator

No description provided.

corneliusludmann and others added 26 commits October 7, 2020 08:54
- Add volumes to store state
- Fix docker-compose DNS

/werft no-preview
/werft with-installer
In order to take advantage of hashicorp/terraform#26192, update to the latest terraform version.
by moving it from `resourcegov` to its own `dispatch` package. This way
we can reuse the dispatch for serving the uidmapper canary.
There's no guarantee that a ws-manager client will list a feature flag
only once in a `StartWorkspaceRequest`. In fact, the combination of the
`GITPOD_DEFAULT_FEATURE_FLAGS` and a user's persistent feature flags
can lead to duplicate FFs being sent by server. This change makes
ws-manager robust against such cases.
If you have the `privileged-ws` permission in your Gitpod installation,
you can still start this repo "privileged" by adding the feature flag to
your user instead.
@arleif-dfactory arleif-dfactory marked this pull request as ready for review October 15, 2020 03:37
@arleif-dfactory arleif-dfactory merged commit 50ff263 into trilogy-group:master Oct 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants