From 832832cd84ac4de82f4135aee24d87ac543aa36a Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 13:46:57 +0530 Subject: [PATCH 01/39] Update api version Update api version to go with autoscaling/v2beta2 --- kubernetes/helm_charts/core/adminutils/templates/hpa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml index 39a0140656..b7e37f68d5 100644 --- a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2beta2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} From 914c7d2efd0495863058188866ca1458a727bae5 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 13:50:34 +0530 Subject: [PATCH 02/39] Update api vsersion --- kubernetes/helm_charts/core/adminutils/templates/hpa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml index b7e37f68d5..615b27144a 100644 --- a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta2 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} From 2891b785e743d253b5b83aa5bbd67a2f7f7262b8 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 13:52:54 +0530 Subject: [PATCH 03/39] Update hpa.yaml --- kubernetes/helm_charts/core/adminutils/templates/hpa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml index 615b27144a..e9a083b4cc 100644 --- a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2 +apiVersion: autoscaling/v1 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} From a221cb09a1facb00998ef6daa1c0db8a19068cd5 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:07:56 +0530 Subject: [PATCH 04/39] Update hpa.yaml --- kubernetes/helm_charts/core/adminutils/templates/hpa.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml index e9a083b4cc..13de00a3df 100644 --- a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml @@ -16,13 +16,13 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + targetUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + targetUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} From 29efb79fa9811e4438726b8bb5e77e7312996469 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:08:21 +0530 Subject: [PATCH 05/39] Update hpa.yaml --- kubernetes/helm_charts/core/adminutils/templates/hpa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml index 13de00a3df..5b4638ef13 100644 --- a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} From 02ffd1abcd17c425f82dd0ac2e127ffddfade032 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:12:09 +0530 Subject: [PATCH 06/39] Update hpa.yaml --- kubernetes/helm_charts/core/adminutils/templates/hpa.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml index 5b4638ef13..acf9d53d45 100644 --- a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml @@ -16,13 +16,13 @@ spec: - type: Resource resource: name: cpu - targetUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} From f3cf5fd880646bc3ca94da195dd3c9f551eef35a Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:15:30 +0530 Subject: [PATCH 07/39] Update hpa.yaml --- kubernetes/helm_charts/core/adminutils/templates/hpa.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml index acf9d53d45..d9289789ff 100644 --- a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml @@ -16,13 +16,17 @@ spec: - type: Resource resource: name: cpu - target: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: AverageUtilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - target: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: AverageUtilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} From d92976d5fd441f711dd69954d1f608b10b0e1d13 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:18:29 +0530 Subject: [PATCH 08/39] Update hpa.yaml --- kubernetes/helm_charts/core/adminutils/templates/hpa.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml index d9289789ff..81b0413c3a 100644 --- a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml @@ -17,7 +17,7 @@ spec: resource: name: cpu target: - type: AverageUtilization + type: Utilization averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} @@ -25,7 +25,7 @@ spec: resource: name: memory target: - type: AverageUtilization + type: Utilization averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} From ad79a3c7461302b041982bae005ebb0222969143 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 14:21:35 +0530 Subject: [PATCH 09/39] Update hpa.yaml --- kubernetes/helm_charts/core/adminutils/templates/hpa.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml index 81b0413c3a..e1da7d097c 100644 --- a/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/adminutils/templates/hpa.yaml @@ -17,16 +17,16 @@ spec: resource: name: cpu target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory target: - type: Utilization - averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} From eafb344bc0736880c76060f1bfd48fd091b27053 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 15:31:19 +0530 Subject: [PATCH 10/39] Update hpa.yaml --- .../helm_charts/core/analytics/templates/hpa.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/kubernetes/helm_charts/core/analytics/templates/hpa.yaml b/kubernetes/helm_charts/core/analytics/templates/hpa.yaml index 1ba4f89a8b..6d8d3e0111 100644 --- a/kubernetes/helm_charts/core/analytics/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/analytics/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} From 342e2cf42e26f535a5ec2a2c6a48dd5dbfa1af26 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:00:41 +0530 Subject: [PATCH 11/39] Update hpa.yaml --- .../helm_charts/core/apimanager/templates/hpa.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/kubernetes/helm_charts/core/apimanager/templates/hpa.yaml b/kubernetes/helm_charts/core/apimanager/templates/hpa.yaml index 1ba4f89a8b..450417d31f 100644 --- a/kubernetes/helm_charts/core/apimanager/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/apimanager/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} From 4527b28875f901f5de2d46546a6a642027659da9 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:06:38 +0530 Subject: [PATCH 12/39] Update hpa.yaml --- .../core/apimanagerecho/templates/hpa.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/kubernetes/helm_charts/core/apimanagerecho/templates/hpa.yaml b/kubernetes/helm_charts/core/apimanagerecho/templates/hpa.yaml index 1ba4f89a8b..450417d31f 100644 --- a/kubernetes/helm_charts/core/apimanagerecho/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/apimanagerecho/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} From 1b06b78b3bb0751a54a1ade6969ef50d56267570 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:08:44 +0530 Subject: [PATCH 13/39] Update hpa.yaml --- .../helm_charts/core/assessment/templates/hpa.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/kubernetes/helm_charts/core/assessment/templates/hpa.yaml b/kubernetes/helm_charts/core/assessment/templates/hpa.yaml index 1ba4f89a8b..450417d31f 100644 --- a/kubernetes/helm_charts/core/assessment/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/assessment/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} From 486fba3af64cc82c761c1ee6a5feb803f79ae76a Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:11:35 +0530 Subject: [PATCH 14/39] Update hpa.yaml --- kubernetes/helm_charts/core/cert/templates/hpa.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/kubernetes/helm_charts/core/cert/templates/hpa.yaml b/kubernetes/helm_charts/core/cert/templates/hpa.yaml index 1ba4f89a8b..450417d31f 100644 --- a/kubernetes/helm_charts/core/cert/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/cert/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} From d5a6897d888b099cdc553aa86d75b933bbf693f1 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:17:38 +0530 Subject: [PATCH 15/39] release-5.2.0-patch-1 --- .../helm_charts/core/certregistry/templates/hpa.yaml | 8 ++++++-- kubernetes/helm_charts/core/content/templates/hpa.yaml | 8 ++++++-- kubernetes/helm_charts/core/dial/templates/hpa.yaml | 8 ++++++-- .../helm_charts/core/discussionsmw/templates/hpa.yaml | 8 ++++++-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/kubernetes/helm_charts/core/certregistry/templates/hpa.yaml b/kubernetes/helm_charts/core/certregistry/templates/hpa.yaml index 1ba4f89a8b..1f56396102 100644 --- a/kubernetes/helm_charts/core/certregistry/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/certregistry/templates/hpa.yaml @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/content/templates/hpa.yaml b/kubernetes/helm_charts/core/content/templates/hpa.yaml index 1ba4f89a8b..1f56396102 100644 --- a/kubernetes/helm_charts/core/content/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/content/templates/hpa.yaml @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/dial/templates/hpa.yaml b/kubernetes/helm_charts/core/dial/templates/hpa.yaml index 1ba4f89a8b..1f56396102 100644 --- a/kubernetes/helm_charts/core/dial/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/dial/templates/hpa.yaml @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/discussionsmw/templates/hpa.yaml b/kubernetes/helm_charts/core/discussionsmw/templates/hpa.yaml index cb527919ea..5b317ba4c9 100644 --- a/kubernetes/helm_charts/core/discussionsmw/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/discussionsmw/templates/hpa.yaml @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} From 9b680b1ea075051df66f79913fd9646dc3abe9ef Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:20:07 +0530 Subject: [PATCH 16/39] re --- kubernetes/helm_charts/core/enc/templates/hpa.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kubernetes/helm_charts/core/enc/templates/hpa.yaml b/kubernetes/helm_charts/core/enc/templates/hpa.yaml index 1ba4f89a8b..1f56396102 100644 --- a/kubernetes/helm_charts/core/enc/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/enc/templates/hpa.yaml @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file From 68ecad49019646d79f1c623be220507f8554802f Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:27:48 +0530 Subject: [PATCH 17/39] release --- kubernetes/helm_charts/core/certregistry/templates/hpa.yaml | 2 +- kubernetes/helm_charts/core/content/templates/hpa.yaml | 2 +- kubernetes/helm_charts/core/dial/templates/hpa.yaml | 2 +- kubernetes/helm_charts/core/discussionsmw/templates/hpa.yaml | 2 +- kubernetes/helm_charts/core/enc/templates/hpa.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kubernetes/helm_charts/core/certregistry/templates/hpa.yaml b/kubernetes/helm_charts/core/certregistry/templates/hpa.yaml index 1f56396102..fd75ba3280 100644 --- a/kubernetes/helm_charts/core/certregistry/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/certregistry/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} diff --git a/kubernetes/helm_charts/core/content/templates/hpa.yaml b/kubernetes/helm_charts/core/content/templates/hpa.yaml index 1f56396102..fd75ba3280 100644 --- a/kubernetes/helm_charts/core/content/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/content/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} diff --git a/kubernetes/helm_charts/core/dial/templates/hpa.yaml b/kubernetes/helm_charts/core/dial/templates/hpa.yaml index 1f56396102..fd75ba3280 100644 --- a/kubernetes/helm_charts/core/dial/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/dial/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} diff --git a/kubernetes/helm_charts/core/discussionsmw/templates/hpa.yaml b/kubernetes/helm_charts/core/discussionsmw/templates/hpa.yaml index 5b317ba4c9..450417d31f 100644 --- a/kubernetes/helm_charts/core/discussionsmw/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/discussionsmw/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} diff --git a/kubernetes/helm_charts/core/enc/templates/hpa.yaml b/kubernetes/helm_charts/core/enc/templates/hpa.yaml index 1f56396102..fd75ba3280 100644 --- a/kubernetes/helm_charts/core/enc/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/enc/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} From 2dd2d747394195a3bf4967569c21d5461412fa7a Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 17:40:58 +0530 Subject: [PATCH 18/39] relea --- .../helm_charts/core/gotenberg/templates/hpa.yaml | 10 +++++++--- kubernetes/helm_charts/core/gql/templates/hpa.yaml | 10 +++++++--- kubernetes/helm_charts/core/groups/templates/hpa.yaml | 10 +++++++--- kubernetes/helm_charts/core/inbound/templates/hpa.yaml | 10 +++++++--- .../helm_charts/core/knowledgemw/templates/hpa.yaml | 10 +++++++--- kubernetes/helm_charts/core/learner/templates/hpa.yaml | 4 +++- kubernetes/helm_charts/core/lms/templates/hpa.yaml | 6 ++++-- 7 files changed, 42 insertions(+), 18 deletions(-) diff --git a/kubernetes/helm_charts/core/gotenberg/templates/hpa.yaml b/kubernetes/helm_charts/core/gotenberg/templates/hpa.yaml index 1ba4f89a8b..fd75ba3280 100644 --- a/kubernetes/helm_charts/core/gotenberg/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/gotenberg/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/gql/templates/hpa.yaml b/kubernetes/helm_charts/core/gql/templates/hpa.yaml index 0fef8ca0e7..db8ca6720f 100644 --- a/kubernetes/helm_charts/core/gql/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/gql/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/groups/templates/hpa.yaml b/kubernetes/helm_charts/core/groups/templates/hpa.yaml index 1ba4f89a8b..fd75ba3280 100644 --- a/kubernetes/helm_charts/core/groups/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/groups/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/inbound/templates/hpa.yaml b/kubernetes/helm_charts/core/inbound/templates/hpa.yaml index 0fef8ca0e7..db8ca6720f 100644 --- a/kubernetes/helm_charts/core/inbound/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/inbound/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/knowledgemw/templates/hpa.yaml b/kubernetes/helm_charts/core/knowledgemw/templates/hpa.yaml index 1ba4f89a8b..fd75ba3280 100644 --- a/kubernetes/helm_charts/core/knowledgemw/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/knowledgemw/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/learner/templates/hpa.yaml b/kubernetes/helm_charts/core/learner/templates/hpa.yaml index 1ba4f89a8b..29acc2a2f3 100644 --- a/kubernetes/helm_charts/core/learner/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/learner/templates/hpa.yaml @@ -16,7 +16,9 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource diff --git a/kubernetes/helm_charts/core/lms/templates/hpa.yaml b/kubernetes/helm_charts/core/lms/templates/hpa.yaml index 1ba4f89a8b..760593b56b 100644 --- a/kubernetes/helm_charts/core/lms/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/lms/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,7 +16,9 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource From 86905dcbb03284af0899fc14c893c43a7a6d57ef Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 18:17:16 +0530 Subject: [PATCH 19/39] release --- .../core/ml-core-service/templates/hpa.yaml | 10 +++++++--- .../core/ml-projects-service/templates/hpa.yaml | 10 +++++++--- .../core/ml-reports-service/templates/hpa.yaml | 10 +++++++--- .../core/ml-survey-service/templates/hpa.yaml | 10 +++++++--- .../core/nginx-private-ingress/templates/hpa.yaml | 10 +++++++--- kubernetes/helm_charts/core/nodebb/templates/hpa.yaml | 10 +++++++--- .../helm_charts/core/notification/templates/hpa.yaml | 10 +++++++--- kubernetes/helm_charts/core/odk/templates/hpa.yaml | 10 +++++++--- .../helm_charts/core/orchestrator/templates/hpa.yaml | 10 +++++++--- .../helm_charts/core/outbound/templates/hpa.yaml | 10 +++++++--- kubernetes/helm_charts/core/player/templates/hpa.yaml | 10 +++++++--- kubernetes/helm_charts/core/print/templates/hpa.yaml | 10 +++++++--- kubernetes/helm_charts/core/report/templates/hpa.yaml | 10 +++++++--- 13 files changed, 91 insertions(+), 39 deletions(-) diff --git a/kubernetes/helm_charts/core/ml-core-service/templates/hpa.yaml b/kubernetes/helm_charts/core/ml-core-service/templates/hpa.yaml index 1ba4f89a8b..a71577dea6 100644 --- a/kubernetes/helm_charts/core/ml-core-service/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/ml-core-service/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/ml-projects-service/templates/hpa.yaml b/kubernetes/helm_charts/core/ml-projects-service/templates/hpa.yaml index 1ba4f89a8b..fd75ba3280 100644 --- a/kubernetes/helm_charts/core/ml-projects-service/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/ml-projects-service/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/ml-reports-service/templates/hpa.yaml b/kubernetes/helm_charts/core/ml-reports-service/templates/hpa.yaml index 1ba4f89a8b..fd75ba3280 100644 --- a/kubernetes/helm_charts/core/ml-reports-service/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/ml-reports-service/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/ml-survey-service/templates/hpa.yaml b/kubernetes/helm_charts/core/ml-survey-service/templates/hpa.yaml index 1ba4f89a8b..ca997e222e 100644 --- a/kubernetes/helm_charts/core/ml-survey-service/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/ml-survey-service/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/nginx-private-ingress/templates/hpa.yaml b/kubernetes/helm_charts/core/nginx-private-ingress/templates/hpa.yaml index 1ba4f89a8b..fd75ba3280 100644 --- a/kubernetes/helm_charts/core/nginx-private-ingress/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/nginx-private-ingress/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/nodebb/templates/hpa.yaml b/kubernetes/helm_charts/core/nodebb/templates/hpa.yaml index 1ba4f89a8b..fd75ba3280 100644 --- a/kubernetes/helm_charts/core/nodebb/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/nodebb/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/notification/templates/hpa.yaml b/kubernetes/helm_charts/core/notification/templates/hpa.yaml index 1ba4f89a8b..fd75ba3280 100644 --- a/kubernetes/helm_charts/core/notification/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/notification/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/odk/templates/hpa.yaml b/kubernetes/helm_charts/core/odk/templates/hpa.yaml index 0fef8ca0e7..db8ca6720f 100644 --- a/kubernetes/helm_charts/core/odk/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/odk/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/orchestrator/templates/hpa.yaml b/kubernetes/helm_charts/core/orchestrator/templates/hpa.yaml index 0fef8ca0e7..db8ca6720f 100644 --- a/kubernetes/helm_charts/core/orchestrator/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/orchestrator/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/outbound/templates/hpa.yaml b/kubernetes/helm_charts/core/outbound/templates/hpa.yaml index 0fef8ca0e7..b85e93d282 100644 --- a/kubernetes/helm_charts/core/outbound/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/outbound/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/player/templates/hpa.yaml b/kubernetes/helm_charts/core/player/templates/hpa.yaml index 1ba4f89a8b..ca997e222e 100644 --- a/kubernetes/helm_charts/core/player/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/player/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/print/templates/hpa.yaml b/kubernetes/helm_charts/core/print/templates/hpa.yaml index 1ba4f89a8b..ca997e222e 100644 --- a/kubernetes/helm_charts/core/print/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/print/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/report/templates/hpa.yaml b/kubernetes/helm_charts/core/report/templates/hpa.yaml index 1ba4f89a8b..ca997e222e 100644 --- a/kubernetes/helm_charts/core/report/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/report/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file From f157ce465807f7744233fa5b01e9ad28474ff895 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 19 Sep 2023 19:00:14 +0530 Subject: [PATCH 20/39] release --- kubernetes/helm_charts/core/search/templates/hpa.yaml | 8 ++++++-- kubernetes/helm_charts/core/taxonomy/templates/hpa.yaml | 8 ++++++-- kubernetes/helm_charts/core/telemetry/templates/hpa.yaml | 8 ++++++-- .../helm_charts/core/transformer/templates/hpa.yaml | 8 ++++++-- kubernetes/helm_charts/core/uci/templates/hpa.yaml | 8 ++++++-- kubernetes/helm_charts/core/userorg/templates/hpa.yaml | 8 ++++++-- 6 files changed, 36 insertions(+), 12 deletions(-) diff --git a/kubernetes/helm_charts/core/search/templates/hpa.yaml b/kubernetes/helm_charts/core/search/templates/hpa.yaml index 1ba4f89a8b..1f56396102 100644 --- a/kubernetes/helm_charts/core/search/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/search/templates/hpa.yaml @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/taxonomy/templates/hpa.yaml b/kubernetes/helm_charts/core/taxonomy/templates/hpa.yaml index 1ba4f89a8b..1f56396102 100644 --- a/kubernetes/helm_charts/core/taxonomy/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/taxonomy/templates/hpa.yaml @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/telemetry/templates/hpa.yaml b/kubernetes/helm_charts/core/telemetry/templates/hpa.yaml index 1ba4f89a8b..1f56396102 100644 --- a/kubernetes/helm_charts/core/telemetry/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/telemetry/templates/hpa.yaml @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/transformer/templates/hpa.yaml b/kubernetes/helm_charts/core/transformer/templates/hpa.yaml index 0fef8ca0e7..69ef3ee896 100644 --- a/kubernetes/helm_charts/core/transformer/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/transformer/templates/hpa.yaml @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/uci/templates/hpa.yaml b/kubernetes/helm_charts/core/uci/templates/hpa.yaml index 0fef8ca0e7..69ef3ee896 100644 --- a/kubernetes/helm_charts/core/uci/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/uci/templates/hpa.yaml @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file diff --git a/kubernetes/helm_charts/core/userorg/templates/hpa.yaml b/kubernetes/helm_charts/core/userorg/templates/hpa.yaml index 1ba4f89a8b..1f56396102 100644 --- a/kubernetes/helm_charts/core/userorg/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/userorg/templates/hpa.yaml @@ -16,12 +16,16 @@ spec: - type: Resource resource: name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource resource: name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + target: + type: Utilization + averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} {{- end }} \ No newline at end of file From e230685cc36b8937884ffe692cdc7b4c977eb626 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Wed, 20 Sep 2023 14:06:16 +0530 Subject: [PATCH 21/39] release --- kubernetes/helm_charts/core/learner/templates/hpa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/core/learner/templates/hpa.yaml b/kubernetes/helm_charts/core/learner/templates/hpa.yaml index 29acc2a2f3..760593b56b 100644 --- a/kubernetes/helm_charts/core/learner/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/learner/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} From 30dc9118656e88d4f0d87ccaf2a0a3bee9317139 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Wed, 20 Sep 2023 16:40:41 +0530 Subject: [PATCH 22/39] release --- kubernetes/helm_charts/core/player/templates/hpa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/core/player/templates/hpa.yaml b/kubernetes/helm_charts/core/player/templates/hpa.yaml index ca997e222e..fd75ba3280 100644 --- a/kubernetes/helm_charts/core/player/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/player/templates/hpa.yaml @@ -18,7 +18,7 @@ spec: name: cpu target: type: Utilization - averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource From 7791202ce1aaad8f9c8ca6027321c47b5aac8262 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Wed, 20 Sep 2023 23:07:26 +0530 Subject: [PATCH 23/39] release --- kubernetes/helm_charts/core/print/templates/hpa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/core/print/templates/hpa.yaml b/kubernetes/helm_charts/core/print/templates/hpa.yaml index ca997e222e..fd75ba3280 100644 --- a/kubernetes/helm_charts/core/print/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/print/templates/hpa.yaml @@ -18,7 +18,7 @@ spec: name: cpu target: type: Utilization - averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} {{- end }} {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} - type: Resource From a3d5b47170c1edf4d23fba465c3e48458fafb13c Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Thu, 21 Sep 2023 13:36:25 +0530 Subject: [PATCH 24/39] release-5.2. --- kubernetes/helm_charts/core/taxonomy/templates/hpa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/core/taxonomy/templates/hpa.yaml b/kubernetes/helm_charts/core/taxonomy/templates/hpa.yaml index 1f56396102..fd75ba3280 100644 --- a/kubernetes/helm_charts/core/taxonomy/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/taxonomy/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} From 858300f736f9dd8790b762bc023e049abdac0043 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Thu, 21 Sep 2023 15:09:57 +0530 Subject: [PATCH 25/39] release-5.2. --- .../blackbox-exporter/templates/poddisruptionbudget.yaml | 2 +- .../elasticsearch-exporter/templates/podsecuritypolicies.yaml | 2 +- .../monitoring/oauth2-proxy/charts/redis/templates/_helpers.tpl | 2 +- .../charts/grafana/templates/poddisruptionbudget.yaml | 2 +- .../charts/grafana/templates/podsecuritypolicy.yaml | 2 +- .../charts/grafana/templates/tests/test-podsecuritypolicy.yaml | 2 +- .../charts/kube-state-metrics/templates/pdb.yaml | 2 +- .../charts/kube-state-metrics/templates/podsecuritypolicy.yaml | 2 +- .../charts/prometheus-node-exporter/templates/psp.yaml | 2 +- .../prometheus-operator/templates/alertmanager/psp.yaml | 2 +- .../templates/prometheus/podDisruptionBudget.yaml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/kubernetes/helm_charts/monitoring/blackbox-exporter/templates/poddisruptionbudget.yaml b/kubernetes/helm_charts/monitoring/blackbox-exporter/templates/poddisruptionbudget.yaml index 8d54718ed0..1d9644fd6b 100755 --- a/kubernetes/helm_charts/monitoring/blackbox-exporter/templates/poddisruptionbudget.yaml +++ b/kubernetes/helm_charts/monitoring/blackbox-exporter/templates/poddisruptionbudget.yaml @@ -1,4 +1,4 @@ -apiVersion: policy/v1beta1 +apiVersion: policy/v1 kind: PodDisruptionBudget metadata: name: {{ template "prometheus-blackbox-exporter.fullname" . }} diff --git a/kubernetes/helm_charts/monitoring/elasticsearch-exporter/templates/podsecuritypolicies.yaml b/kubernetes/helm_charts/monitoring/elasticsearch-exporter/templates/podsecuritypolicies.yaml index fc7c2b6325..f08dd64343 100755 --- a/kubernetes/helm_charts/monitoring/elasticsearch-exporter/templates/podsecuritypolicies.yaml +++ b/kubernetes/helm_charts/monitoring/elasticsearch-exporter/templates/podsecuritypolicies.yaml @@ -1,5 +1,5 @@ {{- if .Values.podSecurityPolicies.enabled -}} -apiVersion: policy/v1beta1 +apiVersion: policy/v1 kind: PodSecurityPolicy metadata: name: {{ template "elasticsearch-exporter.fullname" . }} diff --git a/kubernetes/helm_charts/monitoring/oauth2-proxy/charts/redis/templates/_helpers.tpl b/kubernetes/helm_charts/monitoring/oauth2-proxy/charts/redis/templates/_helpers.tpl index 47f52a3345..4d40eed1b0 100644 --- a/kubernetes/helm_charts/monitoring/oauth2-proxy/charts/redis/templates/_helpers.tpl +++ b/kubernetes/helm_charts/monitoring/oauth2-proxy/charts/redis/templates/_helpers.tpl @@ -58,7 +58,7 @@ Return the appropriate apiVersion for PodSecurityPolicy. */}} {{- define "podSecurityPolicy.apiVersion" -}} {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -{{- print "policy/v1beta1" -}} +{{- print "policy/v1" -}} {{- else -}} {{- print "extensions/v1beta1" -}} {{- end -}} diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/poddisruptionbudget.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/poddisruptionbudget.yaml index d6f230a8f2..ef41785b40 100755 --- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/poddisruptionbudget.yaml +++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/poddisruptionbudget.yaml @@ -1,5 +1,5 @@ {{- if .Values.podDisruptionBudget }} -apiVersion: policy/v1beta1 +apiVersion: policy/v1 kind: PodDisruptionBudget metadata: name: {{ template "grafana.name" . }} diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/podsecuritypolicy.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/podsecuritypolicy.yaml index c5e6ba05ea..39204b0607 100755 --- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/podsecuritypolicy.yaml +++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/podsecuritypolicy.yaml @@ -1,5 +1,5 @@ {{- if .Values.rbac.pspEnabled }} -apiVersion: policy/v1beta1 +apiVersion: policy/v1 kind: PodSecurityPolicy metadata: name: {{ template "grafana.fullname" . }} diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/tests/test-podsecuritypolicy.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/tests/test-podsecuritypolicy.yaml index eb5cbbcd70..a7b2abb025 100755 --- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/tests/test-podsecuritypolicy.yaml +++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/tests/test-podsecuritypolicy.yaml @@ -1,5 +1,5 @@ {{- if and .Values.testFramework.enabled .Values.rbac.pspEnabled }} -apiVersion: policy/v1beta1 +apiVersion: policy/v1 kind: PodSecurityPolicy metadata: name: {{ template "grafana.fullname" . }}-test diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/pdb.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/pdb.yaml index 6adb50d79f..6f6070ffcb 100755 --- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/pdb.yaml +++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/pdb.yaml @@ -1,5 +1,5 @@ {{- if .Values.podDisruptionBudget -}} -apiVersion: policy/v1beta1 +apiVersion: policy/v1 kind: PodDisruptionBudget metadata: name: {{ template "kube-state-metrics.fullname" . }} diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/podsecuritypolicy.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/podsecuritypolicy.yaml index aeff11791c..35929847e9 100755 --- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/podsecuritypolicy.yaml +++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/podsecuritypolicy.yaml @@ -1,5 +1,5 @@ {{- if .Values.podSecurityPolicy.enabled }} -apiVersion: policy/v1beta1 +apiVersion: policy/v1 kind: PodSecurityPolicy metadata: name: {{ template "kube-state-metrics.fullname" . }} diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/prometheus-node-exporter/templates/psp.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/prometheus-node-exporter/templates/psp.yaml index f00506c980..cc26eaf7b8 100755 --- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/prometheus-node-exporter/templates/psp.yaml +++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/prometheus-node-exporter/templates/psp.yaml @@ -1,6 +1,6 @@ {{- if .Values.rbac.create }} {{- if .Values.rbac.pspEnabled }} -apiVersion: policy/v1beta1 +apiVersion: policy/v1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus-node-exporter.fullname" . }} diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/templates/alertmanager/psp.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/templates/alertmanager/psp.yaml index cbc0bb8567..787054a0e9 100755 --- a/kubernetes/helm_charts/monitoring/prometheus-operator/templates/alertmanager/psp.yaml +++ b/kubernetes/helm_charts/monitoring/prometheus-operator/templates/alertmanager/psp.yaml @@ -1,5 +1,5 @@ {{- if and .Values.alertmanager.enabled .Values.global.rbac.create .Values.global.rbac.pspEnabled }} -apiVersion: policy/v1beta1 +apiVersion: policy/v1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus-operator.fullname" . }}-alertmanager diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml index c0bb5995ff..4ccc61dcfc 100755 --- a/kubernetes/helm_charts/monitoring/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml +++ b/kubernetes/helm_charts/monitoring/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml @@ -1,5 +1,5 @@ {{- if and .Values.prometheus.enabled .Values.prometheus.podDisruptionBudget.enabled }} -apiVersion: policy/v1beta1 +apiVersion: policy/v1 kind: PodDisruptionBudget metadata: name: {{ template "prometheus-operator.fullname" . }}-prometheus From a01e9652012e34e55ed7c6f53367fe4b027cf19c Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 26 Sep 2023 13:03:35 +0530 Subject: [PATCH 26/39] Update hpa.yaml --- kubernetes/helm_charts/core/search/templates/hpa.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/helm_charts/core/search/templates/hpa.yaml b/kubernetes/helm_charts/core/search/templates/hpa.yaml index 1f56396102..450417d31f 100644 --- a/kubernetes/helm_charts/core/search/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/search/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -28,4 +28,4 @@ spec: type: Utilization averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} From b571d68860be77240ca85eb46307f3b1bb7e125e Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Tue, 26 Sep 2023 13:10:21 +0530 Subject: [PATCH 27/39] Update hpa.yaml --- kubernetes/helm_charts/core/telemetry/templates/hpa.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/helm_charts/core/telemetry/templates/hpa.yaml b/kubernetes/helm_charts/core/telemetry/templates/hpa.yaml index 1f56396102..450417d31f 100644 --- a/kubernetes/helm_charts/core/telemetry/templates/hpa.yaml +++ b/kubernetes/helm_charts/core/telemetry/templates/hpa.yaml @@ -1,5 +1,5 @@ {{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 +apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler metadata: name: {{ .Chart.Name }} @@ -28,4 +28,4 @@ spec: type: Utilization averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} From 9ea03af38195cd4e88c7d4babd7cbdad72b36c86 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:24:15 +0530 Subject: [PATCH 28/39] Update podDisruptionBudget.yaml --- .../templates/prometheus/podDisruptionBudget.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml index 4ccc61dcfc..c0bb5995ff 100755 --- a/kubernetes/helm_charts/monitoring/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml +++ b/kubernetes/helm_charts/monitoring/prometheus-operator/templates/prometheus/podDisruptionBudget.yaml @@ -1,5 +1,5 @@ {{- if and .Values.prometheus.enabled .Values.prometheus.podDisruptionBudget.enabled }} -apiVersion: policy/v1 +apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: name: {{ template "prometheus-operator.fullname" . }}-prometheus From 8e7c44842535246e3f79430e1907c08d28156943 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:25:36 +0530 Subject: [PATCH 29/39] Update psp.yaml --- .../prometheus-operator/templates/alertmanager/psp.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/templates/alertmanager/psp.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/templates/alertmanager/psp.yaml index 787054a0e9..cbc0bb8567 100755 --- a/kubernetes/helm_charts/monitoring/prometheus-operator/templates/alertmanager/psp.yaml +++ b/kubernetes/helm_charts/monitoring/prometheus-operator/templates/alertmanager/psp.yaml @@ -1,5 +1,5 @@ {{- if and .Values.alertmanager.enabled .Values.global.rbac.create .Values.global.rbac.pspEnabled }} -apiVersion: policy/v1 +apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus-operator.fullname" . }}-alertmanager From fc74c11ee01c051ce9619d349d4d2b5914a85ba6 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:26:12 +0530 Subject: [PATCH 30/39] Update psp.yaml --- .../charts/prometheus-node-exporter/templates/psp.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/prometheus-node-exporter/templates/psp.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/prometheus-node-exporter/templates/psp.yaml index cc26eaf7b8..f00506c980 100755 --- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/prometheus-node-exporter/templates/psp.yaml +++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/prometheus-node-exporter/templates/psp.yaml @@ -1,6 +1,6 @@ {{- if .Values.rbac.create }} {{- if .Values.rbac.pspEnabled }} -apiVersion: policy/v1 +apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "prometheus-node-exporter.fullname" . }} From 0ac86171f12d6295bb53830643bce75e9addc3a9 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:27:48 +0530 Subject: [PATCH 31/39] Update podsecuritypolicy.yaml --- .../charts/kube-state-metrics/templates/podsecuritypolicy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/podsecuritypolicy.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/podsecuritypolicy.yaml index 35929847e9..aeff11791c 100755 --- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/podsecuritypolicy.yaml +++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/podsecuritypolicy.yaml @@ -1,5 +1,5 @@ {{- if .Values.podSecurityPolicy.enabled }} -apiVersion: policy/v1 +apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "kube-state-metrics.fullname" . }} From 59fe2eafb8bfac2bdf67e98e0416576197ee9af2 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:28:07 +0530 Subject: [PATCH 32/39] Update pdb.yaml --- .../charts/kube-state-metrics/templates/pdb.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/pdb.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/pdb.yaml index 6f6070ffcb..831410ba08 100755 --- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/pdb.yaml +++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/kube-state-metrics/templates/pdb.yaml @@ -1,5 +1,5 @@ {{- if .Values.podDisruptionBudget -}} -apiVersion: policy/v1 +apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: name: {{ template "kube-state-metrics.fullname" . }} @@ -14,4 +14,4 @@ spec: matchLabels: app.kubernetes.io/name: {{ template "kube-state-metrics.name" . }} {{ toYaml .Values.podDisruptionBudget | indent 2 }} -{{- end -}} \ No newline at end of file +{{- end -}} From 88367faf98f6125d5a38904d5cab6ab3a9e96ac3 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:28:29 +0530 Subject: [PATCH 33/39] Update poddisruptionbudget.yaml --- .../charts/grafana/templates/poddisruptionbudget.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/poddisruptionbudget.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/poddisruptionbudget.yaml index ef41785b40..d6f230a8f2 100755 --- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/poddisruptionbudget.yaml +++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/poddisruptionbudget.yaml @@ -1,5 +1,5 @@ {{- if .Values.podDisruptionBudget }} -apiVersion: policy/v1 +apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: name: {{ template "grafana.name" . }} From d6888b43ade2b8f02063b1aa91997b9d8654b02c Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:29:42 +0530 Subject: [PATCH 34/39] Update test-podsecuritypolicy.yaml --- .../charts/grafana/templates/tests/test-podsecuritypolicy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/tests/test-podsecuritypolicy.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/tests/test-podsecuritypolicy.yaml index a7b2abb025..eb5cbbcd70 100755 --- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/tests/test-podsecuritypolicy.yaml +++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/tests/test-podsecuritypolicy.yaml @@ -1,5 +1,5 @@ {{- if and .Values.testFramework.enabled .Values.rbac.pspEnabled }} -apiVersion: policy/v1 +apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "grafana.fullname" . }}-test From b5cf0c0348c4e985b08acf996376c6e60659a592 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:30:14 +0530 Subject: [PATCH 35/39] Update pdb.yaml From eef5516004d2200622fc6858cd695549a6083b6d Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:30:46 +0530 Subject: [PATCH 36/39] Update podsecuritypolicy.yaml --- .../charts/grafana/templates/podsecuritypolicy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/podsecuritypolicy.yaml b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/podsecuritypolicy.yaml index 39204b0607..c5e6ba05ea 100755 --- a/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/podsecuritypolicy.yaml +++ b/kubernetes/helm_charts/monitoring/prometheus-operator/charts/grafana/templates/podsecuritypolicy.yaml @@ -1,5 +1,5 @@ {{- if .Values.rbac.pspEnabled }} -apiVersion: policy/v1 +apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "grafana.fullname" . }} From a038bba84d1b0a84b646ba30b16f8d39dd11f2be Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:31:38 +0530 Subject: [PATCH 37/39] Update _helpers.tpl --- .../oauth2-proxy/charts/redis/templates/_helpers.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubernetes/helm_charts/monitoring/oauth2-proxy/charts/redis/templates/_helpers.tpl b/kubernetes/helm_charts/monitoring/oauth2-proxy/charts/redis/templates/_helpers.tpl index 4d40eed1b0..b0951b845f 100644 --- a/kubernetes/helm_charts/monitoring/oauth2-proxy/charts/redis/templates/_helpers.tpl +++ b/kubernetes/helm_charts/monitoring/oauth2-proxy/charts/redis/templates/_helpers.tpl @@ -58,7 +58,7 @@ Return the appropriate apiVersion for PodSecurityPolicy. */}} {{- define "podSecurityPolicy.apiVersion" -}} {{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} -{{- print "policy/v1" -}} +{{- print "policy/v1beta1" -}} {{- else -}} {{- print "extensions/v1beta1" -}} {{- end -}} @@ -375,4 +375,4 @@ redis: spreadConstraints Pod Topology Spread Constraints are only available on K8s >= 1.16 Find more information at https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ {{- end -}} -{{- end -}} \ No newline at end of file +{{- end -}} From 562f51bf812f8f90c9b10e017f0bf33041774a33 Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:32:41 +0530 Subject: [PATCH 38/39] Update podsecuritypolicies.yaml --- .../elasticsearch-exporter/templates/podsecuritypolicies.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/monitoring/elasticsearch-exporter/templates/podsecuritypolicies.yaml b/kubernetes/helm_charts/monitoring/elasticsearch-exporter/templates/podsecuritypolicies.yaml index f08dd64343..fc7c2b6325 100755 --- a/kubernetes/helm_charts/monitoring/elasticsearch-exporter/templates/podsecuritypolicies.yaml +++ b/kubernetes/helm_charts/monitoring/elasticsearch-exporter/templates/podsecuritypolicies.yaml @@ -1,5 +1,5 @@ {{- if .Values.podSecurityPolicies.enabled -}} -apiVersion: policy/v1 +apiVersion: policy/v1beta1 kind: PodSecurityPolicy metadata: name: {{ template "elasticsearch-exporter.fullname" . }} From e4e75d5b92c07db2f2d38d0d3ad25c64969b4fdd Mon Sep 17 00:00:00 2001 From: Shashank Nandennnavar <52485027+shashank-nand@users.noreply.github.com> Date: Fri, 29 Sep 2023 13:33:30 +0530 Subject: [PATCH 39/39] Update poddisruptionbudget.yaml --- .../blackbox-exporter/templates/poddisruptionbudget.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm_charts/monitoring/blackbox-exporter/templates/poddisruptionbudget.yaml b/kubernetes/helm_charts/monitoring/blackbox-exporter/templates/poddisruptionbudget.yaml index 1d9644fd6b..8d54718ed0 100755 --- a/kubernetes/helm_charts/monitoring/blackbox-exporter/templates/poddisruptionbudget.yaml +++ b/kubernetes/helm_charts/monitoring/blackbox-exporter/templates/poddisruptionbudget.yaml @@ -1,4 +1,4 @@ -apiVersion: policy/v1 +apiVersion: policy/v1beta1 kind: PodDisruptionBudget metadata: name: {{ template "prometheus-blackbox-exporter.fullname" . }}