From 7f0fea6c18f0b0bb86ba283ce3948618949d9618 Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Mon, 20 Nov 2023 13:07:16 +0100 Subject: [PATCH 1/5] chore: upgrade `metrics-server` subchart from `v6.6.0` to `v6.6.2` --- .changelog/3405.changed.txt | 1 + deploy/helm/sumologic/Chart.yaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 .changelog/3405.changed.txt diff --git a/.changelog/3405.changed.txt b/.changelog/3405.changed.txt new file mode 100644 index 0000000000..1246223f05 --- /dev/null +++ b/.changelog/3405.changed.txt @@ -0,0 +1 @@ +chore: upgrade `metrics-server` subchart from `v6.6.0` to `v6.6.2` \ No newline at end of file diff --git a/deploy/helm/sumologic/Chart.yaml b/deploy/helm/sumologic/Chart.yaml index 3d6120fe19..30d91cc29a 100644 --- a/deploy/helm/sumologic/Chart.yaml +++ b/deploy/helm/sumologic/Chart.yaml @@ -21,7 +21,7 @@ dependencies: repository: https://falcosecurity.github.io/charts condition: falco.enabled - name: metrics-server - version: 6.6.0 + version: 6.6.2 repository: https://charts.bitnami.com/bitnami condition: metrics-server.enabled - name: telegraf-operator From 8f72d56750e2cae54f9d7efd99fad5cf74d01cc6 Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Mon, 20 Nov 2023 13:24:19 +0100 Subject: [PATCH 2/5] test: fix Helm template tests --- .../testdata/goldenfile/metric-server/basic.output.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/helm/testdata/goldenfile/metric-server/basic.output.yaml b/tests/helm/testdata/goldenfile/metric-server/basic.output.yaml index cc2644905b..db6b414ba3 100644 --- a/tests/helm/testdata/goldenfile/metric-server/basic.output.yaml +++ b/tests/helm/testdata/goldenfile/metric-server/basic.output.yaml @@ -10,7 +10,7 @@ metadata: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: metrics-server app.kubernetes.io/version: 0.6.4 - helm.sh/chart: metrics-server-6.6.0 + helm.sh/chart: metrics-server-6.6.2 spec: replicas: 1 selector: @@ -26,7 +26,7 @@ spec: app.kubernetes.io/managed-by: Helm app.kubernetes.io/name: metrics-server app.kubernetes.io/version: 0.6.4 - helm.sh/chart: metrics-server-6.6.0 + helm.sh/chart: metrics-server-6.6.2 spec: serviceAccountName: RELEASE-NAME-metrics-server affinity: @@ -46,7 +46,7 @@ spec: dnsPolicy: ClusterFirst containers: - name: metrics-server - image: docker.io/bitnami/metrics-server:0.6.4-debian-11-r70 + image: docker.io/bitnami/metrics-server:0.6.4-debian-11-r72 imagePullPolicy: "IfNotPresent" securityContext: allowPrivilegeEscalation: false From 5587954364c5264919b3291fa696d4e6df6799cb Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Mon, 20 Nov 2023 13:24:53 +0100 Subject: [PATCH 3/5] test: fix test name for easier discoverability --- .../goldenfile/{metric-server => metrics-server}/basic.input.yaml | 0 .../{metric-server => metrics-server}/basic.output.yaml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename tests/helm/testdata/goldenfile/{metric-server => metrics-server}/basic.input.yaml (100%) rename tests/helm/testdata/goldenfile/{metric-server => metrics-server}/basic.output.yaml (100%) diff --git a/tests/helm/testdata/goldenfile/metric-server/basic.input.yaml b/tests/helm/testdata/goldenfile/metrics-server/basic.input.yaml similarity index 100% rename from tests/helm/testdata/goldenfile/metric-server/basic.input.yaml rename to tests/helm/testdata/goldenfile/metrics-server/basic.input.yaml diff --git a/tests/helm/testdata/goldenfile/metric-server/basic.output.yaml b/tests/helm/testdata/goldenfile/metrics-server/basic.output.yaml similarity index 100% rename from tests/helm/testdata/goldenfile/metric-server/basic.output.yaml rename to tests/helm/testdata/goldenfile/metrics-server/basic.output.yaml From c5729c6dddc09f4a9c24d5bbe50ea9b94e9610e8 Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Mon, 20 Nov 2023 13:27:55 +0100 Subject: [PATCH 4/5] docs: fix changelog entry --- .changelog/3392.changed.txt | 2 +- .changelog/3405.changed.txt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 .changelog/3405.changed.txt diff --git a/.changelog/3392.changed.txt b/.changelog/3392.changed.txt index a60c96f08d..46f22f0906 100644 --- a/.changelog/3392.changed.txt +++ b/.changelog/3392.changed.txt @@ -1 +1 @@ -deps: update metrics-server to 0.6.0 \ No newline at end of file +deps: update metrics-server to `v6.6.2` diff --git a/.changelog/3405.changed.txt b/.changelog/3405.changed.txt deleted file mode 100644 index 1246223f05..0000000000 --- a/.changelog/3405.changed.txt +++ /dev/null @@ -1 +0,0 @@ -chore: upgrade `metrics-server` subchart from `v6.6.0` to `v6.6.2` \ No newline at end of file From 96f7ead9d2d32c75907b08ac55fa19756b152844 Mon Sep 17 00:00:00 2001 From: Andrzej Stencel Date: Mon, 20 Nov 2023 14:02:07 +0100 Subject: [PATCH 5/5] add changelog entry for this PR --- .changelog/3405.changed.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 .changelog/3405.changed.txt diff --git a/.changelog/3405.changed.txt b/.changelog/3405.changed.txt new file mode 100644 index 0000000000..46f22f0906 --- /dev/null +++ b/.changelog/3405.changed.txt @@ -0,0 +1 @@ +deps: update metrics-server to `v6.6.2`