Skip to content

Commit

Permalink
Merge pull request #6442 from berkeley-dsep-infra/staging
Browse files Browse the repository at this point in the history
merging 6436/6440/6441 to prod
  • Loading branch information
shaneknapp authored Oct 30, 2024
2 parents d133266 + 601f008 commit 36ffa9c
Show file tree
Hide file tree
Showing 8 changed files with 60 additions and 91 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@ hub/charts
**/__pycache__
**/*.pyc

# random stuff
**/.DS_Store
**/*.bak
2 changes: 1 addition & 1 deletion deployments/a11y/hubploy.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image:9cb7ae26ffbe
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/a11y-user-image:710a5e6cc90c

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion hub/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v1
appVersion: '1.0'
description: Deployment Chart for JupyterHub
name: hub
version: 20240731-224556.git.8607.hf7abb041
version: 20240731-224556.git.8735.h3e417283
10 changes: 10 additions & 0 deletions hub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@ jupyterhub:
# https://github.com/Jimbly/http-proxy-node16/commit/56283e33edfc7aad8c2605dd493da8a196b4371d
# https://github.com/consideRatio/configurable-http-proxy/commits/main/
# https://jira-secure.berkeley.edu/browse/DH-382 timeouts break stuff
#
# bump the default ip_local_port_range from "32768 60999" to "10000 65000"
# https://z2jh.jupyter.org/en/latest/resources/reference.html#proxy-chp-extrapodspec
# https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#PodSpec
#
extraPodSpec:
securityContext:
sysctls:
- name: net.ipv4.ip_local_port_range
value: "10000 65000"
image:
tag: 4.6.2
# extraCommandLineFlags:
Expand Down
2 changes: 1 addition & 1 deletion node-placeholder/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 20240731-224556.git.8610.hedc17750
version: 20240731-224556.git.8735.h3e417283

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
2 changes: 1 addition & 1 deletion node-placeholder/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image:
repository: us-central1-docker.pkg.dev/ucb-datahub-2018/core/node-placeholder-scaler
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "20240731-224556.git.8610.hedc17750"
tag: "20240731-224556.git.8652.h618d172c"

imagePullSecrets: []
nameOverride: ""
Expand Down
88 changes: 44 additions & 44 deletions vendor/google/gke/node-pool/config/core-pool-sysctl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,48 +4,48 @@ kubeletConfig:
# allowedUnsafeSysctls: 'net.core.*,net.ipv4.*'
linuxConfig:
sysctl:
# tune the ipv4 settings to not cause nginx to use all of the tcp memory
# addresses: https://jira-secure.berkeley.edu/browse/DH-3
#
# following this process:
# https://cloud.google.com/kubernetes-engine/docs/how-to/node-system-config
#
# man page:
# https://man7.org/linux/man-pages/man7/tcp.7.html
#
# figures below are measured in units of system page size (4096B),
# and gleaned from the following articles:
# https://cromwell-intl.com/open-source/performance-tuning/tcp.html
# https://www.ibm.com/docs/en/linux-on-systems?topic=tuning-tcpip-ipv4-settings
# https://www.ibm.com/docs/en/linux-on-systems?topic=tuning-network-stack-settings
#
# net.ipv4.tcp_mem seems to be automagically generated from the supplied tcp_rmem
# and tcp_wmem settings. i believe?
#
# here be dragons.
#
# original values (as of 2023-04-19):
# net.core.netdev_max_backlog=1000
# net.core.rmem_max=212992
# net.core.wmem_max=212992
# net.ipv4.tcp_rmem=4096 87380 6291456
# net.ipv4.tcp_wmem=4096 16384 4194304
#
# changes and additional tweaks (2024-04-11):
# net.ipv4.tcp_max_syn_backlog=4096
# net.core.rmem_max=3276800
# net.core.wmem_max=3276800
# net.ipv4.tcp_rmem=4096 87380 16777216
# net.ipv4.tcp_wmem=4096 87380 16777216
# net.core.somaxconn=1024
#
# https://fasterdata.es.net/host-tuning/linux/#toc-anchor-2
net.core.netdev_max_backlog: '30000'
net.core.somaxconn: '4096'
# net.ipv4.tcp_max_syn_backlog: '8192'
# tune the ipv4 settings to not cause nginx to use all of the tcp memory
# addresses: https://jira-secure.berkeley.edu/browse/DH-3
#
# following this process:
# https://cloud.google.com/kubernetes-engine/docs/how-to/node-system-config
#
# man page:
# https://man7.org/linux/man-pages/man7/tcp.7.html
#
# figures below are measured in units of system page size (4096B),
# and gleaned from the following articles:
# https://cromwell-intl.com/open-source/performance-tuning/tcp.html
# https://www.ibm.com/docs/en/linux-on-systems?topic=tuning-tcpip-ipv4-settings
# https://www.ibm.com/docs/en/linux-on-systems?topic=tuning-network-stack-settings
#
# net.ipv4.tcp_mem seems to be automagically generated from the supplied tcp_rmem
# and tcp_wmem settings. i believe?
#
# here be dragons.
#
# original values (as of 2023-04-19):
# net.core.netdev_max_backlog=1000
# net.core.rmem_max=212992
# net.core.wmem_max=212992
# net.ipv4.tcp_rmem=4096 87380 6291456
# net.ipv4.tcp_wmem=4096 16384 4194304
#
# changes and additional tweaks (2024-04-11):
# net.ipv4.tcp_max_syn_backlog=4096
# net.core.rmem_max=3276800
# net.core.wmem_max=3276800
# net.ipv4.tcp_rmem=4096 87380 16777216
# net.ipv4.tcp_wmem=4096 87380 16777216
# net.core.somaxconn=1024
#
# https://fasterdata.es.net/host-tuning/linux/#toc-anchor-2
net.core.netdev_max_backlog: '30000'
net.core.somaxconn: '4096'
# net.ipv4.tcp_max_syn_backlog: '8192'

# these values are in bytes
net.core.rmem_max: '67108864'
net.core.wmem_max: '67108864'
net.ipv4.tcp_rmem: '4096 87380 33554432'
net.ipv4.tcp_wmem: '4096 87380 33554432'
# these values are in bytes
net.core.rmem_max: '67108864'
net.core.wmem_max: '67108864'
net.ipv4.tcp_rmem: '4096 87380 33554432'
net.ipv4.tcp_wmem: '4096 87380 33554432'
43 changes: 0 additions & 43 deletions vendor/google/gke/node-pool/config/core-pool-sysctl.yaml.bak

This file was deleted.

0 comments on commit 36ffa9c

Please sign in to comment.