From 00302453a8e60d9ba91e627696eea6f738b62355 Mon Sep 17 00:00:00 2001 From: Andrew Zhang Date: Mon, 7 Nov 2022 06:22:10 -0800 Subject: [PATCH 1/2] Update protobuf (#13262) (cherry picked from commit 0b24e447aa2bc962ce9e12e5b992177ce59448bf) --- .../datadog_checks/base/data/agent_requirements.in | 2 +- datadog_checks_base/pyproject.toml | 2 +- gitlab/pyproject.toml | 2 +- gitlab_runner/pyproject.toml | 2 +- kube_dns/pyproject.toml | 2 +- kubernetes_state/pyproject.toml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in index 56f6888922dfe..8886060d9c8fc 100644 --- a/datadog_checks_base/datadog_checks/base/data/agent_requirements.in +++ b/datadog_checks_base/datadog_checks/base/data/agent_requirements.in @@ -58,7 +58,7 @@ ply==3.11 prometheus-client==0.12.0; python_version < '3.0' prometheus-client==0.15.0; python_version > '3.0' protobuf==3.17.3; python_version < '3.0' -protobuf==3.20.1; python_version > '3.0' +protobuf==3.20.2; python_version > '3.0' psutil==5.9.0 psycopg2-binary==2.8.6 pyasn1==0.4.6 diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index ad40348c00f34..ba3d7b685423a 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -55,7 +55,7 @@ deps = [ "prometheus-client==0.12.0; python_version < '3.0'", "prometheus-client==0.15.0; python_version > '3.0'", "protobuf==3.17.3; python_version < '3.0'", - "protobuf==3.20.1; python_version > '3.0'", + "protobuf==3.20.2; python_version > '3.0'", "pydantic==1.10.2; python_version > '3.0'", "python-dateutil==2.8.2", "pywin32==228; sys_platform == 'win32' and python_version < '3.0'", diff --git a/gitlab/pyproject.toml b/gitlab/pyproject.toml index f3105ec0b43fa..f8729fdbbcb9b 100644 --- a/gitlab/pyproject.toml +++ b/gitlab/pyproject.toml @@ -41,7 +41,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ "protobuf==3.17.3; python_version < '3.0'", - "protobuf==3.20.1; python_version > '3.0'", + "protobuf==3.20.2; python_version > '3.0'", ] [project.urls] diff --git a/gitlab_runner/pyproject.toml b/gitlab_runner/pyproject.toml index c790535fc3d74..00dc376542a4e 100644 --- a/gitlab_runner/pyproject.toml +++ b/gitlab_runner/pyproject.toml @@ -41,7 +41,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ "protobuf==3.17.3; python_version < '3.0'", - "protobuf==3.20.1; python_version > '3.0'", + "protobuf==3.20.2; python_version > '3.0'", ] [project.urls] diff --git a/kube_dns/pyproject.toml b/kube_dns/pyproject.toml index 04ee7e7b5d065..8f5bd4a485350 100644 --- a/kube_dns/pyproject.toml +++ b/kube_dns/pyproject.toml @@ -41,7 +41,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ "protobuf==3.17.3; python_version < '3.0'", - "protobuf==3.20.1; python_version > '3.0'", + "protobuf==3.20.2; python_version > '3.0'", ] [project.urls] diff --git a/kubernetes_state/pyproject.toml b/kubernetes_state/pyproject.toml index 010dc7f8cb723..1222a57974a71 100644 --- a/kubernetes_state/pyproject.toml +++ b/kubernetes_state/pyproject.toml @@ -41,7 +41,7 @@ text = "BSD-3-Clause" [project.optional-dependencies] deps = [ "protobuf==3.17.3; python_version < '3.0'", - "protobuf==3.20.1; python_version > '3.0'", + "protobuf==3.20.2; python_version > '3.0'", ] [project.urls] From 7161f6a0b755e2a356f264e204fb990585a2225a Mon Sep 17 00:00:00 2001 From: Florent Clarret Date: Mon, 7 Nov 2022 16:48:27 +0100 Subject: [PATCH 2/2] [Release] Bumped gitlab, gitlab_runner, kube_dns and kubernetes_state versions (#13270) --- gitlab/CHANGELOG.md | 4 ++++ gitlab/datadog_checks/gitlab/__about__.py | 2 +- gitlab_runner/CHANGELOG.md | 4 ++++ gitlab_runner/datadog_checks/gitlab_runner/__about__.py | 2 +- kube_dns/CHANGELOG.md | 4 ++++ kube_dns/datadog_checks/kube_dns/__about__.py | 2 +- kubernetes_state/CHANGELOG.md | 4 ++++ requirements-agent-release.txt | 6 +++--- 8 files changed, 22 insertions(+), 6 deletions(-) diff --git a/gitlab/CHANGELOG.md b/gitlab/CHANGELOG.md index f625bc1ef8e2b..3549054e230d7 100644 --- a/gitlab/CHANGELOG.md +++ b/gitlab/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG - gitlab +## 5.3.1 / 2022-11-07 + +* [Fixed] Bump protobuf version to 3.20.1. See [#13269](https://github.com/DataDog/integrations-core/pull/13269). + ## 5.3.0 / 2022-09-16 * [Added] Update HTTP config spec templates. See [#12890](https://github.com/DataDog/integrations-core/pull/12890). diff --git a/gitlab/datadog_checks/gitlab/__about__.py b/gitlab/datadog_checks/gitlab/__about__.py index 371c4ba05e15e..d31e3fba94453 100644 --- a/gitlab/datadog_checks/gitlab/__about__.py +++ b/gitlab/datadog_checks/gitlab/__about__.py @@ -2,4 +2,4 @@ # All rights reserved # Licensed under a 3-clause BSD style license (see LICENSE) -__version__ = '5.3.0' +__version__ = '5.3.1' diff --git a/gitlab_runner/CHANGELOG.md b/gitlab_runner/CHANGELOG.md index b7489e0373831..a85ca9de12cae 100644 --- a/gitlab_runner/CHANGELOG.md +++ b/gitlab_runner/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG - gitlab_runner +## 3.3.1 / 2022-11-07 + +* [Fixed] Bump protobuf version to 3.20.1. See [#13269](https://github.com/DataDog/integrations-core/pull/13269). + ## 3.3.0 / 2022-09-16 * [Added] Update HTTP config spec templates. See [#12890](https://github.com/DataDog/integrations-core/pull/12890). diff --git a/gitlab_runner/datadog_checks/gitlab_runner/__about__.py b/gitlab_runner/datadog_checks/gitlab_runner/__about__.py index ccf4c4835eb69..a3b938c41252f 100644 --- a/gitlab_runner/datadog_checks/gitlab_runner/__about__.py +++ b/gitlab_runner/datadog_checks/gitlab_runner/__about__.py @@ -2,4 +2,4 @@ # All rights reserved # Licensed under a 3-clause BSD style license (see LICENSE) -__version__ = '3.3.0' +__version__ = '3.3.1' diff --git a/kube_dns/CHANGELOG.md b/kube_dns/CHANGELOG.md index 67a3a0a61016e..3f5aef77443de 100644 --- a/kube_dns/CHANGELOG.md +++ b/kube_dns/CHANGELOG.md @@ -1,5 +1,9 @@ # CHANGELOG - Kube-dns +## 3.3.1 / 2022-11-07 + +* [Fixed] Bump protobuf version to 3.20.1. See [#13269](https://github.com/DataDog/integrations-core/pull/13269). + ## 3.3.0 / 2022-09-16 * [Added] Update HTTP config spec templates. See [#12890](https://github.com/DataDog/integrations-core/pull/12890). diff --git a/kube_dns/datadog_checks/kube_dns/__about__.py b/kube_dns/datadog_checks/kube_dns/__about__.py index ccf4c4835eb69..a3b938c41252f 100644 --- a/kube_dns/datadog_checks/kube_dns/__about__.py +++ b/kube_dns/datadog_checks/kube_dns/__about__.py @@ -2,4 +2,4 @@ # All rights reserved # Licensed under a 3-clause BSD style license (see LICENSE) -__version__ = '3.3.0' +__version__ = '3.3.1' diff --git a/kubernetes_state/CHANGELOG.md b/kubernetes_state/CHANGELOG.md index 829d99b7c3c14..b9349c67b99d7 100644 --- a/kubernetes_state/CHANGELOG.md +++ b/kubernetes_state/CHANGELOG.md @@ -4,6 +4,10 @@ * [Added] Add documentation for `kubernetes_state_core` core check. See [#12552](https://github.com/DataDog/integrations-core/pull/12552). +## 7.3.1 / 2022-11-07 + +* [Fixed] Bump protobuf version to 3.20.1. See [#13269](https://github.com/DataDog/integrations-core/pull/13269). + ## 7.3.0 / 2022-09-16 * [Added] Update HTTP config spec templates. See [#12890](https://github.com/DataDog/integrations-core/pull/12890). diff --git a/requirements-agent-release.txt b/requirements-agent-release.txt index d3edb90ae8395..2921b4f894f16 100644 --- a/requirements-agent-release.txt +++ b/requirements-agent-release.txt @@ -50,8 +50,8 @@ datadog-flink==1.4.0 datadog-fluentd==2.2.0 datadog-foundationdb==1.2.0 datadog-gearmand==2.3.0; sys_platform != 'win32' -datadog-gitlab-runner==3.3.0 -datadog-gitlab==5.3.0 +datadog-gitlab-runner==3.3.1 +datadog-gitlab==5.3.1 datadog-glusterfs==1.5.0; sys_platform == 'linux2' datadog-go-expvar==2.2.0 datadog-gunicorn==2.3.1; sys_platform != 'win32' @@ -81,7 +81,7 @@ datadog-kafka==2.13.0 datadog-kong==2.2.0 datadog-kube-apiserver-metrics==3.3.0 datadog-kube-controller-manager==4.3.0 -datadog-kube-dns==3.3.0 +datadog-kube-dns==3.3.1 datadog-kube-metrics-server==2.3.0 datadog-kube-proxy==5.3.0 datadog-kube-scheduler==4.5.0