diff --git a/charts/katalyst/charts/agent/templates/daemonset.yaml b/charts/katalyst/charts/agent/templates/daemonset.yaml index 741ac8a..8c30b41 100644 --- a/charts/katalyst/charts/agent/templates/daemonset.yaml +++ b/charts/katalyst/charts/agent/templates/daemonset.yaml @@ -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) diff --git a/charts/katalyst/charts/agent/values.yaml b/charts/katalyst/charts/agent/values.yaml index 4d75438..1057d87 100644 --- a/charts/katalyst/charts/agent/values.yaml +++ b/charts/katalyst/charts/agent/values.yaml @@ -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 diff --git a/charts/katalyst/charts/colocation/charts/katalyst-agent-0.5.0.tgz b/charts/katalyst/charts/colocation/charts/katalyst-agent-0.5.0.tgz index cdefd1a..bc021b7 100644 Binary files a/charts/katalyst/charts/colocation/charts/katalyst-agent-0.5.0.tgz and b/charts/katalyst/charts/colocation/charts/katalyst-agent-0.5.0.tgz differ diff --git a/charts/katalyst/charts/colocation/charts/katalyst-controller-0.5.0.tgz b/charts/katalyst/charts/colocation/charts/katalyst-controller-0.5.0.tgz index 8b21c92..ae21a3d 100644 Binary files a/charts/katalyst/charts/colocation/charts/katalyst-controller-0.5.0.tgz and b/charts/katalyst/charts/colocation/charts/katalyst-controller-0.5.0.tgz differ diff --git a/charts/katalyst/charts/colocation/charts/katalyst-metric-0.5.0.tgz b/charts/katalyst/charts/colocation/charts/katalyst-metric-0.5.0.tgz index c8fabbc..e938392 100644 Binary files a/charts/katalyst/charts/colocation/charts/katalyst-metric-0.5.0.tgz and b/charts/katalyst/charts/colocation/charts/katalyst-metric-0.5.0.tgz differ diff --git a/charts/katalyst/charts/colocation/charts/katalyst-scheduler-0.5.0.tgz b/charts/katalyst/charts/colocation/charts/katalyst-scheduler-0.5.0.tgz index a9b356f..5ec2541 100644 Binary files a/charts/katalyst/charts/colocation/charts/katalyst-scheduler-0.5.0.tgz and b/charts/katalyst/charts/colocation/charts/katalyst-scheduler-0.5.0.tgz differ diff --git a/charts/katalyst/charts/colocation/charts/katalyst-webhook-0.5.0.tgz b/charts/katalyst/charts/colocation/charts/katalyst-webhook-0.5.0.tgz index 9c8ec42..51acfaf 100644 Binary files a/charts/katalyst/charts/colocation/charts/katalyst-webhook-0.5.0.tgz and b/charts/katalyst/charts/colocation/charts/katalyst-webhook-0.5.0.tgz differ diff --git a/charts/katalyst/charts/colocation/orm_values.yaml b/charts/katalyst/charts/colocation/orm_values.yaml new file mode 100644 index 0000000..dc753b4 --- /dev/null +++ b/charts/katalyst/charts/colocation/orm_values.yaml @@ -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: {} \ No newline at end of file diff --git a/charts/katalyst/charts/controller/values.yaml b/charts/katalyst/charts/controller/values.yaml index 728fa14..9d44154 100644 --- a/charts/katalyst/charts/controller/values.yaml +++ b/charts/katalyst/charts/controller/values.yaml @@ -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