Skip to content

Commit

Permalink
Fix remove-addon-resizer patch for metrics-server (#3952)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jhaanvi5
jhaanvi5 authored Oct 18, 2024
1 parent b846fb1 commit 12d0064
Show file tree
Hide file tree
Showing 10 changed files with 170 additions and 35 deletions.
4 changes: 2 additions & 2 deletions ...sigs/metrics-server/1-27/helm/patches/0001-Conform-helm-chart-to-packages-standards.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6a11127259db3b523e3d4330a6f1e931cc622018 Mon Sep 17 00:00:00 2001
From 7eac08471142e4cf65c716b5032900744810cc54 Mon Sep 17 00:00:00 2001
From: Jonathan Meier <[email protected]>
Date: Fri, 23 Sep 2022 12:17:23 -0400
Subject: [PATCH 1/2] Conform helm chart to packages standards
Expand Down Expand Up @@ -101,5 +101,5 @@ index be843db4..340c3640 100644
nameOverride: ""
fullnameOverride: ""
--
2.46.2
2.44.0

37 changes: 32 additions & 5 deletions projects/kubernetes-sigs/metrics-server/1-27/helm/patches/0002-Remove-Addon-Resizer.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From c7343600fda37356310744408172059751f3b50c Mon Sep 17 00:00:00 2001
From: Prow Bot <prow@amazonaws.com>
Date: Sun, 2 Jun 2024 17:37:38 -0700
From 2bc53abc0591dc8b1da6c17163f28a864d4b8049 Mon Sep 17 00:00:00 2001
From: Jhaanvi Golani <jhaanvi@amazon.com>
Date: Fri, 18 Oct 2024 12:09:20 -0700
Subject: [PATCH 2/2] Remove Addon Resizer

---
Expand All @@ -10,12 +10,14 @@ Subject: [PATCH 2/2] Remove Addon Resizer
.../templates/configmaps-nanny.yaml | 17 --------
.../metrics-server/templates/deployment.yaml | 39 -------------------
.../metrics-server/templates/role-nanny.yaml | 27 -------------
.../templates/rolebinding-nanny.yaml | 19 ---------
charts/metrics-server/values.yaml | 34 ----------------
7 files changed, 169 deletions(-)
8 files changed, 188 deletions(-)
delete mode 100644 charts/metrics-server/templates/clusterrole-nanny.yaml
delete mode 100644 charts/metrics-server/templates/clusterrolebinding-nanny.yaml
delete mode 100644 charts/metrics-server/templates/configmaps-nanny.yaml
delete mode 100644 charts/metrics-server/templates/role-nanny.yaml
delete mode 100644 charts/metrics-server/templates/rolebinding-nanny.yaml

diff --git a/charts/metrics-server/templates/_helpers.tpl b/charts/metrics-server/templates/_helpers.tpl
index 492e4623..e9b47284 100644
Expand Down Expand Up @@ -201,6 +203,31 @@ index f0bf8fce..00000000
- - patch
-{{- end -}}
-{{- end -}}
diff --git a/charts/metrics-server/templates/rolebinding-nanny.yaml b/charts/metrics-server/templates/rolebinding-nanny.yaml
deleted file mode 100644
index 228c0cfe..00000000
--- a/charts/metrics-server/templates/rolebinding-nanny.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-{{- if .Values.rbac.create -}}
-{{- if .Values.addonResizer.enabled -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
- name: {{ printf "%s-nanny" (include "metrics-server.fullname" .) }}
- namespace: {{ .Release.Namespace }}
- labels:
- {{- include "metrics-server.labels" . | nindent 4 }}
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: Role
- name: {{ include "metrics-server.addonResizer.role" . }}
-subjects:
- - kind: ServiceAccount
- name: {{ include "metrics-server.serviceAccountName" . }}
- namespace: {{ .Release.Namespace }}
-{{- end -}}
-{{- end -}}
diff --git a/charts/metrics-server/values.yaml b/charts/metrics-server/values.yaml
index 340c3640..0008cee1 100644
--- a/charts/metrics-server/values.yaml
Expand Down Expand Up @@ -254,5 +281,5 @@ index 340c3640..0008cee1 100644
extraVolumeMounts: []

--
2.46.2
2.44.0

4 changes: 2 additions & 2 deletions ...sigs/metrics-server/1-28/helm/patches/0001-Conform-helm-chart-to-packages-standards.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6a11127259db3b523e3d4330a6f1e931cc622018 Mon Sep 17 00:00:00 2001
From 7eac08471142e4cf65c716b5032900744810cc54 Mon Sep 17 00:00:00 2001
From: Jonathan Meier <[email protected]>
Date: Fri, 23 Sep 2022 12:17:23 -0400
Subject: [PATCH 1/2] Conform helm chart to packages standards
Expand Down Expand Up @@ -101,5 +101,5 @@ index be843db4..340c3640 100644
nameOverride: ""
fullnameOverride: ""
--
2.46.2
2.44.0

37 changes: 32 additions & 5 deletions projects/kubernetes-sigs/metrics-server/1-28/helm/patches/0002-Remove-Addon-Resizer.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From c7343600fda37356310744408172059751f3b50c Mon Sep 17 00:00:00 2001
From: Prow Bot <prow@amazonaws.com>
Date: Sun, 2 Jun 2024 17:37:38 -0700
From dde9ebc3a806df48d587e9e38eaa4cc78ab3474c Mon Sep 17 00:00:00 2001
From: Jhaanvi Golani <jhaanvi@amazon.com>
Date: Fri, 18 Oct 2024 12:11:17 -0700
Subject: [PATCH 2/2] Remove Addon Resizer

---
Expand All @@ -10,12 +10,14 @@ Subject: [PATCH 2/2] Remove Addon Resizer
.../templates/configmaps-nanny.yaml | 17 --------
.../metrics-server/templates/deployment.yaml | 39 -------------------
.../metrics-server/templates/role-nanny.yaml | 27 -------------
.../templates/rolebinding-nanny.yaml | 19 ---------
charts/metrics-server/values.yaml | 34 ----------------
7 files changed, 169 deletions(-)
8 files changed, 188 deletions(-)
delete mode 100644 charts/metrics-server/templates/clusterrole-nanny.yaml
delete mode 100644 charts/metrics-server/templates/clusterrolebinding-nanny.yaml
delete mode 100644 charts/metrics-server/templates/configmaps-nanny.yaml
delete mode 100644 charts/metrics-server/templates/role-nanny.yaml
delete mode 100644 charts/metrics-server/templates/rolebinding-nanny.yaml

diff --git a/charts/metrics-server/templates/_helpers.tpl b/charts/metrics-server/templates/_helpers.tpl
index 492e4623..e9b47284 100644
Expand Down Expand Up @@ -201,6 +203,31 @@ index f0bf8fce..00000000
- - patch
-{{- end -}}
-{{- end -}}
diff --git a/charts/metrics-server/templates/rolebinding-nanny.yaml b/charts/metrics-server/templates/rolebinding-nanny.yaml
deleted file mode 100644
index 228c0cfe..00000000
--- a/charts/metrics-server/templates/rolebinding-nanny.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-{{- if .Values.rbac.create -}}
-{{- if .Values.addonResizer.enabled -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
- name: {{ printf "%s-nanny" (include "metrics-server.fullname" .) }}
- namespace: {{ .Release.Namespace }}
- labels:
- {{- include "metrics-server.labels" . | nindent 4 }}
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: Role
- name: {{ include "metrics-server.addonResizer.role" . }}
-subjects:
- - kind: ServiceAccount
- name: {{ include "metrics-server.serviceAccountName" . }}
- namespace: {{ .Release.Namespace }}
-{{- end -}}
-{{- end -}}
diff --git a/charts/metrics-server/values.yaml b/charts/metrics-server/values.yaml
index 340c3640..0008cee1 100644
--- a/charts/metrics-server/values.yaml
Expand Down Expand Up @@ -254,5 +281,5 @@ index 340c3640..0008cee1 100644
extraVolumeMounts: []

--
2.46.2
2.44.0

4 changes: 2 additions & 2 deletions ...sigs/metrics-server/1-29/helm/patches/0001-Conform-helm-chart-to-packages-standards.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6a11127259db3b523e3d4330a6f1e931cc622018 Mon Sep 17 00:00:00 2001
From 7eac08471142e4cf65c716b5032900744810cc54 Mon Sep 17 00:00:00 2001
From: Jonathan Meier <[email protected]>
Date: Fri, 23 Sep 2022 12:17:23 -0400
Subject: [PATCH 1/2] Conform helm chart to packages standards
Expand Down Expand Up @@ -101,5 +101,5 @@ index be843db4..340c3640 100644
nameOverride: ""
fullnameOverride: ""
--
2.46.2
2.44.0

37 changes: 32 additions & 5 deletions projects/kubernetes-sigs/metrics-server/1-29/helm/patches/0002-Remove-Addon-Resizer.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From c7343600fda37356310744408172059751f3b50c Mon Sep 17 00:00:00 2001
From: Prow Bot <prow@amazonaws.com>
Date: Sun, 2 Jun 2024 17:37:38 -0700
From c5a794e88d0bceac0e16370d4f76baade4e0ccf6 Mon Sep 17 00:00:00 2001
From: Jhaanvi Golani <jhaanvi@amazon.com>
Date: Fri, 18 Oct 2024 12:11:41 -0700
Subject: [PATCH 2/2] Remove Addon Resizer

---
Expand All @@ -10,12 +10,14 @@ Subject: [PATCH 2/2] Remove Addon Resizer
.../templates/configmaps-nanny.yaml | 17 --------
.../metrics-server/templates/deployment.yaml | 39 -------------------
.../metrics-server/templates/role-nanny.yaml | 27 -------------
.../templates/rolebinding-nanny.yaml | 19 ---------
charts/metrics-server/values.yaml | 34 ----------------
7 files changed, 169 deletions(-)
8 files changed, 188 deletions(-)
delete mode 100644 charts/metrics-server/templates/clusterrole-nanny.yaml
delete mode 100644 charts/metrics-server/templates/clusterrolebinding-nanny.yaml
delete mode 100644 charts/metrics-server/templates/configmaps-nanny.yaml
delete mode 100644 charts/metrics-server/templates/role-nanny.yaml
delete mode 100644 charts/metrics-server/templates/rolebinding-nanny.yaml

diff --git a/charts/metrics-server/templates/_helpers.tpl b/charts/metrics-server/templates/_helpers.tpl
index 492e4623..e9b47284 100644
Expand Down Expand Up @@ -201,6 +203,31 @@ index f0bf8fce..00000000
- - patch
-{{- end -}}
-{{- end -}}
diff --git a/charts/metrics-server/templates/rolebinding-nanny.yaml b/charts/metrics-server/templates/rolebinding-nanny.yaml
deleted file mode 100644
index 228c0cfe..00000000
--- a/charts/metrics-server/templates/rolebinding-nanny.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-{{- if .Values.rbac.create -}}
-{{- if .Values.addonResizer.enabled -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
- name: {{ printf "%s-nanny" (include "metrics-server.fullname" .) }}
- namespace: {{ .Release.Namespace }}
- labels:
- {{- include "metrics-server.labels" . | nindent 4 }}
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: Role
- name: {{ include "metrics-server.addonResizer.role" . }}
-subjects:
- - kind: ServiceAccount
- name: {{ include "metrics-server.serviceAccountName" . }}
- namespace: {{ .Release.Namespace }}
-{{- end -}}
-{{- end -}}
diff --git a/charts/metrics-server/values.yaml b/charts/metrics-server/values.yaml
index 340c3640..0008cee1 100644
--- a/charts/metrics-server/values.yaml
Expand Down Expand Up @@ -254,5 +281,5 @@ index 340c3640..0008cee1 100644
extraVolumeMounts: []

--
2.46.2
2.44.0

4 changes: 2 additions & 2 deletions ...sigs/metrics-server/1-30/helm/patches/0001-Conform-helm-chart-to-packages-standards.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6a11127259db3b523e3d4330a6f1e931cc622018 Mon Sep 17 00:00:00 2001
From 7eac08471142e4cf65c716b5032900744810cc54 Mon Sep 17 00:00:00 2001
From: Jonathan Meier <[email protected]>
Date: Fri, 23 Sep 2022 12:17:23 -0400
Subject: [PATCH 1/2] Conform helm chart to packages standards
Expand Down Expand Up @@ -101,5 +101,5 @@ index be843db4..340c3640 100644
nameOverride: ""
fullnameOverride: ""
--
2.46.2
2.44.0

37 changes: 32 additions & 5 deletions projects/kubernetes-sigs/metrics-server/1-30/helm/patches/0002-Remove-Addon-Resizer.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From c7343600fda37356310744408172059751f3b50c Mon Sep 17 00:00:00 2001
From: Prow Bot <prow@amazonaws.com>
Date: Sun, 2 Jun 2024 17:37:38 -0700
From 467db22328a4958b0ea1d6b106ce3bd324033201 Mon Sep 17 00:00:00 2001
From: Jhaanvi Golani <jhaanvi@amazon.com>
Date: Fri, 18 Oct 2024 12:22:26 -0700
Subject: [PATCH 2/2] Remove Addon Resizer

---
Expand All @@ -10,12 +10,14 @@ Subject: [PATCH 2/2] Remove Addon Resizer
.../templates/configmaps-nanny.yaml | 17 --------
.../metrics-server/templates/deployment.yaml | 39 -------------------
.../metrics-server/templates/role-nanny.yaml | 27 -------------
.../templates/rolebinding-nanny.yaml | 19 ---------
charts/metrics-server/values.yaml | 34 ----------------
7 files changed, 169 deletions(-)
8 files changed, 188 deletions(-)
delete mode 100644 charts/metrics-server/templates/clusterrole-nanny.yaml
delete mode 100644 charts/metrics-server/templates/clusterrolebinding-nanny.yaml
delete mode 100644 charts/metrics-server/templates/configmaps-nanny.yaml
delete mode 100644 charts/metrics-server/templates/role-nanny.yaml
delete mode 100644 charts/metrics-server/templates/rolebinding-nanny.yaml

diff --git a/charts/metrics-server/templates/_helpers.tpl b/charts/metrics-server/templates/_helpers.tpl
index 492e4623..e9b47284 100644
Expand Down Expand Up @@ -201,6 +203,31 @@ index f0bf8fce..00000000
- - patch
-{{- end -}}
-{{- end -}}
diff --git a/charts/metrics-server/templates/rolebinding-nanny.yaml b/charts/metrics-server/templates/rolebinding-nanny.yaml
deleted file mode 100644
index 228c0cfe..00000000
--- a/charts/metrics-server/templates/rolebinding-nanny.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-{{- if .Values.rbac.create -}}
-{{- if .Values.addonResizer.enabled -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
- name: {{ printf "%s-nanny" (include "metrics-server.fullname" .) }}
- namespace: {{ .Release.Namespace }}
- labels:
- {{- include "metrics-server.labels" . | nindent 4 }}
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: Role
- name: {{ include "metrics-server.addonResizer.role" . }}
-subjects:
- - kind: ServiceAccount
- name: {{ include "metrics-server.serviceAccountName" . }}
- namespace: {{ .Release.Namespace }}
-{{- end -}}
-{{- end -}}
diff --git a/charts/metrics-server/values.yaml b/charts/metrics-server/values.yaml
index 340c3640..0008cee1 100644
--- a/charts/metrics-server/values.yaml
Expand Down Expand Up @@ -254,5 +281,5 @@ index 340c3640..0008cee1 100644
extraVolumeMounts: []

--
2.46.2
2.44.0

4 changes: 2 additions & 2 deletions ...sigs/metrics-server/1-31/helm/patches/0001-Conform-helm-chart-to-packages-standards.patch
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 6a11127259db3b523e3d4330a6f1e931cc622018 Mon Sep 17 00:00:00 2001
From 7eac08471142e4cf65c716b5032900744810cc54 Mon Sep 17 00:00:00 2001
From: Jonathan Meier <[email protected]>
Date: Fri, 23 Sep 2022 12:17:23 -0400
Subject: [PATCH 1/2] Conform helm chart to packages standards
Expand Down Expand Up @@ -101,5 +101,5 @@ index be843db4..340c3640 100644
nameOverride: ""
fullnameOverride: ""
--
2.46.2
2.44.0

37 changes: 32 additions & 5 deletions projects/kubernetes-sigs/metrics-server/1-31/helm/patches/0002-Remove-Addon-Resizer.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From c7343600fda37356310744408172059751f3b50c Mon Sep 17 00:00:00 2001
From: Prow Bot <prow@amazonaws.com>
Date: Sun, 2 Jun 2024 17:37:38 -0700
From 06918cab2990ad4dc8f7536335163dc4a1d4788b Mon Sep 17 00:00:00 2001
From: Jhaanvi Golani <jhaanvi@amazon.com>
Date: Fri, 18 Oct 2024 12:25:24 -0700
Subject: [PATCH 2/2] Remove Addon Resizer

---
Expand All @@ -10,12 +10,14 @@ Subject: [PATCH 2/2] Remove Addon Resizer
.../templates/configmaps-nanny.yaml | 17 --------
.../metrics-server/templates/deployment.yaml | 39 -------------------
.../metrics-server/templates/role-nanny.yaml | 27 -------------
.../templates/rolebinding-nanny.yaml | 19 ---------
charts/metrics-server/values.yaml | 34 ----------------
7 files changed, 169 deletions(-)
8 files changed, 188 deletions(-)
delete mode 100644 charts/metrics-server/templates/clusterrole-nanny.yaml
delete mode 100644 charts/metrics-server/templates/clusterrolebinding-nanny.yaml
delete mode 100644 charts/metrics-server/templates/configmaps-nanny.yaml
delete mode 100644 charts/metrics-server/templates/role-nanny.yaml
delete mode 100644 charts/metrics-server/templates/rolebinding-nanny.yaml

diff --git a/charts/metrics-server/templates/_helpers.tpl b/charts/metrics-server/templates/_helpers.tpl
index 492e4623..e9b47284 100644
Expand Down Expand Up @@ -201,6 +203,31 @@ index f0bf8fce..00000000
- - patch
-{{- end -}}
-{{- end -}}
diff --git a/charts/metrics-server/templates/rolebinding-nanny.yaml b/charts/metrics-server/templates/rolebinding-nanny.yaml
deleted file mode 100644
index 228c0cfe..00000000
--- a/charts/metrics-server/templates/rolebinding-nanny.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-{{- if .Values.rbac.create -}}
-{{- if .Values.addonResizer.enabled -}}
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
- name: {{ printf "%s-nanny" (include "metrics-server.fullname" .) }}
- namespace: {{ .Release.Namespace }}
- labels:
- {{- include "metrics-server.labels" . | nindent 4 }}
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: Role
- name: {{ include "metrics-server.addonResizer.role" . }}
-subjects:
- - kind: ServiceAccount
- name: {{ include "metrics-server.serviceAccountName" . }}
- namespace: {{ .Release.Namespace }}
-{{- end -}}
-{{- end -}}
diff --git a/charts/metrics-server/values.yaml b/charts/metrics-server/values.yaml
index 340c3640..0008cee1 100644
--- a/charts/metrics-server/values.yaml
Expand Down Expand Up @@ -254,5 +281,5 @@ index 340c3640..0008cee1 100644
extraVolumeMounts: []

--
2.46.2
2.44.0

0 comments on commit 12d0064

Please sign in to comment.