Use v1 PDB in 1.21 kubernetes

CHANGELOG.md

@@ -10,6 +10,7 @@
 - (Feature) Add `ArangoJob` CRD auto-installer
 - (Feature) Add RestartPolicyAlways to ArangoDeployment in order to restart ArangoDB on failure
 - (Feature) Set a leader in active fail-over mode
+- (Feature) Use policy/v1 instead policy/v1beta1
 
 ## [1.2.13](https://github.com/arangodb/kube-arangodb/tree/1.2.13) (2022-06-07)
 - (Bugfix) Fix arangosync members state inspection

pkg/deployment/resources/annotations.go

@@ -23,21 +23,21 @@ package resources
 import (
 	"context"
 
-	"github.com/arangodb/kube-arangodb/pkg/util/globals"
-
-	"github.com/arangodb/kube-arangodb/pkg/deployment/patch"
-	"github.com/arangodb/kube-arangodb/pkg/util/collection"
-	inspectorInterface "github.com/arangodb/kube-arangodb/pkg/util/k8sutil/inspector"
 	monitoring "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
+	"github.com/rs/zerolog/log"
+	core "k8s.io/api/core/v1"
+	policyv1 "k8s.io/api/policy/v1"
+	policyv1beta1 "k8s.io/api/policy/v1beta1"
+	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
 	"github.com/arangodb/kube-arangodb/pkg/apis/deployment"
 	api "github.com/arangodb/kube-arangodb/pkg/apis/deployment/v1"
+	"github.com/arangodb/kube-arangodb/pkg/deployment/patch"
+	"github.com/arangodb/kube-arangodb/pkg/util/collection"
+	"github.com/arangodb/kube-arangodb/pkg/util/globals"
 	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil"
-	"github.com/rs/zerolog/log"
-	core "k8s.io/api/core/v1"
-	policy "k8s.io/api/policy/v1beta1"
-	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
+	inspectorInterface "github.com/arangodb/kube-arangodb/pkg/util/k8sutil/inspector"
 )
 
 type PatchFunc func(name string, d []byte) error
