Skip to content

Commit 65945d2

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1578 from stevehipwell/release-chart-v3.12.2
Release chart v3.12.2
2 parents 1327cc0 + 5b259c5 commit 65945d2

14 files changed

+59
-13
lines changed

‎.github/workflows/gh-workflow-approve.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ on:
88
branches:
99
- master
1010

11+
permissions:
12+
contents: read
13+
1114
jobs:
1215
approve:
1316
name: Approve ok-to-test

‎.github/workflows/lint-test-chart.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ on:
66
- .github/workflows/lint-test-chart.yaml
77
- "charts/metrics-server/**"
88

9+
permissions:
10+
contents: read
11+
912
jobs:
1013
lint-test:
1114
name: Lint & Test

‎.github/workflows/release-chart.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
paths:
88
- charts/metrics-server/Chart.yaml
99

10+
permissions:
11+
contents: read
12+
1013
jobs:
1114
release:
1215
name: Release
@@ -15,6 +18,8 @@ jobs:
1518
defaults:
1619
run:
1720
shell: bash
21+
permissions:
22+
contents: write
1823
steps:
1924
- name: Checkout
2025
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1

‎.github/workflows/release.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,18 @@ on:
55
types:
66
- published
77

8+
permissions:
9+
contents: read
10+
811
jobs:
912
build:
1013
name: build
1114
runs-on: ubuntu-latest
1215
defaults:
1316
run:
1417
shell: bash
18+
permissions:
19+
contents: write
1520
steps:
1621
- name: Checkout
1722
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1

‎charts/metrics-server/CHANGELOG.md

+20-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,25 @@
1414

1515
## [UNRELEASED]
1616

