Skip to content

Commit

Permalink
Cherry-pick #15854 to 7.x: Kubernetes: update replicaset type to apps…
Browse files Browse the repository at this point in the history
…/v1 (#15869)

* Kubernetes: update replicaset type to apps/v1 (#15854)

* update replicaset type to apps/v1

(cherry picked from commit 89822fe)

* remove changelog not backported
  • Loading branch information
Pablo Mercado authored Jan 28, 2020
1 parent d5b8208 commit f1e6956
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
3 changes: 1 addition & 2 deletions libbeat/common/kubernetes/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit f1e6956

Please sign in to comment.