This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch release-1.8.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-1.8.x by this push:
new 338a58209 fix(core): move to policy/v1
338a58209 is described below
commit 338a582096aaeba7d74d456b3462dc22eb0787ca
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Thu Nov 24 17:03:41 2022 +0100
fix(core): move to policy/v1
Closes #3840
---
e2e/common/traits/pdb_test.go | 14 +++++++-------
pkg/trait/pdb.go | 10 +++++-----
pkg/trait/pdb_test.go | 10 +++++-----
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/e2e/common/traits/pdb_test.go b/e2e/common/traits/pdb_test.go
index fede22556..974fd10af 100644
--- a/e2e/common/traits/pdb_test.go
+++ b/e2e/common/traits/pdb_test.go
@@ -30,7 +30,7 @@ import (
. "github.com/onsi/gomega/gstruct"
corev1 "k8s.io/api/core/v1"
- policy "k8s.io/api/policy/v1beta1"
+ policyv1 "k8s.io/api/policy/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
@@ -97,7 +97,7 @@ func TestPodDisruptionBudgetTrait(t *testing.T) {
// Eviction attempt
pods := IntegrationPods(ns, name)()
Expect(pods).To(HaveLen(2))
- err := TestClient().CoreV1().Pods(ns).Evict(TestContext,
&policy.Eviction{
+ err := TestClient().CoreV1().Pods(ns).EvictV1(TestContext,
&policyv1.Eviction{
ObjectMeta: metav1.ObjectMeta{
Name: pods[0].Name,
},
@@ -129,7 +129,7 @@ func TestPodDisruptionBudgetTrait(t *testing.T) {
pods = IntegrationPods(ns, name)()
Expect(pods).To(HaveLen(3))
- Expect(TestClient().CoreV1().Pods(ns).Evict(TestContext,
&policy.Eviction{
+ Expect(TestClient().CoreV1().Pods(ns).EvictV1(TestContext,
&policyv1.Eviction{
ObjectMeta: metav1.ObjectMeta{
Name: pods[0].Name,
},
@@ -140,11 +140,11 @@ func TestPodDisruptionBudgetTrait(t *testing.T) {
})
}
-func podDisruptionBudget(ns string, name string) func()
*policy.PodDisruptionBudget {
- return func() *policy.PodDisruptionBudget {
- pdb := policy.PodDisruptionBudget{
+func podDisruptionBudget(ns string, name string) func()
*policyv1.PodDisruptionBudget {
+ return func() *policyv1.PodDisruptionBudget {
+ pdb := policyv1.PodDisruptionBudget{
TypeMeta: metav1.TypeMeta{
- APIVersion: policy.SchemeGroupVersion.String(),
+ APIVersion:
policyv1.SchemeGroupVersion.String(),
Kind: "PodDisruptionBudget",
},
ObjectMeta: metav1.ObjectMeta{
diff --git a/pkg/trait/pdb.go b/pkg/trait/pdb.go
index f0b5636ba..c129141dd 100644
--- a/pkg/trait/pdb.go
+++ b/pkg/trait/pdb.go
@@ -20,7 +20,7 @@ package trait
import (
"fmt"
- "k8s.io/api/policy/v1beta1"
+ policyv1 "k8s.io/api/policy/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/intstr"
@@ -80,18 +80,18 @@ func (t *pdbTrait) Apply(e *Environment) error {
return nil
}
-func (t *pdbTrait) podDisruptionBudgetFor(integration *v1.Integration)
*v1beta1.PodDisruptionBudget {
- pdb := &v1beta1.PodDisruptionBudget{
+func (t *pdbTrait) podDisruptionBudgetFor(integration *v1.Integration)
*policyv1.PodDisruptionBudget {
+ pdb := &policyv1.PodDisruptionBudget{
TypeMeta: metav1.TypeMeta{
Kind: "PodDisruptionBudget",
- APIVersion: v1beta1.SchemeGroupVersion.String(),
+ APIVersion: policyv1.SchemeGroupVersion.String(),
},
ObjectMeta: metav1.ObjectMeta{
Name: integration.Name,
Namespace: integration.Namespace,
Labels: integration.Labels,
},
- Spec: v1beta1.PodDisruptionBudgetSpec{
+ Spec: policyv1.PodDisruptionBudgetSpec{
Selector: &metav1.LabelSelector{
MatchLabels: map[string]string{
v1.IntegrationLabel: integration.Name,
diff --git a/pkg/trait/pdb_test.go b/pkg/trait/pdb_test.go
index 619e160ef..43e0c80f4 100644
--- a/pkg/trait/pdb_test.go
+++ b/pkg/trait/pdb_test.go
@@ -24,7 +24,7 @@ import (
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
- "k8s.io/api/policy/v1beta1"
+ policyv1 "k8s.io/api/policy/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
@@ -72,7 +72,7 @@ func TestPdbIsCreatedWithMinAvailable(t *testing.T) {
assert.Equal(t, int32(2), pdb.Spec.MinAvailable.IntVal)
}
-func pdbCreatedCheck(t *testing.T, pdbTrait *pdbTrait, environment
*Environment) *v1beta1.PodDisruptionBudget {
+func pdbCreatedCheck(t *testing.T, pdbTrait *pdbTrait, environment
*Environment) *policyv1.PodDisruptionBudget {
t.Helper()
err := pdbTrait.Apply(environment)
@@ -86,10 +86,10 @@ func pdbCreatedCheck(t *testing.T, pdbTrait *pdbTrait,
environment *Environment)
return pdb
}
-func findPdb(resources *kubernetes.Collection) *v1beta1.PodDisruptionBudget {
+func findPdb(resources *kubernetes.Collection) *policyv1.PodDisruptionBudget {
for _, a := range resources.Items() {
- if _, ok := a.(*v1beta1.PodDisruptionBudget); ok {
- return a.(*v1beta1.PodDisruptionBudget)
+ if _, ok := a.(*policyv1.PodDisruptionBudget); ok {
+ return a.(*policyv1.PodDisruptionBudget)
}
}
return nil
