From f1e6956af5ca4f91ee7333819b1d7c41a0a5aac8 Mon Sep 17 00:00:00 2001 From: Pablo Mercado Date: Tue, 28 Jan 2020 10:32:47 +0100 Subject: [PATCH] Cherry-pick #15854 to 7.x: Kubernetes: update replicaset type to apps/v1 (#15869) * Kubernetes: update replicaset type to apps/v1 (#15854) * update replicaset type to apps/v1 (cherry picked from commit 89822fe0a19ee57672bb6b0c366f0075de240db2) * remove changelog not backported --- CHANGELOG.next.asciidoc | 1 + libbeat/common/kubernetes/types.go | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 9f6d137cb18e..d28179fe068e 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -58,6 +58,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d - Fix a race condition with the Kafka pipeline client, it is possible that `Close()` get called before `Connect()` . {issue}11945[11945] - Allow users to configure only `cluster_uuid` setting under `monitoring` namespace. {pull}14338[14338] - Fix spooling to disk blocking infinitely if the lock file can not be acquired. {pull}15338[15338] +- Update replicaset group to apps/v1 {pull}15854[15802] - Fix `metricbeat test output` with an ipv6 ES host in the output.hosts. {pull}15368[15368] - Fix `convert` processor conversion of string to integer with leading zeros. {issue}15513[15513] {pull}15557[15557] - Fix panic in the Logstash output when trying to send events to closed connection. {pull}15568[15568] diff --git a/libbeat/common/kubernetes/types.go b/libbeat/common/kubernetes/types.go index cd600e9f60c5..5648829efe61 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