-
Notifications
You must be signed in to change notification settings - Fork 873
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feat: need one new Trait to support HorizontalPodAutoscaler of CPU/ME…
…M/PodCustomMetrcs Signed-off-by: StevenLeiZhang <zhangleiic@163.com>
- Loading branch information
1 parent
cadaa99
commit 59a4320
Showing
5 changed files
with
401 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file. | ||
# Definition source cue file: vela-templates/definitions/internal/hpa.cue | ||
apiVersion: core.oam.dev/v1beta1 | ||
kind: TraitDefinition | ||
metadata: | ||
annotations: | ||
definition.oam.dev/description: Configure k8s HPA for Deployment or Statefulsets | ||
name: hpa | ||
namespace: {{ include "systemDefinitionNamespace" . }} | ||
spec: | ||
appliesToWorkloads: | ||
- deployments.apps | ||
- statefulsets.apps | ||
podDisruptive: false | ||
schematic: | ||
cue: | ||
template: | | ||
outputs: hpa: { | ||
apiVersion: "autoscaling/v2beta2" | ||
kind: "HorizontalPodAutoscaler" | ||
metadata: name: context.name | ||
spec: { | ||
scaleTargetRef: { | ||
apiVersion: parameter.targetAPIVersion | ||
kind: parameter.targetKind | ||
name: context.name | ||
} | ||
minReplicas: parameter.min | ||
maxReplicas: parameter.max | ||
metrics: [ | ||
{ | ||
type: "Resource" | ||
resource: { | ||
name: "cpu" | ||
target: { | ||
type: parameter.cpu.type | ||
if parameter.cpu.type == "Utilization" { | ||
averageUtilization: parameter.cpu.value | ||
} | ||
if parameter.cpu.type == "AverageValue" { | ||
averageValue: parameter.cpu.value | ||
} | ||
} | ||
} | ||
}, | ||
if parameter.mem != _|_ { | ||
{ | ||
type: "Resource" | ||
resource: { | ||
name: "memory" | ||
target: { | ||
type: parameter.mem.type | ||
if parameter.cpu.type == "Utilization" { | ||
averageUtilization: parameter.cpu.value | ||
} | ||
if parameter.cpu.type == "AverageValue" { | ||
averageValue: parameter.cpu.value | ||
} | ||
} | ||
} | ||
} | ||
}, | ||
if parameter.podCustomMetrics != _|_ for m in parameter.podCustomMetrics { | ||
type: "Pods" | ||
pods: { | ||
metric: name: m.name | ||
target: { | ||
type: "AverageValue" | ||
averageValue: m.value | ||
} | ||
} | ||
}, | ||
] | ||
} | ||
} | ||
parameter: { | ||
// +usage=Specify the minimal number of replicas to which the autoscaler can scale down | ||
min: *1 | int | ||
// +usage=Specify the maximum number of of replicas to which the autoscaler can scale up | ||
max: *10 | int | ||
// +usage=Specify the apiVersion of scale target | ||
targetAPIVersion: *"apps/v1" | string | ||
// +usage=Specify the kind of scale target | ||
targetKind: *"Deployment" | string | ||
cpu: { | ||
// +usage=Specify resource metrics in terms of percentage("Utilization") or direct value("AverageValue") | ||
type: *"Utilization" | "AverageValue" | ||
// +usage=Specify the value of CPU utilization or averageValue | ||
value: *50 | int | ||
} | ||
mem?: { | ||
// +usage=Specify resource metrics in terms of percentage("Utilization") or direct value("AverageValue") | ||
type: *"Utilization" | "AverageValue" | ||
// +usage=Specify the value of MEM utilization or averageValue | ||
value: *50 | int | ||
} | ||
// +usage=Specify custom metrics of pod type | ||
podCustomMetrics?: [...{ | ||
// +usage=Specify name of custom metrics | ||
name: string | ||
// +usage=Specify target value of custom metrics | ||
value: string | ||
}] | ||
} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
# Code generated by KubeVela templates. DO NOT EDIT. Please edit the original cue file. | ||
# Definition source cue file: vela-templates/definitions/internal/hpa.cue | ||
apiVersion: core.oam.dev/v1beta1 | ||
kind: TraitDefinition | ||
metadata: | ||
annotations: | ||
definition.oam.dev/description: Configure k8s HPA for Deployment or Statefulsets | ||
name: hpa | ||
namespace: {{ include "systemDefinitionNamespace" . }} | ||
spec: | ||
appliesToWorkloads: | ||
- deployments.apps | ||
- statefulsets.apps | ||
podDisruptive: false | ||
schematic: | ||
cue: | ||
template: | | ||
outputs: hpa: { | ||
apiVersion: "autoscaling/v2beta2" | ||
kind: "HorizontalPodAutoscaler" | ||
metadata: name: context.name | ||
spec: { | ||
scaleTargetRef: { | ||
apiVersion: parameter.targetAPIVersion | ||
kind: parameter.targetKind | ||
name: context.name | ||
} | ||
minReplicas: parameter.min | ||
maxReplicas: parameter.max | ||
metrics: [ | ||
{ | ||
type: "Resource" | ||
resource: { | ||
name: "cpu" | ||
target: { | ||
type: parameter.cpu.type | ||
if parameter.cpu.type == "Utilization" { | ||
averageUtilization: parameter.cpu.value | ||
} | ||
if parameter.cpu.type == "AverageValue" { | ||
averageValue: parameter.cpu.value | ||
} | ||
} | ||
} | ||
}, | ||
if parameter.mem != _|_ { | ||
{ | ||
type: "Resource" | ||
resource: { | ||
name: "memory" | ||
target: { | ||
type: parameter.mem.type | ||
if parameter.cpu.type == "Utilization" { | ||
averageUtilization: parameter.cpu.value | ||
} | ||
if parameter.cpu.type == "AverageValue" { | ||
averageValue: parameter.cpu.value | ||
} | ||
} | ||
} | ||
} | ||
}, | ||
if parameter.podCustomMetrics != _|_ for m in parameter.podCustomMetrics { | ||
type: "Pods" | ||
pods: { | ||
metric: name: m.name | ||
target: { | ||
type: "AverageValue" | ||
averageValue: m.value | ||
} | ||
} | ||
}, | ||
] | ||
} | ||
} | ||
parameter: { | ||
// +usage=Specify the minimal number of replicas to which the autoscaler can scale down | ||
min: *1 | int | ||
// +usage=Specify the maximum number of of replicas to which the autoscaler can scale up | ||
max: *10 | int | ||
// +usage=Specify the apiVersion of scale target | ||
targetAPIVersion: *"apps/v1" | string | ||
// +usage=Specify the kind of scale target | ||
targetKind: *"Deployment" | string | ||
cpu: { | ||
// +usage=Specify resource metrics in terms of percentage("Utilization") or direct value("AverageValue") | ||
type: *"Utilization" | "AverageValue" | ||
// +usage=Specify the value of CPU utilization or averageValue | ||
value: *50 | int | ||
} | ||
mem?: { | ||
// +usage=Specify resource metrics in terms of percentage("Utilization") or direct value("AverageValue") | ||
type: *"Utilization" | "AverageValue" | ||
// +usage=Specify the value of MEM utilization or averageValue | ||
value: *50 | int | ||
} | ||
// +usage=Specify custom metrics of pod type | ||
podCustomMetrics?: [...{ | ||
// +usage=Specify name of custom metrics | ||
name: string | ||
// +usage=Specify target value of custom metrics | ||
value: string | ||
}] | ||
} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
```yaml | ||
apiVersion: core.oam.dev/v1beta1 | ||
kind: Application | ||
metadata: | ||
name: helloworld | ||
spec: | ||
components: | ||
- name: helloworld | ||
type: webservice | ||
properties: | ||
cpu: "0.5" | ||
exposeType: ClusterIP | ||
image: oamdev/hello-world | ||
memory: 1024Mi | ||
ports: | ||
- expose: true | ||
port: 80 | ||
protocol: TCP | ||
traits: | ||
- type: scaler | ||
properties: | ||
replicas: 1 | ||
- type: hpa | ||
properties: | ||
targetAPIVersion: apps/v1 | ||
targetKind: Deployment | ||
max: 10 | ||
min: 1 | ||
cpu: | ||
type: Utilization | ||
value: 80 | ||
mem: | ||
type: AverageValue | ||
value: 90 | ||
podCustomMetrics: | ||
# here are custom metric names and values. Please replace them to be your metrics | ||
- name: pod_net_received_rate | ||
value: "77" | ||
- name: pod_net_transmitted_rate | ||
value: "88" | ||
- name: pod_net_received_packets_rate | ||
value: "95" | ||
- name: pod_net_transmitted_packets_rate | ||
value: "99" | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,101 @@ | ||
hpa: { | ||
type: "trait" | ||
annotations: {} | ||
labels: {} | ||
description: "Configure k8s HPA for Deployment or Statefulsets" | ||
attributes: { | ||
podDisruptive: false | ||
appliesToWorkloads: ["deployments.apps", "statefulsets.apps"] | ||
} | ||
} | ||
template: { | ||
outputs: hpa: { | ||
apiVersion: "autoscaling/v2beta2" | ||
kind: "HorizontalPodAutoscaler" | ||
metadata: name: context.name | ||
spec: { | ||
scaleTargetRef: { | ||
apiVersion: parameter.targetAPIVersion | ||
kind: parameter.targetKind | ||
name: context.name | ||
} | ||
minReplicas: parameter.min | ||
maxReplicas: parameter.max | ||
metrics: [ | ||
{ | ||
type: "Resource" | ||
resource: { | ||
name: "cpu" | ||
target: { | ||
type: parameter.cpu.type | ||
if parameter.cpu.type == "Utilization" { | ||
averageUtilization: parameter.cpu.value | ||
} | ||
if parameter.cpu.type == "AverageValue" { | ||
averageValue: parameter.cpu.value | ||
} | ||
} | ||
} | ||
}, | ||
if parameter.mem != _|_ { | ||
{ | ||
type: "Resource" | ||
resource: { | ||
name: "memory" | ||
target: { | ||
type: parameter.mem.type | ||
if parameter.cpu.type == "Utilization" { | ||
averageUtilization: parameter.cpu.value | ||
} | ||
if parameter.cpu.type == "AverageValue" { | ||
averageValue: parameter.cpu.value | ||
} | ||
} | ||
} | ||
} | ||
}, | ||
if parameter.podCustomMetrics != _|_ for m in parameter.podCustomMetrics { | ||
type: "Pods" | ||
pods: { | ||
metric: { | ||
name: m.name | ||
} | ||
target: { | ||
type: "AverageValue" | ||
averageValue: m.value | ||
} | ||
} | ||
}, | ||
] | ||
} | ||
} | ||
parameter: { | ||
// +usage=Specify the minimal number of replicas to which the autoscaler can scale down | ||
min: *1 | int | ||
// +usage=Specify the maximum number of of replicas to which the autoscaler can scale up | ||
max: *10 | int | ||
// +usage=Specify the apiVersion of scale target | ||
targetAPIVersion: *"apps/v1" | string | ||
// +usage=Specify the kind of scale target | ||
targetKind: *"Deployment" | string | ||
cpu: { | ||
// +usage=Specify resource metrics in terms of percentage("Utilization") or direct value("AverageValue") | ||
type: *"Utilization" | "AverageValue" | ||
// +usage=Specify the value of CPU utilization or averageValue | ||
value: *50 | int | ||
} | ||
mem?: { | ||
// +usage=Specify resource metrics in terms of percentage("Utilization") or direct value("AverageValue") | ||
type: *"Utilization" | "AverageValue" | ||
// +usage=Specify the value of MEM utilization or averageValue | ||
value: *50 | int | ||
} | ||
// +usage=Specify custom metrics of pod type | ||
podCustomMetrics?: [...{ | ||
// +usage=Specify name of custom metrics | ||
name: string | ||
// +usage=Specify target value of custom metrics | ||
value: string | ||
}] | ||
} | ||
} |
Oops, something went wrong.