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

Update kubeconfig of dev image to new core-dev cluster #5219

Merged
merged 6 commits into from
Aug 17, 2021
Merged

Update kubeconfig of dev image to new core-dev cluster #5219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc3716f
Update kubeconfig of dev image to new core-dev cluster
Aug 16, 2021
6960664
Update WORKSPACE_KERNEL value to the one we use in core-dev
Aug 16, 2021
d807d1a
Ping the dev image version to artifact generated from current branch
Aug 16, 2021
695fb78
Fix build fail
Aug 16, 2021
c8b1725
Rename core-dev to dev to avoid breaking anything
Aug 16, 2021
8986f97
Use latest image
Aug 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitpod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:geropl-move-qemu-image-build-to-4945.3
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-core-dev-kubeconfig.5
workspaceLocation: gitpod/gitpod-ws.code-workspace
checkoutLocation: gitpod
ports:
Expand Down
2 changes: 1 addition & 1 deletion .werft/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ pod:
- name: MYSQL_TCP_PORT
value: 23306
- name: build
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:geropl-move-qemu-image-build-to-4945.3
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-core-dev-kubeconfig.5
workingDir: /workspace
imagePullPolicy: Always
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion .werft/run-integration-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pod:
emptyDir: {}
initContainers:
- name: gcloud
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:geropl-move-qemu-image-build-to-4945.3
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-core-dev-kubeconfig.5
workingDir: /workspace
imagePullPolicy: Always
volumeMounts:
Expand Down
2 changes: 1 addition & 1 deletion .werft/wipe-devstaging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pod:
secretName: gcp-sa-gitpod-dev-deployer
containers:
- name: wipe-devstaging
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:geropl-move-qemu-image-build-to-4945.3
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-core-dev-kubeconfig.5
workingDir: /workspace
imagePullPolicy: Always
volumeMounts:
Expand Down
4 changes: 2 additions & 2 deletions components/gitpod-protocol/go/gitpod-config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func TestGitpodConfig(t *testing.T) {
{
Desc: "parsing",
Content: `
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:geropl-move-qemu-image-build-to-4945.3
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-core-dev-kubeconfig.5
workspaceLocation: gitpod/gitpod-ws.code-workspace
checkoutLocation: gitpod
ports:
Expand All @@ -43,7 +43,7 @@ vscode:
- hangxingliu.vscode-nginx-conf-hint@0.1.0:UATTe2sTFfCYWQ3jw4IRsw==
- zxh404.vscode-proto3@0.4.2:ZnPmyF/Pb8AIWeCqc83gPw==`,
Expectation: &GitpodConfig{
Image: "eu.gcr.io/gitpod-core-dev/dev/dev-environment:geropl-move-qemu-image-build-to-4945.3",
Image: "eu.gcr.io/gitpod-core-dev/dev/dev-environment:prs-core-dev-kubeconfig.5",
WorkspaceLocation: "gitpod/gitpod-ws.code-workspace",
CheckoutLocation: "gitpod",
Ports: []*PortsItems{
Expand Down
4 changes: 1 addition & 3 deletions components/registry-facade/pkg/registry/registry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,9 +406,7 @@ func (ctx *muxVarsContext) Value(key interface{}) interface{} {
return ctx.vars
}

if strings.HasPrefix(keyStr, "vars.") {
keyStr = strings.TrimPrefix(keyStr, "vars.")
}
keyStr = strings.TrimPrefix(keyStr, "vars.")

if v, ok := ctx.vars[keyStr]; ok {
return v
Expand Down
2 changes: 1 addition & 1 deletion dev/image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
FROM gitpod/workspace-full-vnc:latest

ENV TRIGGER_REBUILD 12
ENV WORKSPACE_KERNEL 5.4.0-1044-gke
ENV WORKSPACE_KERNEL 5.4.0-1046-gke

USER root

Expand Down
12 changes: 6 additions & 6 deletions dev/image/kubeconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@
apiVersion: v1
clusters:
- cluster:
certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURERENDQWZTZ0F3SUJBZ0lSQU5CQURFR21HWXNyVGVJV1JlYzJHeFl3RFFZSktvWklodmNOQVFFTEJRQXcKTHpFdE1Dc0dBMVVFQXhNa09UWTFNemt4TjJVdE9UY3paQzAwWkRZMkxUZ3hPVE10WW1ZMFpETmtPRFJsWkdJMApNQjRYRFRJd01EY3lPREUyTVRVeE1Wb1hEVEkxTURjeU56RTNNVFV4TVZvd0x6RXRNQ3NHQTFVRUF4TWtPVFkxCk16a3hOMlV0T1RjelpDMDBaRFkyTFRneE9UTXRZbVkwWkROa09EUmxaR0kwTUlJQklqQU5CZ2txaGtpRzl3MEIKQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBdnAyakVuaTRHOXpCQ3lIM3hibU9Hdit4cnhtUjhmQTM1ZWFRelR6ZAppcXVkMENhbnRlbzFJaDUxMXVlcVFibkpxYWRiNDd0NDdsWFk2NHlXeUI1WnNFL3d4UXI3Nk9sUjVhaEFZYWJBCllLTi92ZjZXVWRvUW9KbUV4WElMc1packIwcUN6WllWV1MzbE45YXRCRmRGaGVYdTNSQWJOR1h6MGNmZ1A0YUIKMllsSmtMdFJvbTdLQlI0RXgyYWI3dGRscEF5VFhJWHVOWnJzODQzSFVBZXFvd2toQlE3UkVoR2o2RlJQa215RApTMUlwM1oxWGgzOXduZlA5S1Eyc3dNbXZZRGlRRUltQkIyQ09aMVBMNVV2T2MwQWp6ejVGWjNCWUlzREh3TXhnCnBLcHlhenNuVVNxeE5sd0hIUVhZU3ZCSHYwREhmejNWZTFWWGwxWXVucDJLVndJREFRQUJveU13SVRBT0JnTlYKSFE4QkFmOEVCQU1DQWdRd0R3WURWUjBUQVFIL0JBVXdBd0VCL3pBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQQpSVnVCRDhXNDZpcEFseFdidzNBbmhjMFR5SHdGZmVXclZNekhIb1pveGZxRWg2SU50eVZOMC9DOWJQSStCU2lqCjJnRGlEcDNDNm9lZ1RrWU51OTF2Tkw2MUlhcnI4ckpyNDNaVkZCTlpZbGs5Z2pWS2Joc2hCS0x4VjFHMWJnNVoKRC9xODVsdlZWZXBrUkFVTjJsQjg2VTd0RkVzQ09NUWpEMDFUNThOVUVqakNha1pNMkdCU091bHlOUi8rbHNBeAp0NXJ6NnRHWDY2Q3NnMGdUTEQwMksrajJ5KzRObzR2Z3NML1BMNkNUTVpVdHJ6L3FwWitrSGVnemJIUXJwQmVCCnFNaEUwRm5TWFh0Sk9idGhTL3NMZDJlN0JBcVp1STVmdURnZC9NZGNuVFM3MWVaaG80c0o5dDU3ZVFoQlJFOEwKeTdTS1dYTnBRb0lRRlE5VVRLS1h1QT09Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
server: https://35.241.166.105
name: gke_gitpod-core-dev_europe-west1-b_dev
certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURLakNDQWhLZ0F3SUJBZ0lRZHpqTWhSeE1PWFNFT0ZsZUx4d2hqakFOQmdrcWhraUc5dzBCQVFzRkFEQXYKTVMwd0t3WURWUVFERXlSaFpqY3dObVF5Tmkwek16STFMVFJpTldRdE9UVmtNeTFoWXpVd1pEaGxZamd6TVdJdwpIaGNOTWpFd09EQXlNRGsxT0RNM1doY05Nall3T0RBeE1UQTFPRE0zV2pBdk1TMHdLd1lEVlFRREV5UmhaamN3Ck5tUXlOaTB6TXpJMUxUUmlOV1F0T1RWa015MWhZelV3WkRobFlqZ3pNV0l3Z2dFaU1BMEdDU3FHU0liM0RRRUIKQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUUQ3NGkvejZsQmNCdFNwYVJxMWd1THhLTmJ3TUl6ckRYbG9ZYkpvUVE4KwpUNzR6S1NIMWM1WE9tTFU5SjBpcXNFcWxjK3pCZHZKa3g0RmtCaWRvdy9WTEo1U2dOVGJQblRjS2IyTGpBZElvCmpTR215Y3k5RGIrSVEvU1VIVzZxSkNDckY2OXpHSUVMRGQ3czlqcklLYWllK0tVZCtGUEpIMjlDM2k4VVhob24KVDEwNEVhaHZwOHZDWll2WWRwZ0hkSnlwSkw3Z2FuRW5pQTB5T2pwQ2pwWHNMTG9EMUlTQndjRmdKaDJJRVZDZQpVbU5Oa3FTOUxiSEZscGpZa2JqNlE0QmNybnBvdUIwOFo5ZGN6N0lDdkJCQUZ6Z1MwZGVlbVIvYzV1TFkxTGlJCllid1BWSmJobktqZXp5Q3NYUEcyekV1dE9tWVRFY2RMRkxLMEN0LzRMbWM5QWdNQkFBR2pRakJBTUE0R0ExVWQKRHdFQi93UUVBd0lDQkRBUEJnTlZIUk1CQWY4RUJUQURBUUgvTUIwR0ExVWREZ1FXQkJRK1F2QkhkM2RLTXgvMQpjYk03WEo3QnF4eGRPREFOQmdrcWhraUc5dzBCQVFzRkFBT0NBUUVBaEFycSsyQUZQL05SZUxIL2VYbTJUbFJYClp4Y0ZwOUhpRDRHVHJYMHY3cUhGRDhPdUNvZzFUUmpDQ1V6b1NxUkg0Q3JQd3dQckNQTUtQSS8yUzlVakdmWFIKWkVYRlhEZTV5ZCtOUHZGckd4VGZyTytYSVlSdzB5TnNLY0VNZEs0NThMUFVUdXNYRmQ1OWhLc01BVXNmNnNSUApaOXJtdTdVdHlKTXJIekNjdWpVQzh0dXFkdEFreHRzZnBNUC8vVDllRHltSm1uWE82UExxUFBLN05mSjl4aTlFCk54amNlOHpJWkJoN09xcHBYdGxPdkVibGxjQVdMSXNpZkExVFhmSDYyZDBFdmdwWHozYktOVnpGZ0I5dW84c3MKWkVNTWlGU2hsK296Z2N6QWZRSkNiNFFUOEtHOVlzNlgybE5kMjBCMXY4RGZPQVRVZ0tCazdxd2pLc1NzTHc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
server: https://34.79.201.234
name: gke_gitpod-core-dev_europe-west1-b_core-dev
contexts:
- context:
cluster: gke_gitpod-core-dev_europe-west1-b_dev
user: gke_gitpod-core-dev_europe-west1-b_dev
cluster: gke_gitpod-core-dev_europe-west1-b_core-dev
user: gke_gitpod-core-dev_europe-west1-b_core-dev
name: dev
current-context: dev
Copy link
Member

Choose a reason for hiding this comment

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

👍

kind: Config
preferences: {}
users:
- name: gke_gitpod-core-dev_europe-west1-b_dev
- name: gke_gitpod-core-dev_europe-west1-b_core-dev
user:
auth-provider:
name: gcp