Skip to content

Commit

Permalink
Upgrade two more apiextensionsv1beta1 references (#1327)
Browse files Browse the repository at this point in the history 
Upgrade two more apiextensionsv1beta1 references

Gatekeeper pods were failing to start on a k8s 1.22 cluster due to a
couple extra v1beta.CRD calls. This PR updates them.

This also cleans up the remaining apiextensionsv1beta1 references,
which were in test code.

Contributes to #550

Signed-off-by: juliankatz juliankatz@google.com
  • Loading branch information
@julianKatz
julianKatz committed May 25, 2021
1 parent 0b1d89d commit f6c2fe8
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 58 deletions.
25 changes: 0 additions & 25 deletions apis/addtoscheme_customresourcedefinition_v1beta1.go
View file

This file was deleted.

4 changes: 2 additions & 2 deletions pkg/audit/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/open-policy-agent/gatekeeper/pkg/util"
"github.com/pkg/errors"
corev1 "k8s.io/api/core/v1"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
k8serrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down Expand Up @@ -439,7 +439,7 @@ func (am *Manager) Start(ctx context.Context) error {
}

func (am *Manager) ensureCRDExists(ctx context.Context) error {
crd := &apiextensionsv1beta1.CustomResourceDefinition{}
crd := &apiextensionsv1.CustomResourceDefinition{}
return am.client.Get(ctx, types.NamespacedName{Name: crdName}, crd)
}

Expand Down
18 changes: 9 additions & 9 deletions pkg/mutation/match/match.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"

corev1 "k8s.io/api/core/v1"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
Expand All @@ -24,12 +24,12 @@ type ApplyTo struct {
// Match selects objects to apply mutations to.
// +kubebuilder:object:generate=true
type Match struct {
Kinds []Kinds `json:"kinds,omitempty"`
Scope apiextensionsv1beta1.ResourceScope `json:"scope,omitempty"`
Namespaces []string `json:"namespaces,omitempty"`
ExcludedNamespaces []string `json:"excludedNamespaces,omitempty"`
LabelSelector *metav1.LabelSelector `json:"labelSelector,omitempty"`
NamespaceSelector *metav1.LabelSelector `json:"namespaceSelector,omitempty"`
Kinds []Kinds `json:"kinds,omitempty"`
Scope apiextensionsv1.ResourceScope `json:"scope,omitempty"`
Namespaces []string `json:"namespaces,omitempty"`
ExcludedNamespaces []string `json:"excludedNamespaces,omitempty"`
LabelSelector *metav1.LabelSelector `json:"labelSelector,omitempty"`
NamespaceSelector *metav1.LabelSelector `json:"namespaceSelector,omitempty"`
}

// Kinds accepts a list of objects with apiGroups and kinds fields
Expand Down Expand Up @@ -97,12 +97,12 @@ func Matches(match Match, obj runtime.Object, ns *corev1.Namespace) (bool, error

clusterScoped := ns == nil || isNamespace(obj)

if match.Scope == apiextensionsv1beta1.ClusterScoped &&
if match.Scope == apiextensionsv1.ClusterScoped &&
!clusterScoped {
return false, nil
}

if match.Scope == apiextensionsv1beta1.NamespaceScoped &&
if match.Scope == apiextensionsv1.NamespaceScoped &&
clusterScoped {
return false, nil
}
Expand Down
6 changes: 3 additions & 3 deletions pkg/mutation/match/match_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

configv1alpha1 "github.com/open-policy-agent/gatekeeper/apis/config/v1alpha1"
corev1 "k8s.io/api/core/v1"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down Expand Up @@ -143,7 +143,7 @@ func TestMatch(t *testing.T) {
toMatch: makeObject("kind", "group", "namespace", "name"),
match: Match{
Namespaces: []string{"nonmatching", "namespace"},
Scope: apiextensionsv1beta1.ClusterScoped,
Scope: apiextensionsv1.ClusterScoped,
},
namespace: &corev1.Namespace{},
shouldMatch: false,
Expand Down Expand Up @@ -174,7 +174,7 @@ func TestMatch(t *testing.T) {
APIGroups: []string{"group"},
},
},
Scope: apiextensionsv1beta1.NamespaceScoped,
Scope: apiextensionsv1.NamespaceScoped,
},
namespace: nil,
shouldMatch: false,
Expand Down
4 changes: 0 additions & 4 deletions pkg/readiness/integration_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"github.com/onsi/gomega"
"github.com/open-policy-agent/gatekeeper/apis"
v1 "k8s.io/api/core/v1"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
Expand All @@ -52,9 +51,6 @@ func TestMain(m *testing.M) {
if err := apis.AddToScheme(scheme.Scheme); err != nil {
stdlog.Fatal(err)
}
if err := apiextensionsv1beta1.AddToScheme(scheme.Scheme); err != nil {
stdlog.Fatal(err)
}

if cfg, err = t.Start(); err != nil {
stdlog.Fatal(err)
Expand Down
4 changes: 2 additions & 2 deletions pkg/upgrade/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"time"

"github.com/open-policy-agent/gatekeeper/pkg/util"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down Expand Up @@ -64,7 +64,7 @@ func (um *Manager) Start(ctx context.Context) error {
}

func (um *Manager) ensureCRDExists(ctx context.Context) error {
crd := &apiextensionsv1beta1.CustomResourceDefinition{}
crd := &apiextensionsv1.CustomResourceDefinition{}
return um.client.Get(ctx, types.NamespacedName{Name: crdName}, crd)
}

Expand Down
28 changes: 19 additions & 9 deletions pkg/watch/manager_integration_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"github.com/prometheus/client_golang/prometheus"
"golang.org/x/sync/errgroup"
corev1 "k8s.io/api/core/v1"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
Expand Down Expand Up @@ -384,26 +384,36 @@ func Test_Registrar_Replay(t *testing.T) {
}

// makeCRD generates a CRD specified by GVK and plural for testing.
func makeCRD(gvk schema.GroupVersionKind, plural string) *apiextensionsv1beta1.CustomResourceDefinition {
return &apiextensionsv1beta1.CustomResourceDefinition{
func makeCRD(gvk schema.GroupVersionKind, plural string) *apiextensionsv1.CustomResourceDefinition {
trueBool := true
return &apiextensionsv1.CustomResourceDefinition{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s.%s", plural, gvk.Group),
},
TypeMeta: metav1.TypeMeta{
Kind: "CustomResourceDefinition",
APIVersion: "apiextensions/v1beta1",
APIVersion: "apiextensions/v1",
},
Spec: apiextensionsv1beta1.CustomResourceDefinitionSpec{
Spec: apiextensionsv1.CustomResourceDefinitionSpec{
Group: gvk.Group,
Names: apiextensionsv1beta1.CustomResourceDefinitionNames{
Names: apiextensionsv1.CustomResourceDefinitionNames{
Plural: plural,
Singular: strings.ToLower(gvk.Kind),
Kind: gvk.Kind,
},
Versions: []apiextensionsv1beta1.CustomResourceDefinitionVersion{
{Name: gvk.Version, Served: true, Storage: true},
Versions: []apiextensionsv1.CustomResourceDefinitionVersion{
{
Name: gvk.Version,
Served: true,
Storage: true,
Schema: &apiextensionsv1.CustomResourceValidation{
OpenAPIV3Schema: &apiextensionsv1.JSONSchemaProps{
XPreserveUnknownFields: &trueBool,
},
},
},
},
Scope: apiextensionsv1beta1.ClusterScoped,
Scope: apiextensionsv1.ClusterScoped,
},
}
}
Expand Down
4 changes: 0 additions & 4 deletions pkg/watch/manager_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"testing"

"github.com/open-policy-agent/gatekeeper/apis"
apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/envtest"
Expand All @@ -34,9 +33,6 @@ func TestMain(m *testing.M) {
if err := apis.AddToScheme(scheme.Scheme); err != nil {
stdlog.Fatal(err)
}
if err := apiextensionsv1beta1.AddToScheme(scheme.Scheme); err != nil {
stdlog.Fatal(err)
}

var err error
if cfg, err = t.Start(); err != nil {
Expand Down

0 comments on commit f6c2fe8

Please sign in to comment.