From bf29afcceef907938fe388e3d52f622c022dc20e Mon Sep 17 00:00:00 2001 From: Anthony DeChiaro Date: Wed, 16 Mar 2022 09:24:05 -0700 Subject: [PATCH] Fix HPA API version derailed#207 --- pkg/popeye.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/popeye.go b/pkg/popeye.go index 86e41331..f279bb24 100644 --- a/pkg/popeye.go +++ b/pkg/popeye.go @@ -128,7 +128,6 @@ func (p *Popeye) scannedGVRs(rev *client.Revision) []string { "apps/v1/statefulsets", "policy/v1beta1/podsecuritypolicies", "networking.k8s.io/v1/networkpolicies", - "autoscaling/v1/horizontalpodautoscalers", "rbac.authorization.k8s.io/v1/clusterroles", "rbac.authorization.k8s.io/v1/clusterrolebindings", "rbac.authorization.k8s.io/v1/roles", @@ -145,6 +144,11 @@ func (p *Popeye) scannedGVRs(rev *client.Revision) []string { } else { mm = append(mm, "policy/v1beta1/poddisruptionbudgets") } + if rev.Minor >= 23 { + mm = append(mm, "autoscaling/v2/horizontalpodautoscalers") + } else { + mm = append(mm, "autoscaling/v1/horizontalpodautoscalers") + } return mm } @@ -215,7 +219,6 @@ func (p *Popeye) sanitizers(rev *client.Revision) map[string]scrubFn { "apps/v1/deployments": scrub.NewDeployment, "apps/v1/replicasets": scrub.NewReplicaSet, "apps/v1/statefulsets": scrub.NewStatefulSet, - "autoscaling/v1/horizontalpodautoscalers": scrub.NewHorizontalPodAutoscaler, "networking.k8s.io/v1/networkpolicies": scrub.NewNetworkPolicy, "policy/v1beta1/podsecuritypolicies": scrub.NewPodSecurityPolicy, "rbac.authorization.k8s.io/v1/clusterroles": scrub.NewClusterRole, @@ -234,6 +237,11 @@ func (p *Popeye) sanitizers(rev *client.Revision) map[string]scrubFn { } else { mm["policy/v1beta1/poddisruptionbudgets"] = scrub.NewPodDisruptionBudget } + if rev.Minor >= 23 { + mm["autoscaling/v2/horizontalpodautoscalers"] = scrub.NewHorizontalPodAutoscaler + } else { + mm["autoscaling/v1/horizontalpodautoscalers"] = scrub.NewHorizontalPodAutoscaler + } return mm }