Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick #15854 to 7.6: Kubernetes: update replicaset type to apps/v1 #16018

Merged
merged 1 commit into from
Feb 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,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 issue where TLS settings would be ignored when a forward proxy was in use. {pull}15516{15516}
- Do not load dashboards where not available. {pull}15802[15802]
- Update replicaset group to apps/v1 {pull}15854[15802]

*Auditbeat*

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