Skip to content

Fixes incorrect podSelectorLabels with workspace #8334

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

Merged
merged 1 commit into from
Feb 20, 2022

Conversation

iQQBot
Copy link
Contributor

@iQQBot iQQBot commented Feb 20, 2022

Description

Fixes incorrect podSelectorLabels with workspace

Related Issue(s)

Fixes #

How to test

Release Notes

NONE

Documentation

@@ -19,8 +20,11 @@ import (
func networkpolicy(ctx *common.RenderContext) ([]runtime.Object, error) {
labels := common.DefaultLabels(Component)

podSelectorLabels := labels
podSelectorLabels["gitpod.io/networkpolicy"] = "default"
podSelectorLabels := 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.

Separate setting to avoid future failures caused by adding other values to DefaultLabels

@codecov
Copy link

codecov bot commented Feb 20, 2022

Codecov Report

Merging #8334 (b431f17) into main (f41c652) will decrease coverage by 25.40%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main   #8334       +/-   ##
==========================================
- Coverage   33.00%   7.60%   -25.41%     
==========================================
  Files          33      31        -2     
  Lines        4735    2171     -2564     
==========================================
- Hits         1563     165     -1398     
+ Misses       3054    2003     -1051     
+ Partials      118       3      -115     
Flag Coverage Δ
components-gitpod-cli-app 11.17% <ø> (ø)
components-installer-raw-app 4.58% <ø> (?)
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-arm64 ?
components-ws-manager-app ?

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

Impacted Files Coverage Δ
components/ws-manager/pkg/manager/annotations.go
components/ws-manager/pkg/manager/metrics.go
components/ws-manager/pkg/manager/manager_ee.go
components/ws-manager/pkg/clock/clock.go
...s/ws-manager/pkg/manager/internal/grpcpool/pool.go
components/local-app/pkg/auth/pkce.go
components/ws-manager/pkg/manager/probe.go
components/ws-manager/pkg/manager/manager.go
...-manager/pkg/manager/internal/workpool/workpool.go
components/ws-manager/pkg/manager/imagespec.go
... and 18 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 f41c652...b431f17. Read the comment docs.

@kylos101
Copy link
Contributor

Works well, thank you @iQQBot !

gitpod /workspace/gitpod (pd/fix-network-policy) $ kubectl describe pod ws-3c81f5ae-bacb-4622-a890-da712c4d8313
Name:         ws-3c81f5ae-bacb-4622-a890-da712c4d8313
Namespace:    staging-pd-fix-network-policy
Priority:     0
Node:         a-node
Start Time:   Sun, 20 Feb 2022 14:51:01 +0000
Labels:       app=gitpod
              component=workspace
              gitpod.io/networkpolicy=default
              gpwsman=true
              headless=false
              metaID=gitpodio-templatepythonf-sl7n6agbfjl
              owner=47d8709c-9e0b-4a87-9c17-2d6b4a6af52a
              workspaceID=3c81f5ae-bacb-4622-a890-da712c4d8313
              workspaceType=regular

Copy link
Contributor

@kylos101 kylos101 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 64cc14e into main Feb 20, 2022
@roboquat roboquat deleted the pd/fix-network-policy branch February 20, 2022 15:29
@roboquat roboquat added deployed: workspace Workspace team change is running in production deployed Change is completely running in production labels Feb 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deployed: workspace Workspace team change is running in production deployed Change is completely running in production release-note-none size/XS team: workspace Issue belongs to the Workspace team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants