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

[installer]: allow use of external container registry #6621

Merged
merged 1 commit into from
Nov 11, 2021
Merged

[installer]: allow use of external container registry #6621

merged 1 commit into from
Nov 11, 2021

Conversation

mrsimonemms
Copy link
Contributor

@mrsimonemms mrsimonemms commented Nov 9, 2021 •
edited
Loading

Description

Configure external container registry

Related Issue(s)

Fixes #6565

How to test

Get create container registry in GCP and get a service account key

To create secret:

kubectl create secret docker-registry \
  registry-secret \
  --docker-server=gcr.io/<projectId>/gitpod \
  --docker-username=_json_key \
  --docker-password="$(cat /path/to/credentials.json)"

Then change the config to:

containerRegistry:
  inCluster: false
  external:
    url: gcr.io/<projectId>/gitpod
    certificate:
      kind: secret
      name: registry-secret

Deploy the changes and create a workspace

Release Notes

Allow use of external container registry

Documentation

@mrsimonemms mrsimonemms requested a review from csweichel November 9, 2021 08:43
@roboquat roboquat added team: workspace Issue belongs to the Workspace team size/XL labels Nov 9, 2021
@mrsimonemms mrsimonemms marked this pull request as draft November 9, 2021 08:43
@mrsimonemms mrsimonemms force-pushed the sje/gke-container-registry branch 3 times, most recently from f029272 to 0f0406d Compare November 9, 2021 09:12
mrsimonemms
mrsimonemms commented Nov 9, 2021
View reviewed changes
installer/pkg/components/proxy/configmap.go
@@ -140,6 +115,43 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
return nil, err
}

data := map[string]string{
Copy link
Contributor Author

Choose a reason for hiding this comment

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

FYI, this section has been rearranged to make the registry proxy conditional

@codecov
Copy link

codecov bot commented Nov 9, 2021 •
edited
Loading

Codecov Report

Merging #6621 (ce04c18) into main (64f4da8) will decrease coverage by 27.28%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #6621       +/-   ##
==========================================
- Coverage   33.29%   6.00%   -27.29%     
==========================================
  Files          48      12       -36     
  Lines        8678    1116     -7562     
==========================================
- Hits         2889      67     -2822     
+ Misses       5551    1048     -4503     
+ Partials      238       1      -237
Flag Coverage Δ
components-blobserve-app ?
components-blobserve-lib ?
components-image-builder-mk3-app ?
components-local-app-app-darwin-amd64 ?
components-local-app-app-darwin-arm64 ?
components-local-app-app-linux-amd64 ?
components-local-app-app-linux-arm64 ?
components-local-app-app-windows-386 ?
components-local-app-app-windows-amd64 ?
components-local-app-app-windows-arm64 ?
components-registry-facade-api-go-lib ?
components-registry-facade-app ?
components-registry-facade-lib ?
components-ws-manager-app ?
components-ws-proxy-app ?
components-ws-proxy-lib ?
installer-raw-app 6.00% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...ents/image-builder-mk3/pkg/orchestrator/metrics.go
...onents/registry-facade/pkg/registry/layersource.go
components/ws-proxy/pkg/proxy/pass.go
components/ws-manager/pkg/manager/imagespec.go
components/blobserve/pkg/blobserve/refstore.go
components/ws-proxy/pkg/proxy/proxy.go
components/ws-manager/pkg/manager/probe.go
components/ws-manager/pkg/manager/manager.go
components/ws-proxy/pkg/proxy/infoprovider.go
components/blobserve/pkg/blobserve/blobserve.go
... and 26 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 64f4da8...ce04c18. Read the comment docs.

@mrsimonemms mrsimonemms force-pushed the sje/gke-container-registry branch from 0f0406d to ee23004 Compare November 9, 2021 09:22
@mrsimonemms
Copy link
Contributor Author

/assign @csweichel

@mrsimonemms mrsimonemms marked this pull request as ready for review November 9, 2021 09:24
@mrsimonemms mrsimonemms force-pushed the sje/gke-container-registry branch from ee23004 to 5e44abe Compare November 10, 2021 13:05
@mrsimonemms mrsimonemms mentioned this pull request Nov 10, 2021
Merged
csweichel
csweichel reviewed Nov 11, 2021
View reviewed changes
Copy link
Contributor

@csweichel csweichel left a comment

Choose a reason for hiding this comment

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

Found a few minor things that would need fixing.

Is there an issue for introducing the secret validation checks?

installer/pkg/components/blobserve/deployment.go Outdated Show resolved Hide resolved
installer/pkg/components/image-builder-mk3/configmap.go Show resolved Hide resolved
installer/pkg/components/image-builder-mk3/configmap.go Outdated Show resolved Hide resolved
installer/pkg/components/image-builder-mk3/deployment.go Outdated Show resolved Hide resolved
installer/pkg/components/registry-facade/daemonset.go Outdated Show resolved Hide resolved
@mrsimonemms
Copy link
Contributor Author

Is there an issue for introducing the secret validation checks?

Yes - #6627

@mrsimonemms mrsimonemms force-pushed the sje/gke-container-registry branch from 5e44abe to ce04c18 Compare November 11, 2021 08:09
csweichel
csweichel approved these changes Nov 11, 2021
View reviewed changes
Copy link
Contributor

@csweichel csweichel 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 added the lgtm label Nov 11, 2021
@roboquat
Copy link
Contributor

LGTM label has been added.

Git tree hash: f0d88d09fc558ec8a4bfce3ed5358fe36e23f1d8

@roboquat
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: csweichel

Associated issue: #6565

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@roboquat roboquat merged commit 2d73165 into main Nov 11, 2021
@roboquat roboquat deleted the sje/gke-container-registry branch November 11, 2021 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@csweichel csweichel csweichel approved these changes

Assignees

@csweichel csweichel

Labels
approved release-note size/XL team: workspace Issue belongs to the Workspace team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support GCP image registry
3 participants
@mrsimonemms @roboquat @csweichel