From 922d2282c924f07f51fe9ae70a31f0155f8f1926 Mon Sep 17 00:00:00 2001 From: minikube-bot Date: Mon, 27 Jan 2025 10:02:13 +0000 Subject: [PATCH] Addon Volcano: Update volcano images from v1.10.0 to v1.11.0 --- .../volcano/volcano-development.yaml.tmpl | 277 +++++++++++++++--- pkg/minikube/assets/addons.go | 6 +- 2 files changed, 246 insertions(+), 37 deletions(-) diff --git a/deploy/addons/volcano/volcano-development.yaml.tmpl b/deploy/addons/volcano/volcano-development.yaml.tmpl index 7c18012e26..8fec4980f5 100644 --- a/deploy/addons/volcano/volcano-development.yaml.tmpl +++ b/deploy/addons/volcano/volcano-development.yaml.tmpl @@ -74,7 +74,7 @@ rules: verbs: ["create", "update"] - apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"] resources: ["queues"] - verbs: ["get", "list"] + verbs: ["get", "list", "watch"] - apiGroups: [""] resources: ["services"] verbs: ["get"] @@ -241,7 +241,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.4 name: jobs.batch.volcano.sh spec: group: batch.volcano.sh @@ -285,6 +285,7 @@ spec: spec: properties: maxRetry: + default: 3 format: int32 type: integer minAvailable: @@ -306,9 +307,33 @@ spec: action: type: string event: + enum: + - '*' + - PodPending + - PodRunning + - PodFailed + - PodEvicted + - Unknown + - TaskCompleted + - OutOfSync + - CommandIssued + - JobUpdated + - TaskFailed type: string events: items: + enum: + - '*' + - PodPending + - PodRunning + - PodFailed + - PodEvicted + - Unknown + - TaskCompleted + - OutOfSync + - CommandIssued + - JobUpdated + - TaskFailed type: string type: array exitCode: @@ -352,9 +377,33 @@ spec: action: type: string event: + enum: + - '*' + - PodPending + - PodRunning + - PodFailed + - PodEvicted + - Unknown + - TaskCompleted + - OutOfSync + - CommandIssued + - JobUpdated + - TaskFailed type: string events: items: + enum: + - '*' + - PodPending + - PodRunning + - PodFailed + - PodEvicted + - Unknown + - TaskCompleted + - OutOfSync + - CommandIssued + - JobUpdated + - TaskFailed type: string type: array exitCode: @@ -1088,6 +1137,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1194,6 +1244,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1275,6 +1326,8 @@ spec: properties: name: type: string + request: + type: string required: - name type: object @@ -1392,6 +1445,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1793,6 +1847,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1899,6 +1954,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -1980,6 +2036,8 @@ spec: properties: name: type: string + request: + type: string required: - name type: object @@ -2097,6 +2155,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2512,6 +2571,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2618,6 +2678,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2699,6 +2760,8 @@ spec: properties: name: type: string + request: + type: string required: - name type: object @@ -2816,6 +2879,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -2980,13 +3044,10 @@ spec: properties: name: type: string - source: - properties: - resourceClaimName: - type: string - resourceClaimTemplateName: - type: string - type: object + resourceClaimName: + type: string + resourceClaimTemplateName: + type: string required: - name type: object @@ -3062,6 +3123,8 @@ spec: type: integer type: array x-kubernetes-list-type: atomic + supplementalGroupsPolicy: + type: string sysctls: items: properties: @@ -3201,10 +3264,12 @@ spec: diskURI: type: string fsType: + default: ext4 type: string kind: type: string readOnly: + default: false type: boolean required: - diskName @@ -3581,6 +3646,13 @@ spec: required: - path type: object + image: + properties: + pullPolicy: + type: string + reference: + type: string + type: object iscsi: properties: chapAuthDiscovery: @@ -3594,6 +3666,7 @@ spec: iqn: type: string iscsiInterface: + default: default type: string lun: format: int32 @@ -3842,6 +3915,7 @@ spec: image: type: string keyring: + default: /etc/ceph/keyring type: string monitors: items: @@ -3849,6 +3923,7 @@ spec: type: array x-kubernetes-list-type: atomic pool: + default: rbd type: string readOnly: type: boolean @@ -3860,6 +3935,7 @@ spec: type: object x-kubernetes-map-type: atomic user: + default: admin type: string required: - image @@ -3868,6 +3944,7 @@ spec: scaleIO: properties: fsType: + default: xfs type: string gateway: type: string @@ -3885,6 +3962,7 @@ spec: sslEnabled: type: boolean storageMode: + default: ThinProvisioned type: string storagePool: type: string @@ -3966,6 +4044,11 @@ spec: type: object type: object topologyPolicy: + enum: + - none + - best-effort + - restricted + - single-numa-node type: string type: object type: array @@ -4153,7 +4236,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.4 name: commands.bus.volcano.sh spec: group: bus.volcano.sh @@ -4290,7 +4373,7 @@ rules: verbs: ["get", "create", "delete", "update"] - apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"] resources: ["podgroups", "queues", "queues/status"] - verbs: ["get", "list", "watch", "create", "delete", "update"] + verbs: ["get", "list", "watch", "create", "delete", "update", "patch"] - apiGroups: ["flow.volcano.sh"] resources: ["jobflows", "jobtemplates"] verbs: ["get", "list", "watch", "create", "delete", "update"] @@ -4331,6 +4414,28 @@ roleRef: apiGroup: rbac.authorization.k8s.io --- # Source: volcano/templates/controllers.yaml +apiVersion: v1 +kind: Service +metadata: + annotations: + prometheus.io/path: /metrics + prometheus.io/port: "8081" + prometheus.io/scrape: "true" + name: volcano-controllers-service + namespace: volcano-system + labels: + app: volcano-controller +spec: + ports: + - port: 8081 + protocol: TCP + targetPort: 8081 + name: "metrics" + selector: + app: volcano-controller + type: ClusterIP +--- +# Source: volcano/templates/controllers.yaml kind: Deployment apiVersion: apps/v1 metadata: @@ -4351,15 +4456,21 @@ spec: serviceAccount: volcano-controllers priorityClassName: system-cluster-critical containers: - - name: volcano-controllers - image: {{.CustomRegistries.vc_controller_manager | default .ImageRepository | default .Registries.vc_controller_manager}}{{.Images.vc_controller_manager}} - args: - - --logtostderr - - --enable-healthz=true - - --leader-elect=false - - -v=4 - - 2>&1 - imagePullPolicy: Always + - name: volcano-controllers + image: {{.CustomRegistries.vc_controller_manager | default .ImageRepository | default .Registries.vc_controller_manager}}{{.Images.vc_controller_manager}} + args: + - --logtostderr + - --enable-healthz=true + - --enable-metrics=true + - --leader-elect=false + - --kube-api-qps=50 + - --kube-api-burst=100 + - --worker-threads=3 + - --worker-threads-for-gc=5 + - --worker-threads-for-podgroup=5 + - -v=4 + - 2>&1 + imagePullPolicy: Always --- # Source: volcano/templates/scheduler.yaml apiVersion: v1 @@ -4388,7 +4499,7 @@ data: - name: drf enablePreemptable: false - name: predicates - - name: capacity + - name: proportion - name: nodeorder - name: binpack --- @@ -4445,7 +4556,7 @@ rules: verbs: ["get", "list", "watch"] - apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"] resources: ["queues"] - verbs: ["get", "list", "watch", "create", "delete"] + verbs: ["get", "list", "watch", "create", "delete", "update"] - apiGroups: ["scheduling.incubator.k8s.io", "scheduling.volcano.sh"] resources: ["queues/status"] verbs: ["update"] @@ -4530,6 +4641,10 @@ spec: - --enable-healthz=true - --enable-metrics=true - --leader-elect=false + - --kube-api-qps=2000 + - --kube-api-burst=2000 + - --schedule-period=1s + - --node-worker-threads=20 - -v=3 - 2>&1 env: @@ -4554,7 +4669,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.4 name: podgroups.scheduling.volcano.sh spec: group: scheduling.volcano.sh @@ -4716,7 +4831,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.4 name: queues.scheduling.volcano.sh spec: group: scheduling.volcano.sh @@ -4934,7 +5049,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.4 name: numatopologies.nodeinfo.volcano.sh spec: group: nodeinfo.volcano.sh @@ -4977,10 +5092,13 @@ spec: description: CPUInfo is the cpu topology detail properties: core: + minimum: 0 type: integer numa: + minimum: 0 type: integer socket: + minimum: 0 type: integer type: object description: |- @@ -5296,7 +5414,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.4 name: jobtemplates.flow.volcano.sh spec: group: flow.volcano.sh @@ -5322,6 +5440,7 @@ spec: spec: properties: maxRetry: + default: 3 format: int32 type: integer minAvailable: @@ -5343,9 +5462,33 @@ spec: action: type: string event: + enum: + - '*' + - PodPending + - PodRunning + - PodFailed + - PodEvicted + - Unknown + - TaskCompleted + - OutOfSync + - CommandIssued + - JobUpdated + - TaskFailed type: string events: items: + enum: + - '*' + - PodPending + - PodRunning + - PodFailed + - PodEvicted + - Unknown + - TaskCompleted + - OutOfSync + - CommandIssued + - JobUpdated + - TaskFailed type: string type: array exitCode: @@ -5389,9 +5532,33 @@ spec: action: type: string event: + enum: + - '*' + - PodPending + - PodRunning + - PodFailed + - PodEvicted + - Unknown + - TaskCompleted + - OutOfSync + - CommandIssued + - JobUpdated + - TaskFailed type: string events: items: + enum: + - '*' + - PodPending + - PodRunning + - PodFailed + - PodEvicted + - Unknown + - TaskCompleted + - OutOfSync + - CommandIssued + - JobUpdated + - TaskFailed type: string type: array exitCode: @@ -6125,6 +6292,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6231,6 +6399,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6312,6 +6481,8 @@ spec: properties: name: type: string + request: + type: string required: - name type: object @@ -6429,6 +6600,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6830,6 +7002,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -6936,6 +7109,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -7017,6 +7191,8 @@ spec: properties: name: type: string + request: + type: string required: - name type: object @@ -7134,6 +7310,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -7549,6 +7726,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -7655,6 +7833,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -7736,6 +7915,8 @@ spec: properties: name: type: string + request: + type: string required: - name type: object @@ -7853,6 +8034,7 @@ spec: format: int32 type: integer service: + default: "" type: string required: - port @@ -8017,13 +8199,10 @@ spec: properties: name: type: string - source: - properties: - resourceClaimName: - type: string - resourceClaimTemplateName: - type: string - type: object + resourceClaimName: + type: string + resourceClaimTemplateName: + type: string required: - name type: object @@ -8099,6 +8278,8 @@ spec: type: integer type: array x-kubernetes-list-type: atomic + supplementalGroupsPolicy: + type: string sysctls: items: properties: @@ -8238,10 +8419,12 @@ spec: diskURI: type: string fsType: + default: ext4 type: string kind: type: string readOnly: + default: false type: boolean required: - diskName @@ -8618,6 +8801,13 @@ spec: required: - path type: object + image: + properties: + pullPolicy: + type: string + reference: + type: string + type: object iscsi: properties: chapAuthDiscovery: @@ -8631,6 +8821,7 @@ spec: iqn: type: string iscsiInterface: + default: default type: string lun: format: int32 @@ -8879,6 +9070,7 @@ spec: image: type: string keyring: + default: /etc/ceph/keyring type: string monitors: items: @@ -8886,6 +9078,7 @@ spec: type: array x-kubernetes-list-type: atomic pool: + default: rbd type: string readOnly: type: boolean @@ -8897,6 +9090,7 @@ spec: type: object x-kubernetes-map-type: atomic user: + default: admin type: string required: - image @@ -8905,6 +9099,7 @@ spec: scaleIO: properties: fsType: + default: xfs type: string gateway: type: string @@ -8922,6 +9117,7 @@ spec: sslEnabled: type: boolean storageMode: + default: ThinProvisioned type: string storagePool: type: string @@ -9003,6 +9199,11 @@ spec: type: object type: object topologyPolicy: + enum: + - none + - best-effort + - restricted + - single-numa-node type: string type: object type: array @@ -9127,7 +9328,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.15.0 + controller-gen.kubebuilder.io/version: v0.16.4 name: jobflows.flow.volcano.sh spec: group: flow.volcano.sh @@ -9182,6 +9383,8 @@ spec: path: type: string port: + maximum: 65535 + minimum: 0 type: integer taskName: type: string @@ -9200,6 +9403,8 @@ spec: items: properties: port: + maximum: 65535 + minimum: 0 type: integer taskName: type: string @@ -9214,12 +9419,16 @@ spec: type: array type: object name: + minLength: 1 type: string required: - name type: object type: array jobRetainPolicy: + enum: + - retain + - delete type: string type: object status: diff --git a/pkg/minikube/assets/addons.go b/pkg/minikube/assets/addons.go index 82a2b8ff18..d76eeb08bb 100644 --- a/pkg/minikube/assets/addons.go +++ b/pkg/minikube/assets/addons.go @@ -610,9 +610,9 @@ var Addons = map[string]*Addon{ "volcano-deployment.yaml", "0640"), }, false, "volcano", "third-party (volcano)", "hwdef", "", map[string]string{ - "vc_webhook_manager": "volcanosh/vc-webhook-manager:v1.10.0@sha256:f56fecf20af14dd9ebea12eb6390014b51a44c552742d4e15d25876438c46e1e", - "vc_controller_manager": "volcanosh/vc-controller-manager:v1.10.0@sha256:5084bdd1edee7c7d676fc1713e02051b975f69839be4a8278a59d4a7a59ad8de", - "vc_scheduler": "volcanosh/vc-scheduler:v1.10.0@sha256:b618879e2ff768f69fb94084f0c644d2278d31e4fa17c898b8763fc7e1648882", + "vc_webhook_manager": "volcanosh/vc-webhook-manager:v1.11.0@sha256:2ceea91a5f05a366955f20cb1ab266b4732f906a205cb2e3f5930cf93335aeee", + "vc_controller_manager": "volcanosh/vc-controller-manager:v1.11.0@sha256:4ebe173752c86bd4a81d5514e9ba56f62dac79d081042a9069333f9aae32d8a3", + "vc_scheduler": "volcanosh/vc-scheduler:v1.11.0@sha256:5cfdfe4343ed267002262f1bb056a7b191cead04003016490cade1e14cfdad86", }, map[string]string{ "vc_webhook_manager": "docker.io", "vc_controller_manager": "docker.io",