Skip to content

Commit

Permalink
deps: update controller-runtime to v0.8.2 (PROJQUAY-1622)
Browse files Browse the repository at this point in the history
Updates to controller-runtime v0.8.2 and other dependencies
to get new methods for implementing admission webhooks.

Signed-off-by: Alec Merdler <alecmerdler@gmail.com>
  • Loading branch information
alecmerdler committed Apr 15, 2021
1 parent 73360b3 commit ef4e0de
Show file tree
Hide file tree
Showing 997 changed files with 100,239 additions and 32,643 deletions.
6 changes: 3 additions & 3 deletions apis/quay/v1/quayregistry_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

quaycontext "github.com/quay/quay-operator/pkg/context"
)
Expand Down Expand Up @@ -329,7 +329,7 @@ func EnsureConfigEditorEndpoint(ctx *quaycontext.QuayRegistryContext, quay *Quay
}

// EnsureOwnerReference adds an `ownerReference` to the given object if it does not already have one.
func EnsureOwnerReference(quay *QuayRegistry, obj runtime.Object) (runtime.Object, error) {
func EnsureOwnerReference(quay *QuayRegistry, obj client.Object) (client.Object, error) {
objectMeta, err := meta.Accessor(obj)
if err != nil {
return nil, err
Expand Down Expand Up @@ -358,7 +358,7 @@ func EnsureOwnerReference(quay *QuayRegistry, obj runtime.Object) (runtime.Objec
}

// RemoveOwnerReference removes the `ownerReference` of `QuayRegistry` on the given object.
func RemoveOwnerReference(quay *QuayRegistry, obj runtime.Object) (runtime.Object, error) {
func RemoveOwnerReference(quay *QuayRegistry, obj client.Object) (client.Object, error) {
filteredOwnerReferences := []metav1.OwnerReference{}

objectMeta, err := meta.Accessor(obj)
Expand Down
3 changes: 1 addition & 2 deletions controllers/quay/features.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
Expand Down Expand Up @@ -243,7 +242,7 @@ func (r *QuayRegistryReconciler) checkMonitoringAvailable(ctx *quaycontext.QuayR
return ctx, quay, nil
}

func configEditorCredentialsSecretFrom(objs []runtime.Object) string {
func configEditorCredentialsSecretFrom(objs []client.Object) string {
for _, obj := range objs {
objectMeta, _ := meta.Accessor(obj)
groupVersionKind := obj.GetObjectKind().GroupVersionKind().String()
Expand Down
18 changes: 8 additions & 10 deletions controllers/quay/quayregistry_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ import (
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
k8sruntime "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/wait"
Expand Down Expand Up @@ -78,8 +77,7 @@ type QuayRegistryReconciler struct {
// +kubebuilder:rbac:groups=quay.redhat.com,resources=quayregistries,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=quay.redhat.com,resources=quayregistries/status,verbs=get;update;patch

func (r *QuayRegistryReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
ctx := context.Background()
func (r *QuayRegistryReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
log := r.Log.WithValues("quayregistry", req.NamespacedName)

log.Info("begin reconcile")
Expand Down Expand Up @@ -404,7 +402,7 @@ func (r *QuayRegistryReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error
}

// updateGrafanaDashboardData parses the Grafana Dashboard ConfigMap and updates the title and labels to filter the query by
func updateGrafanaDashboardData(obj k8sruntime.Object, quayName string, quayNamespace string) (k8sruntime.Object, error) {
func updateGrafanaDashboardData(obj client.Object, quayName string, quayNamespace string) (client.Object, error) {
updatedObj := obj.DeepCopyObject()
configMapObj := updatedObj.(*corev1.ConfigMap)

Expand Down Expand Up @@ -432,14 +430,14 @@ func updateGrafanaDashboardData(obj k8sruntime.Object, quayName string, quayName
}

// updateResourceNamespace updates an Object's namespace replacing the existing namespace
func updateResourceNamespace(obj k8sruntime.Object, newNamespace string) k8sruntime.Object {
updatedObj := obj.DeepCopyObject()
updatedObj.(*corev1.ConfigMap).SetNamespace(newNamespace)
return updatedObj
func updateResourceNamespace(obj client.Object, newNamespace string) client.Object {
obj.(*corev1.ConfigMap).SetNamespace(newNamespace)

return obj
}

// isGrafanaConfigMap checks if an Object is the Grafana ConfigMap used in the monitoring component
func isGrafanaConfigMap(obj k8sruntime.Object) bool {
func isGrafanaConfigMap(obj client.Object) bool {
configMapGVK := schema.GroupVersionKind{Version: "v1", Kind: "ConfigMap"}

return configMapGVK == obj.GetObjectKind().GroupVersionKind() &&
Expand All @@ -459,7 +457,7 @@ func decode(bytes []byte) interface{} {
return value
}

func (r *QuayRegistryReconciler) createOrUpdateObject(ctx context.Context, obj k8sruntime.Object, quay v1.QuayRegistry) error {
func (r *QuayRegistryReconciler) createOrUpdateObject(ctx context.Context, obj client.Object, quay v1.QuayRegistry) error {
objectMeta, _ := meta.Accessor(obj)
groupVersionKind := obj.GetObjectKind().GroupVersionKind().String()

Expand Down
16 changes: 8 additions & 8 deletions controllers/quay/quayregistry_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ var _ = Describe("Reconciling a QuayRegistry", func() {

Expect(k8sClient.Create(context.Background(), quayRegistry)).Should(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayRegistryName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayRegistryName})
})

It("should not return an error", func() {
Expand Down Expand Up @@ -151,7 +151,7 @@ var _ = Describe("Reconciling a QuayRegistry", func() {

configBundleSecretName = updatedQuayRegistry.Spec.ConfigBundleSecret

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayRegistryName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayRegistryName})

Expect(err).NotTo(HaveOccurred())
Expect(result.Requeue).To(BeFalse())
Expand All @@ -178,7 +178,7 @@ var _ = Describe("Reconciling a QuayRegistry", func() {

Expect(k8sClient.Create(context.Background(), quayRegistry)).Should(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayRegistryName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayRegistryName})
})

It("should not return an error", func() {
Expand Down Expand Up @@ -221,7 +221,7 @@ var _ = Describe("Reconciling a QuayRegistry", func() {
Expect(k8sClient.Create(context.Background(), &configBundle)).Should(Succeed())
Expect(k8sClient.Create(context.Background(), quayRegistry)).Should(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayRegistryName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayRegistryName})
})

It("does not return an error", func() {
Expand Down Expand Up @@ -281,7 +281,7 @@ var _ = Describe("Reconciling a QuayRegistry", func() {

Expect(k8sClient.Status().Update(context.Background(), quayRegistry)).To(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayRegistryName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayRegistryName})
})

It("does not attempt an upgrade", func() {
Expand Down Expand Up @@ -309,7 +309,7 @@ var _ = Describe("Reconciling a QuayRegistry", func() {

Expect(k8sClient.Status().Update(context.Background(), quayRegistry)).To(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayRegistryName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayRegistryName})
})

It("successfully performs an upgrade", func() {
Expand Down Expand Up @@ -340,7 +340,7 @@ var _ = Describe("Reconciling a QuayRegistry", func() {

Expect(k8sClient.Status().Update(context.Background(), quayRegistry)).To(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayRegistryName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayRegistryName})
})

It("does not attempt an upgrade", func() {
Expand Down Expand Up @@ -368,7 +368,7 @@ var _ = Describe("Reconciling a QuayRegistry", func() {
Expect(k8sClient.Create(context.Background(), &configBundle)).Should(Succeed())
Expect(k8sClient.Create(context.Background(), quayRegistry)).Should(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayRegistryName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayRegistryName})
})

It("does not return an error", func() {
Expand Down
2 changes: 1 addition & 1 deletion controllers/quay/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func TestAPIs(t *testing.T) {
}

var _ = BeforeSuite(func(done Done) {
testLogger = zap.LoggerTo(GinkgoWriter, true)
testLogger = zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))
logf.SetLogger(testLogger)
testEventRecorder = record.NewFakeRecorder(100)

Expand Down
3 changes: 1 addition & 2 deletions controllers/redhatcop/quayecosystem_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ type QuayEcosystemReconciler struct {
// +kubebuilder:rbac:groups=redhatcop.redhat.io,resources=quayecosystems,verbs=get;list;watch;create;update;patch;delete
// +kubebuilder:rbac:groups=redhatcop.redhat.io,resources=quayecosystems/status,verbs=get;update;patch

func (r *QuayEcosystemReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
ctx := context.Background()
func (r *QuayEcosystemReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
log := r.Log.WithValues("quayecosystem", req.NamespacedName)

log.Info("begin reconcile")
Expand Down
24 changes: 12 additions & 12 deletions controllers/redhatcop/quayecosystem_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ var _ = Describe("Reconciling a QuayEcosystem", func() {
Expect(k8sClient.Create(context.Background(), quayEnterpriseConfigSecret)).Should(Succeed())
Expect(k8sClient.Create(context.Background(), quayEcosystem)).Should(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayEcosystemName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayEcosystemName})
})

It("should not return an error", func() {
Expand Down Expand Up @@ -136,7 +136,7 @@ var _ = Describe("Reconciling a QuayEcosystem", func() {
Expect(k8sClient.Delete(context.Background(), quayEnterpriseConfigSecret)).Should(Succeed())
Expect(k8sClient.Create(context.Background(), quayEcosystem)).Should(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayEcosystemName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayEcosystemName})
})

It("does not attempt migration", func() {
Expand All @@ -161,7 +161,7 @@ var _ = Describe("Reconciling a QuayEcosystem", func() {
JustBeforeEach(func() {
Expect(k8sClient.Create(context.Background(), quayEcosystem)).Should(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayEcosystemName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayEcosystemName})
})

It("does not return an error", func() {
Expand Down Expand Up @@ -214,7 +214,7 @@ var _ = Describe("Reconciling a QuayEcosystem", func() {
Expect(k8sClient.Create(context.Background(), quayEcosystem)).Should(Succeed())
Expect(k8sClient.Create(context.Background(), oldDatabase)).Should(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayEcosystemName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayEcosystemName})
})

It("does not return an error", func() {
Expand Down Expand Up @@ -245,7 +245,7 @@ var _ = Describe("Reconciling a QuayEcosystem", func() {

Expect(k8sClient.Create(context.Background(), quayEcosystem)).Should(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayEcosystemName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayEcosystemName})
})

It("does not return an error", func() {
Expand All @@ -265,7 +265,7 @@ var _ = Describe("Reconciling a QuayEcosystem", func() {
JustBeforeEach(func() {
Expect(k8sClient.Create(context.Background(), quayEcosystem)).Should(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayEcosystemName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayEcosystemName})
})

It("does not return an error", func() {
Expand All @@ -289,7 +289,7 @@ var _ = Describe("Reconciling a QuayEcosystem", func() {

Expect(k8sClient.Create(context.Background(), quayEcosystem)).Should(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayEcosystemName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayEcosystemName})
})

It("does not return an error", func() {
Expand All @@ -309,7 +309,7 @@ var _ = Describe("Reconciling a QuayEcosystem", func() {
JustBeforeEach(func() {
Expect(k8sClient.Create(context.Background(), quayEcosystem)).Should(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayEcosystemName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayEcosystemName})
})

It("does not return an error", func() {
Expand All @@ -335,7 +335,7 @@ var _ = Describe("Reconciling a QuayEcosystem", func() {

Expect(k8sClient.Create(context.Background(), quayEcosystem)).Should(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayEcosystemName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayEcosystemName})
})

It("does not return an error", func() {
Expand All @@ -355,7 +355,7 @@ var _ = Describe("Reconciling a QuayEcosystem", func() {
JustBeforeEach(func() {
Expect(k8sClient.Create(context.Background(), quayEcosystem)).Should(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayEcosystemName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayEcosystemName})
})

It("does not return an error", func() {
Expand All @@ -379,7 +379,7 @@ var _ = Describe("Reconciling a QuayEcosystem", func() {

Expect(k8sClient.Create(context.Background(), quayEcosystem)).Should(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayEcosystemName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayEcosystemName})
})

It("does not return an error", func() {
Expand All @@ -399,7 +399,7 @@ var _ = Describe("Reconciling a QuayEcosystem", func() {
JustBeforeEach(func() {
Expect(k8sClient.Create(context.Background(), quayEcosystem)).Should(Succeed())

result, err = controller.Reconcile(reconcile.Request{NamespacedName: quayEcosystemName})
result, err = controller.Reconcile(context.Background(), reconcile.Request{NamespacedName: quayEcosystemName})
})

It("does not return an error", func() {
Expand Down
2 changes: 1 addition & 1 deletion controllers/redhatcop/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func TestAPIs(t *testing.T) {
}

var _ = BeforeSuite(func(done Done) {
testLogger = zap.LoggerTo(GinkgoWriter, true)
testLogger = zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))
logf.SetLogger(testLogger)

By("bootstrapping test environment")
Expand Down
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.12

require (
github.com/coreos/prometheus-operator v0.28.0
github.com/go-logr/logr v0.1.0
github.com/go-logr/logr v0.3.0
github.com/kube-object-storage/lib-bucket-provisioner v0.0.0-20200610144127-e2eec875d6d1
github.com/onsi/ginkgo v1.14.2
github.com/onsi/gomega v1.10.3
Expand All @@ -16,10 +16,10 @@ require (
github.com/tidwall/sjson v1.1.5
gopkg.in/yaml.v2 v2.3.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
k8s.io/api v0.17.2
k8s.io/apimachinery v0.17.2
k8s.io/client-go v0.17.2
sigs.k8s.io/controller-runtime v0.5.6
k8s.io/api v0.20.2
k8s.io/apimachinery v0.20.2
k8s.io/client-go v0.20.2
sigs.k8s.io/controller-runtime v0.8.2
sigs.k8s.io/kustomize/api v0.5.0
sigs.k8s.io/yaml v1.2.0
)
Loading

0 comments on commit ef4e0de

Please sign in to comment.