@@ -98,8 +98,15 @@ func (r *Resources) EnsureAnnotations(ctx context.Context, cachedStatus inspecto
 
 	patchPDB := func(name string, d []byte) error {
 		return globals.GetGlobalTimeouts().Kubernetes().RunWithTimeout(ctx, func(ctxChild context.Context) error {
+			if _, err := cachedStatus.PodDisruptionBudget().V1(); err == nil {
+				_, err = cachedStatus.PodDisruptionBudgetsModInterface().V1().Patch(ctxChild, name,
+					types.JSONPatchType, d, meta.PatchOptions{})
+				return err
+			}
+
 			_, err := cachedStatus.PodDisruptionBudgetsModInterface().V1Beta1().Patch(ctxChild, name,
 				types.JSONPatchType, d, meta.PatchOptions{})
+
 			return err
 		})
 	}
@@ -206,15 +213,29 @@ func ensureServicesAnnotations(patch PatchFunc, cachedStatus inspectorInterface.
 	return nil
 }
 
-func ensurePdbsAnnotations(patch PatchFunc, cachedStatus inspectorInterface.Inspector, kind, name, namespace string, spec api.DeploymentSpec) error {
-	i, err := cachedStatus.PodDisruptionBudget().V1Beta1()
+func ensurePdbsAnnotations(patch PatchFunc, cachedStatus inspectorInterface.Inspector, kind, name, namespace string,
+	spec api.DeploymentSpec) error {
+	if inspector, err := cachedStatus.PodDisruptionBudget().V1(); err == nil {
+		if err := inspector.Iterate(func(podDisruptionBudget *policyv1.PodDisruptionBudget) error {
+			ensureAnnotationsMap(podDisruptionBudget.Kind, podDisruptionBudget, spec, patch)
+			return nil
+		}, func(podDisruptionBudget *policyv1.PodDisruptionBudget) bool {
+			return k8sutil.IsChildResource(kind, name, namespace, podDisruptionBudget)
+		}); err != nil {
+			return err
+		}
+
+		return nil
+	}
+
+	inspector, err := cachedStatus.PodDisruptionBudget().V1Beta1()
 	if err != nil {
 		return err
 	}
-	if err := i.Iterate(func(podDisruptionBudget *policy.PodDisruptionBudget) error {
+	if err := inspector.Iterate(func(podDisruptionBudget *policyv1beta1.PodDisruptionBudget) error {
 		ensureAnnotationsMap(podDisruptionBudget.Kind, podDisruptionBudget, spec, patch)
 		return nil
-	}, func(podDisruptionBudget *policy.PodDisruptionBudget) bool {
+	}, func(podDisruptionBudget *policyv1beta1.PodDisruptionBudget) bool {
 		return k8sutil.IsChildResource(kind, name, namespace, podDisruptionBudget)
 	}); err != nil {
 		return err

pkg/deployment/resources/inspector/pdbs.go

@@ -24,14 +24,15 @@ import (
 	"context"
 	"time"
 
-	"github.com/arangodb/kube-arangodb/pkg/util/errors"
-	"github.com/arangodb/kube-arangodb/pkg/util/globals"
-	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil/inspector/throttle"
 	policyv1 "k8s.io/api/policy/v1"
 	policyv1beta1 "k8s.io/api/policy/v1beta1"
 	apiErrors "k8s.io/apimachinery/pkg/api/errors"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/arangodb/kube-arangodb/pkg/util/errors"
+	"github.com/arangodb/kube-arangodb/pkg/util/globals"
+	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil/inspector/throttle"
 )
 
 func init() {
@@ -50,7 +51,7 @@ func (p podDisruptionBudgetsInspectorLoader) Component() throttle.Component {
 func (p podDisruptionBudgetsInspectorLoader) Load(ctx context.Context, i *inspectorState) {
 	var q podDisruptionBudgetsInspector
 
-	if i.versionInfo.Major() == 128 && i.versionInfo.Minor() >= 21 { // Above 1.21, disable temporally
+	if i.versionInfo.CompareTo("1.21") >= 0 {
 		p.loadV1(ctx, i, &q)
 
 		q.v1beta1 = &podDisruptionBudgetsInspectorV1Beta1{

pkg/deployment/resources/inspector/pdbs_anonymous.go

@@ -21,8 +21,9 @@
 package inspector
 
 import (
-	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil/inspector/anonymous"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+
+	"github.com/arangodb/kube-arangodb/pkg/util/k8sutil/inspector/anonymous"
 )
 
 func (p *podDisruptionBudgetsInspector) Anonymous(gvk schema.GroupVersionKind) (anonymous.Interface, bool) {

pkg/deployment/resources/inspector/pdbs_constants.go

@@ -21,13 +21,13 @@
 package inspector
 
 import (
-	policy "k8s.io/api/policy/v1"
+	policyv1 "k8s.io/api/policy/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 )
 
 // PodDisruptionBudget
 const (
-	PodDisruptionBudgetGroup          = policy.GroupName
+	PodDisruptionBudgetGroup          = policyv1.GroupName
 	PodDisruptionBudgetResource       = "poddisruptionbudgets"
 	PodDisruptionBudgetKind           = "PodDisruptionBudget"
 	PodDisruptionBudgetVersionV1Beta1 = "v1beta1"

pkg/deployment/resources/inspector/pdbs_mod_v1.go

@@ -0,0 +1,83 @@
+//
+// DISCLAIMER
+//
+// Copyright 2016-2022 ArangoDB GmbH, Cologne, Germany
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+// Copyright holder is ArangoDB GmbH, Cologne, Germany
+//
+
+package inspector
+
+import (
+	"context"
+
+	policyv1 "k8s.io/api/policy/v1"
+	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/types"
+	policytypedv1 "k8s.io/client-go/kubernetes/typed/policy/v1"
+
+	poddisruptionbudgetv1 "github.com/arangodb/kube-arangodb/pkg/util/k8sutil/inspector/poddisruptionbudget/v1"
+)
+
+type podDisruptionBudgetsModV1 struct {
+	i *inspectorState
+}
+
+func (p podDisruptionBudgetsMod) V1() poddisruptionbudgetv1.ModInterface {
+	return podDisruptionBudgetsModV1(p)
+}
+
+func (p podDisruptionBudgetsModV1) client() policytypedv1.PodDisruptionBudgetInterface {
+	return p.i.Client().Kubernetes().PolicyV1().PodDisruptionBudgets(p.i.Namespace())
+}
+
+func (p podDisruptionBudgetsModV1) Create(ctx context.Context, podDisruptionBudget *policyv1.PodDisruptionBudget,
+	opts meta.CreateOptions) (*policyv1.PodDisruptionBudget, error) {
+	if podDisruptionBudget, err := p.client().Create(ctx, podDisruptionBudget, opts); err != nil {
+		return podDisruptionBudget, err
+	} else {
+		p.i.GetThrottles().PodDisruptionBudget().Invalidate()
+		return podDisruptionBudget, err
+	}
+}
+
+func (p podDisruptionBudgetsModV1) Update(ctx context.Context, podDisruptionBudget *policyv1.PodDisruptionBudget,
+	opts meta.UpdateOptions) (*policyv1.PodDisruptionBudget, error) {
+	if podDisruptionBudget, err := p.client().Update(ctx, podDisruptionBudget, opts); err != nil {
+		return podDisruptionBudget, err
+	} else {
+		p.i.GetThrottles().PodDisruptionBudget().Invalidate()
+		return podDisruptionBudget, err
+	}
+}
+
+func (p podDisruptionBudgetsModV1) Patch(ctx context.Context, name string, pt types.PatchType, data []byte,
+	opts meta.PatchOptions, subresources ...string) (result *policyv1.PodDisruptionBudget, err error) {
+	if podDisruptionBudget, err := p.client().Patch(ctx, name, pt, data, opts, subresources...); err != nil {
+		return podDisruptionBudget, err
+	} else {
+		p.i.GetThrottles().PodDisruptionBudget().Invalidate()
+		return podDisruptionBudget, err
+	}
+}
+
+func (p podDisruptionBudgetsModV1) Delete(ctx context.Context, name string, opts meta.DeleteOptions) error {
+	if err := p.client().Delete(ctx, name, opts); err != nil {
+		return err
+	} else {
+		p.i.GetThrottles().PodDisruptionBudget().Invalidate()
+		return err
+	}
+}

pkg/deployment/resources/inspector/pdbs_mod_v1beta1.go

@@ -23,26 +23,27 @@ package inspector
 import (
 	"context"
 
-	podDisruptionBudgetv1beta1 "github.com/arangodb/kube-arangodb/pkg/util/k8sutil/inspector/poddisruptionbudget/v1beta1"
-	policy "k8s.io/api/policy/v1beta1"
+	policyv1beta1 "k8s.io/api/policy/v1beta1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	policyTyped "k8s.io/client-go/kubernetes/typed/policy/v1beta1"
+	policytypedv1beta1 "k8s.io/client-go/kubernetes/typed/policy/v1beta1"
+
+	podsisruptionbudgetv1beta1 "github.com/arangodb/kube-arangodb/pkg/util/k8sutil/inspector/poddisruptionbudget/v1beta1"
 )
 
-func (p podDisruptionBudgetsMod) V1Beta1() podDisruptionBudgetv1beta1.ModInterface {
-	return podDisruptionBudgetsModV1(p)
+func (p podDisruptionBudgetsMod) V1Beta1() podsisruptionbudgetv1beta1.ModInterface {
+	return podDisruptionBudgetsModV1Beta1(p)
 }
 
-type podDisruptionBudgetsModV1 struct {
+type podDisruptionBudgetsModV1Beta1 struct {
 	i *inspectorState
 }
 
-func (p podDisruptionBudgetsModV1) client() policyTyped.PodDisruptionBudgetInterface {
+func (p podDisruptionBudgetsModV1Beta1) client() policytypedv1beta1.PodDisruptionBudgetInterface {
 	return p.i.Client().Kubernetes().PolicyV1beta1().PodDisruptionBudgets(p.i.Namespace())
 }
 
-func (p podDisruptionBudgetsModV1) Create(ctx context.Context, podDisruptionBudget *policy.PodDisruptionBudget, opts meta.CreateOptions) (*policy.PodDisruptionBudget, error) {
+func (p podDisruptionBudgetsModV1Beta1) Create(ctx context.Context, podDisruptionBudget *policyv1beta1.PodDisruptionBudget, opts meta.CreateOptions) (*policyv1beta1.PodDisruptionBudget, error) {
 	if podDisruptionBudget, err := p.client().Create(ctx, podDisruptionBudget, opts); err != nil {
 		return podDisruptionBudget, err
 	} else {
@@ -51,7 +52,7 @@ func (p podDisruptionBudgetsModV1) Create(ctx context.Context, podDisruptionBudg
 	}
 }
 
-func (p podDisruptionBudgetsModV1) Update(ctx context.Context, podDisruptionBudget *policy.PodDisruptionBudget, opts meta.UpdateOptions) (*policy.PodDisruptionBudget, error) {
+func (p podDisruptionBudgetsModV1Beta1) Update(ctx context.Context, podDisruptionBudget *policyv1beta1.PodDisruptionBudget, opts meta.UpdateOptions) (*policyv1beta1.PodDisruptionBudget, error) {
 	if podDisruptionBudget, err := p.client().Update(ctx, podDisruptionBudget, opts); err != nil {
 		return podDisruptionBudget, err
 	} else {
@@ -60,7 +61,7 @@ func (p podDisruptionBudgetsModV1) Update(ctx context.Context, podDisruptionBudg
 	}
 }
 
-func (p podDisruptionBudgetsModV1) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts meta.PatchOptions, subresources ...string) (result *policy.PodDisruptionBudget, err error) {
+func (p podDisruptionBudgetsModV1Beta1) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, opts meta.PatchOptions, subresources ...string) (result *policyv1beta1.PodDisruptionBudget, err error) {
 	if podDisruptionBudget, err := p.client().Patch(ctx, name, pt, data, opts, subresources...); err != nil {
 		return podDisruptionBudget, err
 	} else {
@@ -69,7 +70,7 @@ func (p podDisruptionBudgetsModV1) Patch(ctx context.Context, name string, pt ty
 	}
 }
 
-func (p podDisruptionBudgetsModV1) Delete(ctx context.Context, name string, opts meta.DeleteOptions) error {
+func (p podDisruptionBudgetsModV1Beta1) Delete(ctx context.Context, name string, opts meta.DeleteOptions) error {
 	if err := p.client().Delete(ctx, name, opts); err != nil {
 		return err
 	} else {

pkg/deployment/resources/inspector/pdbs_v1.go

@@ -23,11 +23,12 @@ package inspector
 import (
 	"context"
 
-	"github.com/arangodb/kube-arangodb/pkg/util/errors"
-	ins "github.com/arangodb/kube-arangodb/pkg/util/k8sutil/inspector/poddisruptionbudget/v1"
-	policy "k8s.io/api/policy/v1"
+	policyv1 "k8s.io/api/policy/v1"
 	apiErrors "k8s.io/apimachinery/pkg/api/errors"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"github.com/arangodb/kube-arangodb/pkg/util/errors"
+	ins "github.com/arangodb/kube-arangodb/pkg/util/k8sutil/inspector/poddisruptionbudget/v1"
 )
 
 func (p *podDisruptionBudgetsInspector) V1() (ins.Inspector, error) {
@@ -41,7 +42,7 @@ func (p *podDisruptionBudgetsInspector) V1() (ins.Inspector, error) {
 type podDisruptionBudgetsInspectorV1 struct {
 	podDisruptionBudgetInspector *podDisruptionBudgetsInspector
 
-	podDisruptionBudgets map[string]*policy.PodDisruptionBudget
+	podDisruptionBudgets map[string]*policyv1.PodDisruptionBudget
 	err                  error
 }
 
@@ -65,16 +66,16 @@ func (p *podDisruptionBudgetsInspectorV1) validate() error {
 	return nil
 }
 
-func (p *podDisruptionBudgetsInspectorV1) PodDisruptionBudgets() []*policy.PodDisruptionBudget {
-	var r []*policy.PodDisruptionBudget
+func (p *podDisruptionBudgetsInspectorV1) PodDisruptionBudgets() []*policyv1.PodDisruptionBudget {
+	var r []*policyv1.PodDisruptionBudget
 	for _, podDisruptionBudget := range p.podDisruptionBudgets {
 		r = append(r, podDisruptionBudget)
 	}
 
 	return r
 }
 
-func (p *podDisruptionBudgetsInspectorV1) GetSimple(name string) (*policy.PodDisruptionBudget, bool) {
+func (p *podDisruptionBudgetsInspectorV1) GetSimple(name string) (*policyv1.PodDisruptionBudget, bool) {
 	podDisruptionBudget, ok := p.podDisruptionBudgets[name]
 	if !ok {
 		return nil, false
@@ -93,7 +94,7 @@ func (p *podDisruptionBudgetsInspectorV1) Iterate(action ins.Action, filters ...
 	return nil
 }
 
-func (p *podDisruptionBudgetsInspectorV1) iteratePodDisruptionBudget(podDisruptionBudget *policy.PodDisruptionBudget, action ins.Action, filters ...ins.Filter) error {
+func (p *podDisruptionBudgetsInspectorV1) iteratePodDisruptionBudget(podDisruptionBudget *policyv1.PodDisruptionBudget, action ins.Action, filters ...ins.Filter) error {
 	for _, f := range filters {
 		if f == nil {
 			continue
@@ -111,7 +112,7 @@ func (p *podDisruptionBudgetsInspectorV1) Read() ins.ReadInterface {
 	return p
 }
 
-func (p *podDisruptionBudgetsInspectorV1) Get(ctx context.Context, name string, opts meta.GetOptions) (*policy.PodDisruptionBudget, error) {
+func (p *podDisruptionBudgetsInspectorV1) Get(ctx context.Context, name string, opts meta.GetOptions) (*policyv1.PodDisruptionBudget, error) {
 	if s, ok := p.GetSimple(name); !ok {
 		return nil, apiErrors.NewNotFound(PodDisruptionBudgetGR(), name)
 	} else {