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.

Sign up for GitHub

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

Jump to bottom

[ws-manager] Only extract secrets when FF is set #11198

Merged
merged 2 commits into from
Jul 8, 2022
Merged

[ws-manager] Only extract secrets when FF is set #11198

merged 2 commits into from
Jul 8, 2022

Conversation

csweichel
Copy link
Contributor

Description

Otherwise content init fails for private repositories.

How to test

  1. open a workspace on a private repo
  2. enable the protected_secrets FF and open a workspace on a private repo

Release Notes

NONE

Werft options:

  • /werft with-preview

@csweichel csweichel marked this pull request as ready for review July 7, 2022 12:31
@csweichel csweichel requested a review from a team July 7, 2022 12:31
@github-actions github-actions bot added the team: workspace Issue belongs to the Workspace team label Jul 7, 2022
@csweichel csweichel marked this pull request as draft July 7, 2022 13:57
@csweichel csweichel marked this pull request as ready for review July 7, 2022 15:07
@geropl
Copy link
Member

geropl commented Jul 8, 2022

Starting to review now...

geropl
geropl reviewed Jul 8, 2022
View reviewed changes
components/ws-manager/pkg/manager/testdata/validateStartReq_invalidType.json
"workspaceImage": "eu.gcr.io/gitpod-dev/workspace-images/ac1c0755007966e4d6e090ea821729ac747d22ac/eu.gcr.io/gitpod-dev/workspace-base-images/github.com/typefox/gitpod:80a7d427a1fcd346d420603d80a31d57cf75a7af",
"checkoutLocation": "/",
"workspaceLocation": "/",
"workspace_image": "eu.gcr.io/gitpod-dev/workspace-images/ac1c0755007966e4d6e090ea821729ac747d22ac/eu.gcr.io/gitpod-dev/workspace-base-images/github.com/typefox/gitpod:80a7d427a1fcd346d420603d80a31d57cf75a7af",
Copy link
Member

Choose a reason for hiding this comment

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

This looks fishy to me:

  • why the change to workspace_image?
  • and why do all other files keep using workspaceImage?
    🤔

@geropl
Copy link
Member

geropl commented Jul 8, 2022 •
edited by werft-gitpod-dev-com bot
Loading

/werft run

👍 started the job as gitpod-build-cw-fix-ots.3
(with .werft/ from main)

To get a preview env...

@geropl
Copy link
Member

geropl commented Jul 8, 2022 •
edited by werft-gitpod-dev-com bot
Loading

/werft run with-preview=true

👍 started the job as gitpod-build-cw-fix-ots.4
(with .werft/ from main)

Did not pick up the flag last time...? 🤷

@geropl
Copy link
Member

geropl commented Jul 8, 2022 •
edited
Loading

I tested with a private repo and an user env var and protected_secrets set to:

  • ws-manager from this branch:
    • true: ✔️
    • false: ✔️
  • ws-manager we currently use in prod (ws-clusters and application clusters, commit-d537b24994f67318dcadb9d29ebc132d36514f8c):
    • false: ✔️
    • true: 💥 (which is expected when you think about it): Error: 2 UNKNOWN: cannot create workspace pod: cannot create definite workspace pod: unknown feature flag: 8

This means:

  • we have to make sure we standup new ws-clusters before using this feature (kind of make sense) ✔️
  • during next WebApp deployment we should make sure to update ws-manager as well (the default, and will happen anyway) ✔️

geropl
geropl approved these changes Jul 8, 2022
View reviewed changes
Copy link
Member

@geropl geropl left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Tested with multiple versions, and is safe to roll out either way as long as we keep the feature flag protectes_secrets disabled as long as ws-manager not rolled out everywhere (WebApp and Workspace): #11198 (comment) 👍

@roboquat roboquat merged commit 03a1418 into main Jul 8, 2022
@roboquat roboquat deleted the cw/fix-ots branch July 8, 2022 08:57
@atduarte
Copy link
Contributor

For the others that might have the same question as I did:
FF = Feature Flag.

@roboquat roboquat added deployed: workspace Workspace team change is running in production deployed Change is completely running in production labels Jul 12, 2022
@jenting jenting mentioned this pull request Jul 12, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@geropl geropl geropl approved these changes

@aledbf aledbf aledbf approved these changes

@corneliusludmann corneliusludmann Awaiting requested review from corneliusludmann

Assignees
No one assigned
Labels
deployed: workspace Workspace team change is running in production deployed Change is completely running in production release-note-none size/L team: workspace Issue belongs to the Workspace team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@csweichel @geropl @atduarte @aledbf @roboquat