From 384f7427f30f9972c112155c30f9e31a2ea1236b Mon Sep 17 00:00:00 2001 From: odacremolbap Date: Mon, 27 Jan 2020 11:32:50 +0100 Subject: [PATCH 1/2] update replicaset type to apps/v1 --- libbeat/common/kubernetes/types.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libbeat/common/kubernetes/types.go b/libbeat/common/kubernetes/types.go index cd600e9f60c..5648829efe6 100644 --- a/libbeat/common/kubernetes/types.go +++ b/libbeat/common/kubernetes/types.go @@ -23,7 +23,6 @@ import ( appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" - extv1 "k8s.io/api/extensions/v1beta1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" ) @@ -65,7 +64,7 @@ type PodContainerStatus = v1.ContainerStatus type Deployment = appsv1.Deployment // ReplicaSet data -type ReplicaSet = extv1.ReplicaSet +type ReplicaSet = appsv1.ReplicaSet // StatefulSet data type StatefulSet = appsv1.StatefulSet From 5f40b1e54466e8f0029b032a753a211b605b0721 Mon Sep 17 00:00:00 2001 From: odacremolbap Date: Mon, 27 Jan 2020 11:39:08 +0100 Subject: [PATCH 2/2] changelog entry --- CHANGELOG.next.asciidoc | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 39a0e511984..f4b10a191fa 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -44,6 +44,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix missing output in dockerlogbeat {pull}15719[15719] - Fix logging target settings being ignored when Beats are started via systemd or docker. {issue}12024[12024] {pull}15422[15442] - Do not load dashboards where not available. {pull}15802[15802] +- Update replicaset group to apps/v1 {pull}15854[15802] *Auditbeat*