Skip to content

Commit

Permalink
Merge pull request #11 from WangZzzhe/dev/orm-model-values
Browse files Browse the repository at this point in the history
add orm values
  • Loading branch information
waynepeking348 authored Apr 29, 2024
2 parents 2fb3476 + 11f5b5a commit eb64562
Show file tree
Hide file tree
Showing 9 changed files with 73 additions and 2 deletions.
1 change: 0 additions & 1 deletion charts/katalyst/charts/agent/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ spec:
args:
- --plugin-registration-dir={{ .Values.hostMountPaths.katalystLibDir }}/plugin-socks
- --checkpoint-manager-directory={{ .Values.hostMountPaths.katalystLibDir }}/plugin-checkpoint
- --pod-resources-server-endpoint={{ .Values.hostMountPaths.kubeletLibDir }}/pod-resources/kubelet.sock
- --locking-file={{ index .Values.customArgs "locking-file" | default ( printf "/tmp/%s_lock" (include "katalyst-agent.fullname" . | replace "-" "_") ) }}
- --node-name=$(MY_NODE_NAME)
- --node-address=$(MY_NODE_ADDRESS)
Expand Down
3 changes: 3 additions & 0 deletions charts/katalyst/charts/agent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ customArgs:
enable-reclaim: true
cpu-resource-plugin-advisor: true
enable-cpu-pressure-eviction: true
pod-resources-server-endpoint: "/var/lib/kubelet/pod-resources/kubelet.sock"
enable-kubelet-secure-port: true


hostMountPaths:
kubeletLibDir: /var/lib/kubelet
Expand Down
Binary file modified charts/katalyst/charts/colocation/charts/katalyst-agent-0.5.0.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
69 changes: 69 additions & 0 deletions charts/katalyst/charts/colocation/orm_values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
global:
# Overrides all components' image by global image
image: {}

# Overrides katalyst-agent values
katalyst-agent:
enabled: true

image:
registry: cr-pro-cn-guilin-boe.cr.volces.com
repository: wz-test/katalyst-agent
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "v0.5.0"

imagePullSecrets: [ ]
nameOverride: ""
fullnameOverride: ""

serviceAccount:
# Specifies whether a service account should be created
create: true
# Annotations to add to the service account
annotations: { }
name: katalyst-agent

podAnnotations:
"katalyst.kubewharf.io/qos_level": system_cores

resources: { }

nodeSelector: { }

tolerations:
- effect: NoSchedule
operator: Exists

affinity: { }

customCommand: { }

customArgs:
agents: "*"
eviction-plugins: "*"
enable-reclaim: true
cpu-resource-plugin-advisor: true
enable-cpu-pressure-eviction: true
memory-resource-plugin-advisor: true
enable-report-topology-policy: true
qrm-socket-dirs: "/var/lib/katalyst/plugin-socks" # qrm plugins registry to orm
pod-resources-server-endpoint: "/var/lib/katalyst/pod-resources/kubelet.sock" # kubelet reporter get pod resources from orm
orm-kubelet-pod-resources-endpoints: "/var/lib/kubelet/pod-resources/kubelet.sock"
orm-devices-provider: "kubelet" # orm get devices resources from kubelet
topology-policy-name: "none" # none / best-effort / restricted / single-numa-node / numeric supported
orm-resource-names-map: "resource.katalyst.kubewharf.io/reclaimed_millicpu=cpu,resource.katalyst.kubewharf.io/reclaimed_memory=memory"
enable-kubelet-secure-port: true

hostMountPaths:
kubeletLibDir: /var/lib/kubelet
runtimeSocketDir: /run/containerd
katalystLibDir: /var/lib/katalyst

katalyst-controller: {}

katalyst-webhook: {}

katalyst-scheduler: {}

katalyst-metric: {}
2 changes: 1 addition & 1 deletion charts/katalyst/charts/controller/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ hostNetwork: false
customCommand: {}

customArgs:
controllers: "*"
controllers: "vpa,kcc,spd,lifecycle,monitor,overcommit,tide"
dry-run: false
leader-elect: true
healthz-enabled: true
Expand Down

0 comments on commit eb64562

Please sign in to comment.