Skip to content

Drop duplicate Helm values from values.yaml #4450

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

Merged
merged 4 commits into from
Nov 5, 2021
Merged

Drop duplicate Helm values from values.yaml #4450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3861490
Drop duplicate Helm values from values.yaml
Matthew-Beckett Nov 4, 2021
03651e5
Use frozen lockfile for test dependencies in CI (#4442)
code-asher Nov 4, 2021
1645f11
Drop duplicate Helm values from values.yaml
Matthew-Beckett Nov 4, 2021
e0971ad
Merge remote-tracking branch 'origin/4441-fix-duplicate-helm-values' …
Matthew-Beckett Nov 4, 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
4 changes: 3 additions & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,9 @@ jobs:
run: yarn --frozen-lockfile

- name: Install Playwright OS dependencies
run: ./test/node_modules/.bin/playwright install-deps
run: |
./test/node_modules/.bin/playwright install-deps
./test/node_modules/.bin/playwright install

- name: Run end-to-end tests
run: yarn test:e2e
Expand Down
29 changes: 15 additions & 14 deletions ci/dev/postinstall.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,28 @@ main() {

echo "Installing code-server test dependencies..."

local args=(install)
if [[ ${CI-} ]]; then
args+=(--frozen-lockfile)
fi

cd test
yarn install
yarn "${args[@]}"
cd ..

cd vendor
echo "Installing vendor dependencies..."

# * We install in 'modules' instead of 'node_modules' because VS Code's extensions
# use a webpack config which cannot differentiate between its own node_modules
# and itself being in a directory with the same name.
#
# * We ignore scripts because NPM/Yarn's default behavior is to assume that
# devDependencies are not needed, and that even git repo based packages are
# assumed to be compiled. Because the default behavior for VS Code's `postinstall`
# assumes we're also compiled, this needs to be ignored.
# We install in 'modules' instead of 'node_modules' because VS Code's
# extensions use a webpack config which cannot differentiate between its own
# node_modules and itself being in a directory with the same name.
args+=(--modules-folder modules)

local args=(install --modules-folder modules --ignore-scripts)

if [[ ${CI-} ]]; then
args+=("--frozen-lockfile")
fi
# We ignore scripts because NPM/Yarn's default behavior is to assume that
# devDependencies are not needed, and that even git repo based packages are
# assumed to be compiled. Because the default behavior for VS Code's
# `postinstall` assumes we're also compiled, this needs to be ignored.
args+=(--ignore-scripts)

yarn "${args[@]}"

Expand Down
12 changes: 0 additions & 12 deletions ci/helm-chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,6 @@ podAnnotations: {}
podSecurityContext: {}
# fsGroup: 2000

securityContext: {}
# capabilities:
# drop:
# - ALL
# readOnlyRootFilesystem: true
# runAsNonRoot: true
# runAsUser: 1000

service:
type: ClusterIP
port: 8080
Expand Down Expand Up @@ -127,10 +119,6 @@ persistence:
# existingClaim: ""
# hostPath: /data

serviceAccount:
create: true
name:

## Enable an Specify container in extraContainers.
## This is meant to allow adding code-server dependencies, like docker-dind.
extraContainers: |
Expand Down
4 changes: 2 additions & 2 deletions test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"license": "MIT",
"#": "We must put jest in a sub-directory otherwise VS Code somehow picks up the types and generates conflicts with mocha.",
"devDependencies": {
"@playwright/test": "^1.12.1",
"@playwright/test": "^1.16.3",
"@types/jest": "^27.0.2",
"@types/jsdom": "^16.2.13",
"@types/node-fetch": "^2.5.8",
Expand All @@ -13,7 +13,7 @@
"jest-fetch-mock": "^3.0.3",
"jsdom": "^16.4.0",
"node-fetch": "^2.6.1",
"playwright": "^1.12.1",
"playwright": "^1.16.3",
"supertest": "^6.1.6",
"ts-jest": "^27.0.7",
"wtfnode": "^0.9.1"
Expand Down
Loading