Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions install/installer/cmd/testdata/render/aws-setup/output.golden
Original file line number Diff line number Diff line change
Expand Up @@ -3719,8 +3719,8 @@ data:
"procLimit": 0,
"netlimit": {
"enabled": false,
"connectionsPerMinute": 0,
"bucketSize": 0
"connectionsPerMinute": 3000,
"bucketSize": 1000
},
"hosts": {
"enabled": true,
Expand Down Expand Up @@ -5799,7 +5799,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 2637738dcbbd000d46ae324ed58957395e25e1bcf6ffda1e178812dbaaf355b7
gitpod.io/checksum_config: 531cd94d43e48d4295f80353ac56f7748a9f678b8ade59cbabc14d1c3fb43395
seccomp.security.alpha.kubernetes.io/shiftfs-module-loader: unconfined
creationTimestamp: null
labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3581,8 +3581,8 @@ data:
"procLimit": 0,
"netlimit": {
"enabled": false,
"connectionsPerMinute": 0,
"bucketSize": 0
"connectionsPerMinute": 3000,
"bucketSize": 1000
},
"hosts": {
"enabled": true,
Expand Down Expand Up @@ -5645,7 +5645,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 3f49d25e1369c3d94ed6b8eb44ff0dac997e313a8ca5bda4d8d6daf4950c66f4
gitpod.io/checksum_config: 6fd7f9d2c27fa657c0818d37d1d048b00bd4c1127d732232ca76fd04810136be
seccomp.security.alpha.kubernetes.io/shiftfs-module-loader: unconfined
creationTimestamp: null
labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4498,8 +4498,8 @@ data:
"procLimit": 0,
"netlimit": {
"enabled": false,
"connectionsPerMinute": 0,
"bucketSize": 0
"connectionsPerMinute": 3000,
"bucketSize": 1000
},
"hosts": {
"enabled": true,
Expand Down Expand Up @@ -6833,7 +6833,7 @@ spec:
metadata:
annotations:
gitpod.io: hello
gitpod.io/checksum_config: 6504b7d23f02369f2f0d5894e4fed21dd5ec7c1fdf535ef288b6a11ff9cec4f2
gitpod.io/checksum_config: 4e24adf25fa6c788ea607f2b6e87d4d46c00cdaa8d3891f50feebde06ac6b4c3
hello: world
seccomp.security.alpha.kubernetes.io/shiftfs-module-loader: unconfined
creationTimestamp: null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3768,8 +3768,8 @@ data:
"procLimit": 0,
"netlimit": {
"enabled": false,
"connectionsPerMinute": 0,
"bucketSize": 0
"connectionsPerMinute": 3000,
"bucketSize": 1000
},
"hosts": {
"enabled": true,
Expand Down Expand Up @@ -5927,7 +5927,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 3f49d25e1369c3d94ed6b8eb44ff0dac997e313a8ca5bda4d8d6daf4950c66f4
gitpod.io/checksum_config: 6fd7f9d2c27fa657c0818d37d1d048b00bd4c1127d732232ca76fd04810136be
seccomp.security.alpha.kubernetes.io/shiftfs-module-loader: unconfined
creationTimestamp: null
labels:
Expand Down
6 changes: 3 additions & 3 deletions install/installer/cmd/testdata/render/gcp-setup/output.golden
Original file line number Diff line number Diff line change
Expand Up @@ -3541,8 +3541,8 @@ data:
"procLimit": 0,
"netlimit": {
"enabled": false,
"connectionsPerMinute": 0,
"bucketSize": 0
"connectionsPerMinute": 3000,
"bucketSize": 1000
},
"hosts": {
"enabled": true,
Expand Down Expand Up @@ -5619,7 +5619,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: a65e43f706d3d7ba60e82636b6dde415022403f8d0345fcdf00e15f28472374b
gitpod.io/checksum_config: 5df9f8dc1dd20d39ae253cd9f977d948fcf75a7375165a9b82ecfd9852e343f3
seccomp.security.alpha.kubernetes.io/shiftfs-module-loader: unconfined
creationTimestamp: null
labels:
Expand Down
6 changes: 3 additions & 3 deletions install/installer/cmd/testdata/render/minimal/output.golden
Original file line number Diff line number Diff line change
Expand Up @@ -3988,8 +3988,8 @@ data:
"procLimit": 0,
"netlimit": {
"enabled": false,
"connectionsPerMinute": 0,
"bucketSize": 0
"connectionsPerMinute": 3000,
"bucketSize": 1000
},
"hosts": {
"enabled": true,
Expand Down Expand Up @@ -6207,7 +6207,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 3f49d25e1369c3d94ed6b8eb44ff0dac997e313a8ca5bda4d8d6daf4950c66f4
gitpod.io/checksum_config: 6fd7f9d2c27fa657c0818d37d1d048b00bd4c1127d732232ca76fd04810136be
seccomp.security.alpha.kubernetes.io/shiftfs-module-loader: unconfined
creationTimestamp: null
labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4000,8 +4000,8 @@ data:
"procLimit": 0,
"netlimit": {
"enabled": false,
"connectionsPerMinute": 0,
"bucketSize": 0
"connectionsPerMinute": 3000,
"bucketSize": 1000
},
"hosts": {
"enabled": true,
Expand Down Expand Up @@ -6219,7 +6219,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 3f49d25e1369c3d94ed6b8eb44ff0dac997e313a8ca5bda4d8d6daf4950c66f4
gitpod.io/checksum_config: 6fd7f9d2c27fa657c0818d37d1d048b00bd4c1127d732232ca76fd04810136be
seccomp.security.alpha.kubernetes.io/shiftfs-module-loader: unconfined
creationTimestamp: null
labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4321,8 +4321,8 @@ data:
"procLimit": 0,
"netlimit": {
"enabled": false,
"connectionsPerMinute": 0,
"bucketSize": 0
"connectionsPerMinute": 3000,
"bucketSize": 1000
},
"hosts": {
"enabled": true,
Expand Down Expand Up @@ -6651,7 +6651,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 3f49d25e1369c3d94ed6b8eb44ff0dac997e313a8ca5bda4d8d6daf4950c66f4
gitpod.io/checksum_config: 6fd7f9d2c27fa657c0818d37d1d048b00bd4c1127d732232ca76fd04810136be
seccomp.security.alpha.kubernetes.io/shiftfs-module-loader: unconfined
creationTimestamp: null
labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3991,8 +3991,8 @@ data:
"procLimit": 0,
"netlimit": {
"enabled": false,
"connectionsPerMinute": 0,
"bucketSize": 0
"connectionsPerMinute": 3000,
"bucketSize": 1000
},
"hosts": {
"enabled": true,
Expand Down Expand Up @@ -6210,7 +6210,7 @@ spec:
template:
metadata:
annotations:
gitpod.io/checksum_config: 3f49d25e1369c3d94ed6b8eb44ff0dac997e313a8ca5bda4d8d6daf4950c66f4
gitpod.io/checksum_config: 6fd7f9d2c27fa657c0818d37d1d048b00bd4c1127d732232ca76fd04810136be
seccomp.security.alpha.kubernetes.io/shiftfs-module-loader: unconfined
creationTimestamp: null
labels:
Expand Down
1 change: 1 addition & 0 deletions install/installer/pkg/components/ws-daemon/configmap.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
CPULimit: cpuLimitConfig,
IOLimit: ioLimitConfig,
ProcLimit: procLimit,
NetLimit: networkLimitConfig,
Hosts: hosts.Config{
Enabled: true,
NodeHostsFile: "/mnt/hosts",
Expand Down