-
Notifications
You must be signed in to change notification settings - Fork 117
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
OSSM-1658 Fix use of deprecated autoscaling/v2beta1 HorizontalPodAuto…
…scaler (#979)
- Loading branch information
Showing
6 changed files
with
224 additions
and
3 deletions.
There are no files selected for viewing
48 changes: 48 additions & 0 deletions
48
resources/helm/overlays/gateways/istio-egress/templates/autoscale.yaml
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,48 @@ | ||
| {{ $gateway := index .Values "gateways" "istio-egressgateway" }} | ||
| {{- if and $gateway.autoscaleEnabled $gateway.autoscaleMin $gateway.autoscaleMax }} | ||
| {{- if (semverCompare ">=1.25-0" .Capabilities.KubeVersion.GitVersion) }} | ||
| apiVersion: autoscaling/v2 | ||
| kind: HorizontalPodAutoscaler | ||
| metadata: | ||
| name: {{ $gateway.name | default "istio-egressgateway" }} | ||
| namespace: {{ .Release.Namespace }} | ||
| labels: | ||
| {{ $gateway.labels | toYaml | indent 4 }} | ||
| release: {{ .Release.Name }} | ||
| spec: | ||
| maxReplicas: {{ $gateway.autoscaleMax }} | ||
| minReplicas: {{ $gateway.autoscaleMin }} | ||
| scaleTargetRef: | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| name: {{ $gateway.name | default "istio-egressgateway" }} | ||
| metrics: | ||
| - type: Resource | ||
| resource: | ||
| name: cpu | ||
| target: | ||
| type: Utilization | ||
| averageUtilization: {{ $gateway.cpu.targetAverageUtilization }} | ||
| {{- else }} | ||
| apiVersion: autoscaling/v2beta1 | ||
| kind: HorizontalPodAutoscaler | ||
| metadata: | ||
| name: {{ $gateway.name | default "istio-egressgateway" }} | ||
| namespace: {{ .Release.Namespace }} | ||
| labels: | ||
| {{ $gateway.labels | toYaml | indent 4 }} | ||
| release: {{ .Release.Name }} | ||
| spec: | ||
| maxReplicas: {{ $gateway.autoscaleMax }} | ||
| minReplicas: {{ $gateway.autoscaleMin }} | ||
| scaleTargetRef: | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| name: {{ $gateway.name | default "istio-egressgateway" }} | ||
| metrics: | ||
| - type: Resource | ||
| resource: | ||
| name: cpu | ||
| targetAverageUtilization: {{ $gateway.cpu.targetAverageUtilization }} | ||
| {{- end }} | ||
| {{- end }} |
48 changes: 48 additions & 0 deletions
48
resources/helm/overlays/gateways/istio-ingress/templates/autoscale.yaml
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,48 @@ | ||
| {{ $gateway := index .Values "gateways" "istio-ingressgateway" }} | ||
| {{- if and $gateway.autoscaleEnabled $gateway.autoscaleMin $gateway.autoscaleMax }} | ||
| {{- if (semverCompare ">=1.25-0" .Capabilities.KubeVersion.GitVersion) }} | ||
| apiVersion: autoscaling/v2 | ||
| kind: HorizontalPodAutoscaler | ||
| metadata: | ||
| name: {{ $gateway.name | default "istio-ingressgateway" }} | ||
| namespace: {{ .Release.Namespace }} | ||
| labels: | ||
| {{ $gateway.labels | toYaml | indent 4 }} | ||
| release: {{ .Release.Name }} | ||
| spec: | ||
| maxReplicas: {{ $gateway.autoscaleMax }} | ||
| minReplicas: {{ $gateway.autoscaleMin }} | ||
| scaleTargetRef: | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| name: {{ $gateway.name | default "istio-ingressgateway" }} | ||
| metrics: | ||
| - type: Resource | ||
| resource: | ||
| name: cpu | ||
| target: | ||
| type: Utilization | ||
| averageUtilization: {{ $gateway.cpu.targetAverageUtilization }} | ||
| {{- else }} | ||
| apiVersion: autoscaling/v2beta1 | ||
| kind: HorizontalPodAutoscaler | ||
| metadata: | ||
| name: {{ $gateway.name | default "istio-ingressgateway" }} | ||
| namespace: {{ .Release.Namespace }} | ||
| labels: | ||
| {{ $gateway.labels | toYaml | indent 4 }} | ||
| release: {{ .Release.Name }} | ||
| spec: | ||
| maxReplicas: {{ $gateway.autoscaleMax }} | ||
| minReplicas: {{ $gateway.autoscaleMin }} | ||
| scaleTargetRef: | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| name: {{ $gateway.name | default "istio-ingressgateway" }} | ||
| metrics: | ||
| - type: Resource | ||
| resource: | ||
| name: cpu | ||
| targetAverageUtilization: {{ $gateway.cpu.targetAverageUtilization }} | ||
| {{- end }} | ||
| {{- end }} |
49 changes: 49 additions & 0 deletions
49
resources/helm/overlays/istio-control/istio-discovery/templates/autoscale.yaml
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,49 @@ | ||
| {{- if and .Values.pilot.autoscaleEnabled .Values.pilot.autoscaleMin .Values.pilot.autoscaleMax }} | ||
| {{- if (semverCompare ">=1.25-0" .Capabilities.KubeVersion.GitVersion) }} | ||
| apiVersion: autoscaling/v2 | ||
| kind: HorizontalPodAutoscaler | ||
| metadata: | ||
| name: istiod-{{ .Values.revision | default "default" }} | ||
| namespace: {{ .Release.Namespace }} | ||
| labels: | ||
| app: istiod | ||
| release: {{ .Release.Name }} | ||
| istio.io/rev: {{ .Values.revision | default "default" }} | ||
| spec: | ||
| maxReplicas: {{ .Values.pilot.autoscaleMax }} | ||
| minReplicas: {{ .Values.pilot.autoscaleMin }} | ||
| scaleTargetRef: | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| name: istiod-{{ .Values.revision | default "default" }} | ||
| metrics: | ||
| - type: Resource | ||
| resource: | ||
| name: cpu | ||
| target: | ||
| type: Utilization | ||
| averageUtilization: {{ .Values.pilot.cpu.targetAverageUtilization }} | ||
| {{- else }} | ||
| apiVersion: autoscaling/v2beta1 | ||
| kind: HorizontalPodAutoscaler | ||
| metadata: | ||
| name: istiod-{{ .Values.revision | default "default" }} | ||
| namespace: {{ .Release.Namespace }} | ||
| labels: | ||
| app: istiod | ||
| release: {{ .Release.Name }} | ||
| istio.io/rev: {{ .Values.revision | default "default" }} | ||
| spec: | ||
| maxReplicas: {{ .Values.pilot.autoscaleMax }} | ||
| minReplicas: {{ .Values.pilot.autoscaleMin }} | ||
| scaleTargetRef: | ||
| apiVersion: apps/v1 | ||
| kind: Deployment | ||
| name: istiod-{{ .Values.revision | default "default" }} | ||
| metrics: | ||
| - type: Resource | ||
| resource: | ||
| name: cpu | ||
| targetAverageUtilization: {{ .Values.pilot.cpu.targetAverageUtilization }} | ||
| {{- end }} | ||
| {{- end }} |
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
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
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