17-
## [3.12.1] - TBC
17+
## [3.12.2] - TBC
18+
19+
### Added
20+
21+
- Explicitly added the app protocol to the service. ([#1540](https://github.com/kubernetes-sigs/metrics-server/pull/1540)) _@seankhliao_
22+
23+
### Changed
24+
25+
- Updated the _Metrics Server_ OCI image to [v0.7.2](https://github.com/kubernetes-sigs/metrics-server/releases/tag/v0.7.2). ([#1568](https://github.com/kubernetes-sigs/metrics-server/pull/1568)) _@stevehipwell_
26+
- Updated the _addonResizer_ OCI image to [1.8.21](https://github.com/kubernetes/autoscaler/releases/tag/addon-resizer-1.8.21). ([#1504](https://github.com/kubernetes-sigs/metrics-server/pull/1504)) _@jimmy-ungerman_
27+
- Changed `Deployment` templating to ignore `schedulerName` when value is empty. ([#1475](https://github.com/kubernetes-sigs/metrics-server/pull/1475)) _@senges_
28+
29+
### Fixed
30+
31+
- Fixed PSPs to only be templated for supported K8s versions. ([#1471](https://github.com/kubernetes-sigs/metrics-server/pull/1471)) _@treksler_
32+
- Fixed nanny's RoleBinding which contained a hard-coded namespace instead of the Helm's release namespace. ([#1479](https://github.com/kubernetes-sigs/metrics-server/pull/1479)) _@the-technat_
33+
- Fixed the `ServiceMonitor` job label. ([#1568](https://github.com/kubernetes-sigs/metrics-server/pull/1568)) _@stevehipwell_
34+
35+
## [3.12.1] - 2024-04-05
1836

1937
### Changed
2038

@@ -134,6 +152,7 @@
134152
RELEASE LINKS
135153
-->
136154
[UNRELEASED]: https://github.com/kubernetes-sigs/metrics-server/tree/master/charts/metrics-server
155+
[3.12.2]: https://github.com/kubernetes-sigs/metrics-server/releases/tag/metrics-server-helm-chart-3.12.2
137156
[3.12.1]: https://github.com/kubernetes-sigs/metrics-server/releases/tag/metrics-server-helm-chart-3.12.1
138157
[3.12.0]: https://github.com/kubernetes-sigs/metrics-server/releases/tag/metrics-server-helm-chart-3.12.0
139158
[3.11.0]: https://github.com/kubernetes-sigs/metrics-server/releases/tag/metrics-server-helm-chart-3.11.0

‎charts/metrics-server/Chart.yaml

+9-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: metrics-server
33
description: Metrics Server is a scalable, efficient source of container resource metrics for Kubernetes built-in autoscaling pipelines.
44
type: application
5-
version: 3.12.1
6-
appVersion: 0.7.1
5+
version: 3.12.2
6+
appVersion: 0.7.2
77
keywords:
88
- kubernetes
99
- metrics-server
@@ -21,5 +21,11 @@ maintainers:
2121
url: https://github.com/endrec
2222
annotations:
2323
artifacthub.io/changes: |
24+
- kind: added
25+
description: "Explicitly added the app protocol to the service."
2426
- kind: changed
25-
description: "Updated the _Metrics Server_ OCI image to [v0.7.1](https://github.com/kubernetes-sigs/metrics-server/releases/tag/v0.7.1)."
27+
description: "Updated the _Metrics Server_ OCI image to [v0.7.2](https://github.com/kubernetes-sigs/metrics-server/releases/tag/v0.7.2)."
28+
- kind: changed
29+
description: "Updated the _addonResizer_ OCI image to [1.8.21](https://github.com/kubernetes/autoscaler/releases/tag/addon-resizer-1.8.21)"
30+
- kind: fixed
31+
description: "Fixed nanny's RoleBinding which contained a hard-coded namespace instead of the Helm's release namespace."

‎charts/metrics-server/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The following table lists the configurable parameters of the _Metrics Server_ ch
3333
| `serviceAccount.name` | Service account to be used. If not set and `serviceAccount.create` is `true`, a name is generated using the full name template. | `nil` |
3434
| `serviceAccount.secrets` | The list of secrets mountable by this service account. See <https://kubernetes.io/docs/reference/labels-annotations-taints/#enforce-mountable-secrets> | `[]` |
3535
| `rbac.create` | If `true`, create the RBAC resources. | `true` |
36-
| `rbac.pspEnabled` | If `true`, create a pod security policy resource. | `false` |
36+
| `rbac.pspEnabled` | If `true`, create a pod security policy resource, unless Kubernetes version is 1.25 or later. | `false` |
3737
| `apiService.create` | If `true`, create the `v1beta1.metrics.k8s.io` API service. You typically want this enabled! If you disable API service creation you have to manage it outside of this chart for e.g horizontal pod autoscaling to work with this release. | `true` |
3838
| `apiService.annotations` | Annotations to add to the API service | `{}` |
3939
| `apiService.insecureSkipTLSVerify` | Specifies whether to skip TLS verification (NOTE: this setting is not a proxy for the `--kubelet-insecure-tls` metrics-server flag) | `true` |
@@ -63,7 +63,7 @@ The following table lists the configurable parameters of the _Metrics Server_ ch
6363
| `addonResizer.enabled` | If `true`, run the addon-resizer as a sidecar to automatically scale resource requests with cluster size. | `false` |
6464
| `addonResizer.securityContext` | Security context for the _metrics_server_container. | _See values.yaml |
6565
| `addonResizer.image.repository` | addon-resizer image repository | `registry.k8s.io/autoscaling/addon-resizer` |
66-
| `addonResizer.image.tag` | addon-resizer image tag | `1.8.19` |
66+
| `addonResizer.image.tag` | addon-resizer image tag | `1.8.21` |
6767
| `addonResizer.resources` | Resource requests and limits for the _nanny_ container. | `{ requests: { cpu: 40m, memory: 25Mi }, limits: { cpu: 40m, memory: 25Mi } }` |
6868
| `addonResizer.nanny.cpu` | The base CPU requirement. | `0m` |
6969
| `addonResizer.nanny.extraCPU` | The amount of CPU to add per node. | `1m` |

‎charts/metrics-server/templates/deployment.yaml

+5-3
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ metadata:
1111
{{- end }}
1212
spec:
1313
replicas: {{ .Values.replicas }}
14-
{{- if or (kindIs "float64" .Values.revisionHistoryLimit) (kindIs "int64" .Values.revisionHistoryLimit) }}
15-
revisionHistoryLimit: {{ .Values.revisionHistoryLimit | int64 }}
14+
{{- if not (has (quote .Values.revisionHistoryLimit) (list "" (quote ""))) }}
15+
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
1616
{{- end }}
1717
{{- with .Values.updateStrategy }}
1818
strategy:
@@ -33,7 +33,9 @@ spec:
3333
{{- toYaml . | nindent 8 }}
3434
{{- end }}
3535
spec:
36-
schedulerName: {{ .Values.schedulerName }}
36+
{{- with .Values.schedulerName }}
37+
schedulerName: {{ . }}
38+
{{- end }}
3739
{{- with .Values.imagePullSecrets }}
3840
imagePullSecrets:
3941
{{- toYaml . | nindent 8 }}

‎charts/metrics-server/templates/psp.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.rbac.pspEnabled }}
1+
{{- if and (.Values.rbac.pspEnabled) (semverCompare "<1.25-0" .Capabilities.KubeVersion.GitVersion) }}
22
apiVersion: policy/v1beta1
33
kind: PodSecurityPolicy
44
metadata:

‎charts/metrics-server/templates/rolebinding-nanny.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: RoleBinding
55
metadata:
66
name: {{ printf "%s-nanny" (include "metrics-server.fullname" .) }}
7-
namespace: kube-system
7+
namespace: {{ .Release.Namespace }}
88
labels:
99
{{- include "metrics-server.labels" . | nindent 4 }}
1010
roleRef:

‎charts/metrics-server/templates/service.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@ spec:
1919
port: {{ .Values.service.port }}
2020
protocol: TCP
2121
targetPort: https
22+
appProtocol: https
2223
selector:
2324
{{- include "metrics-server.selectorLabels" . | nindent 4 }}

‎charts/metrics-server/templates/servicemonitor.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
{{- toYaml . | nindent 4 }}
1111
{{- end }}
1212
spec:
13-
jobLabel: {{ .Release.Name }}
13+
jobLabel: app.kubernetes.io/instance
1414
namespaceSelector:
1515
matchNames:
1616
- {{ .Release.Namespace }}

‎charts/metrics-server/values.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ serviceAccount:
2929
rbac:
3030
# Specifies whether RBAC resources should be created
3131
create: true
32+
# Note: PodSecurityPolicy will not be created when Kubernetes version is 1.25 or later.
3233
pspEnabled: false
3334

3435
apiService:
@@ -129,7 +130,7 @@ addonResizer:
129130
enabled: false
130131
image:
131132
repository: registry.k8s.io/autoscaling/addon-resizer
132-
tag: 1.8.20
133+
tag: 1.8.21
133134
securityContext:
134135
allowPrivilegeEscalation: false
135136
readOnlyRootFilesystem: true

‎manifests/base/service.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ spec:
1010
port: 443
1111
protocol: TCP
1212
targetPort: https
13+
appProtocol: https

0 commit comments

Comments
 (0)