Merge pull request #147 from contentful-labs/bump_controller_runtime

Bump controller-runtime

config/rbac/leader_election_role.yaml

@@ -30,3 +30,10 @@ rules:
  - events
  verbs:
  - create
+- apiGroups:
+ - coordination.k8s.io
+ resources:
+ - leases
+ verbs:
+ - get
+ - create

config/rbac/role.yaml

@@ -44,3 +44,10 @@ rules:
  - get
  - patch
  - update
+- apiGroups:
+ - coordination.k8s.io
+ resources:
+ - leases
+ verbs:
+ - create
+ - update

controllers/suite_test.go

@@ -43,7 +43,7 @@ import (
  "sigs.k8s.io/controller-runtime/pkg/client"
  "sigs.k8s.io/controller-runtime/pkg/envtest"
  logf "sigs.k8s.io/controller-runtime/pkg/log"
- "sigs.k8s.io/controller-runtime/pkg/log/zap"
+ zap "sigs.k8s.io/controller-runtime/pkg/log/zap"
  // +kubebuilder:scaffold:imports
 )
 
@@ -105,7 +105,7 @@ func TestAPIs(t *testing.T) {
 }
 
 var _ = BeforeSuite(func(done Done) {
- logf.SetLogger(zap.LoggerTo(GinkgoWriter, true))
+ logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter)))
 
  By("bootstrapping test environment")
  testEnv = &envtest.Environment{
@@ -167,7 +167,6 @@ var _ = BeforeSuite(func(done Done) {
  Retry5Cfg := request.WithRetryer(aws.NewConfig(), awsclient.DefaultRetryer{NumMaxRetries: 5})
  err = (&SyncedSecretReconciler{
  Client: k8sManager.GetClient(),
- Ctx: context.Background(),
  Log: ctrl.Log.WithName("controllers").WithName("SyncedSecret"),
  Sess: session.New(Retry5Cfg),
  GetSMClient: func(IAMRole string) (secretsmanageriface.SecretsManagerAPI, error) {

controllers/syncedsecret_controller.go

@@ -49,7 +49,6 @@ type RoleValidator interface {
 // SyncedSecretReconciler reconciles a SyncedSecret object
 type SyncedSecretReconciler struct {
  client.Client
- Ctx context.Context
  Sess *session.Session
  GetSMClient func(string) (secretsmanageriface.SecretsManagerAPI, error)
  poller *secretsmanager.Poller
@@ -75,14 +74,14 @@ const (
 // +kubebuilder:rbac:groups=core,resources=secrets,verbs=get;list;watch;create;update;patch
 // +kubebuilder:rbac:groups=core,resources=namespaces,verbs=get;list;watch
 
-func (r *SyncedSecretReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
+func (r *SyncedSecretReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
  var err error
  var cs secretsv1.SyncedSecret
 
  defer r.updatePrometheus(r.sync_state)
 
  log := r.Log.WithValues(LogFieldSyncedSecret, req.NamespacedName.String())
- if err = r.Get(r.Ctx, req.NamespacedName, &cs); err != nil {
+ if err = r.Get(ctx, req.NamespacedName, &cs); err != nil {
  log.Info("unable to fetch SyncedSecret, was maybe deleted")
  return ctrl.Result{}, nil
  }
@@ -108,23 +107,23 @@ func (r *SyncedSecretReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error
  }
 
  var k8sSecret corev1.Secret = corev1.Secret{}
- err = r.Get(r.Ctx, K8SSecretName, &k8sSecret)
+ err = r.Get(ctx, K8SSecretName, &k8sSecret)
  if err != nil {
  if !k8serrors.IsNotFound(err) {
  r.sync_state[cs.Name] = false
  return ctrl.Result{}, errors.WithMessagef(err, "error retrieving k8s secret %s", K8SSecretName)
  }
 
  // Create the k8S secret if it was not found
- createdSecret, err := r.createK8SSecret(r.Ctx, &cs)
+ createdSecret, err := r.createK8SSecret(ctx, &cs)
  if err != nil {
  r.sync_state[cs.Name] = false
  return ctrl.Result{}, errors.WithMessagef(err, "failed creating K8S Secret %s", K8SSecretName)
  }
  log.Info("created k8s secret", "K8SSecret", createdSecret)
  } else {
  // Update the K8S Secret if it already exists
- updatedSecret, err := r.updateK8SSecret(r.Ctx, &cs)
+ updatedSecret, err := r.updateK8SSecret(ctx, &cs)
  if err != nil {
  r.sync_state[cs.Name] = false
  return ctrl.Result{}, errors.WithMessagef(err, "failed updating k8s secret %s", K8SSecretName)
@@ -134,7 +133,7 @@ func (r *SyncedSecretReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error
  }
  }
 
- if err = r.updateCSStatus(r.Ctx, &cs); err != nil {
+ if err = r.updateCSStatus(ctx, &cs); err != nil {
  r.sync_state[cs.Name] = false
  log.Error(err, "failed to update SyncedSecret status")
  return ctrl.Result{}, errors.WithMessagef(err, "failed to update SyncedSecret status for %s", K8SSecretName)

go.mod

@@ -5,70 +5,81 @@ go 1.20
 require (
  github.com/Masterminds/sprig v2.22.0+incompatible
  github.com/aws/aws-sdk-go v1.48.15
- github.com/go-logr/logr v0.1.0
+ github.com/go-logr/logr v1.3.0
  github.com/hashicorp/golang-lru v0.5.4
- github.com/onsi/ginkgo v1.14.2
- github.com/onsi/gomega v1.10.5
+ github.com/onsi/ginkgo v1.16.5
+ github.com/onsi/gomega v1.20.1
  github.com/pkg/errors v0.9.1
- github.com/prometheus/client_golang v1.11.1
- go.uber.org/zap v1.16.0
- k8s.io/api v0.18.6
- k8s.io/apimachinery v0.18.6
- k8s.io/client-go v0.18.6
- sigs.k8s.io/controller-runtime v0.6.4
+ github.com/prometheus/client_golang v1.12.2
+ go.uber.org/zap v1.21.0
+ k8s.io/api v0.25.15
+ k8s.io/apimachinery v0.25.15
+ k8s.io/client-go v0.25.15
+ sigs.k8s.io/controller-runtime v0.13.2
 )
 
 require (
- cloud.google.com/go v0.38.0 // indirect
+ cloud.google.com/go v0.97.0 // indirect
  github.com/Masterminds/goutils v1.1.1 // indirect
  github.com/Masterminds/semver v1.5.0 // indirect
+ github.com/PuerkitoBio/purell v1.1.1 // indirect
+ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
- github.com/cespare/xxhash/v2 v2.1.1 // indirect
+ github.com/cespare/xxhash/v2 v2.1.2 // indirect
  github.com/davecgh/go-spew v1.1.1 // indirect
- github.com/evanphx/json-patch v4.9.0+incompatible // indirect
- github.com/fsnotify/fsnotify v1.4.9 // indirect
- github.com/go-logr/zapr v0.1.0 // indirect
- github.com/gogo/protobuf v1.3.1 // indirect
- github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
- github.com/golang/protobuf v1.4.3 // indirect
- github.com/google/go-cmp v0.5.5 // indirect
+ github.com/emicklei/go-restful/v3 v3.8.0 // indirect
+ github.com/evanphx/json-patch/v5 v5.6.0 // indirect
+ github.com/fsnotify/fsnotify v1.5.4 // indirect
+ github.com/go-logr/zapr v1.2.3 // indirect
+ github.com/go-openapi/jsonpointer v0.19.5 // indirect
+ github.com/go-openapi/jsonreference v0.19.5 // indirect
+ github.com/go-openapi/swag v0.19.14 // indirect
+ github.com/gogo/protobuf v1.3.2 // indirect
+ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+ github.com/golang/protobuf v1.5.2 // indirect
+ github.com/google/gnostic v0.5.7-v3refs // indirect
+ github.com/google/go-cmp v0.5.8 // indirect
  github.com/google/gofuzz v1.1.0 // indirect
- github.com/google/uuid v1.1.1 // indirect
- github.com/googleapis/gnostic v0.3.1 // indirect
+ github.com/google/uuid v1.3.0 // indirect
  github.com/huandu/xstrings v1.3.0 // indirect
- github.com/imdario/mergo v0.3.9 // indirect
+ github.com/imdario/mergo v0.3.12 // indirect
  github.com/jmespath/go-jmespath v0.4.0 // indirect
- github.com/json-iterator/go v1.1.11 // indirect
- github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+ github.com/josharian/intern v1.0.0 // indirect
+ github.com/json-iterator/go v1.1.12 // indirect
+ github.com/mailru/easyjson v0.7.6 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
  github.com/mitchellh/copystructure v1.0.0 // indirect
  github.com/mitchellh/reflectwalk v1.0.0 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
- github.com/modern-go/reflect2 v1.0.1 // indirect
- github.com/nxadm/tail v1.4.4 // indirect
+ github.com/modern-go/reflect2 v1.0.2 // indirect
+ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+ github.com/nxadm/tail v1.4.8 // indirect
  github.com/prometheus/client_model v0.2.0 // indirect
- github.com/prometheus/common v0.26.0 // indirect
- github.com/prometheus/procfs v0.6.0 // indirect
+ github.com/prometheus/common v0.32.1 // indirect
+ github.com/prometheus/procfs v0.7.3 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
- go.uber.org/atomic v1.6.0 // indirect
- go.uber.org/multierr v1.5.0 // indirect
+ go.uber.org/atomic v1.7.0 // indirect
+ go.uber.org/multierr v1.6.0 // indirect
  golang.org/x/crypto v0.14.0 // indirect
  golang.org/x/net v0.17.0 // indirect
- golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
+ golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
  golang.org/x/sys v0.13.0 // indirect
  golang.org/x/term v0.13.0 // indirect
  golang.org/x/text v0.13.0 // indirect
- golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
- gomodules.xyz/jsonpatch/v2 v2.0.1 // indirect
- google.golang.org/appengine v1.5.0 // indirect
- google.golang.org/protobuf v1.26.0-rc.1 // indirect
+ golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
+ gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
+ google.golang.org/appengine v1.6.7 // indirect
+ google.golang.org/protobuf v1.28.0 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
  gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
- gopkg.in/yaml.v2 v2.3.0 // indirect
- k8s.io/apiextensions-apiserver v0.18.6 // indirect
- k8s.io/klog v1.0.0 // indirect
- k8s.io/klog/v2 v2.0.0 // indirect
- k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 // indirect
- k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 // indirect
- sigs.k8s.io/structured-merge-diff/v3 v3.0.0 // indirect
- sigs.k8s.io/yaml v1.2.0 // indirect
+ gopkg.in/yaml.v2 v2.4.0 // indirect
+ gopkg.in/yaml.v3 v3.0.1 // indirect
+ k8s.io/apiextensions-apiserver v0.25.15 // indirect
+ k8s.io/component-base v0.25.15 // indirect
+ k8s.io/klog/v2 v2.70.1 // indirect
+ k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
+ k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
+ sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+ sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
+ sigs.k8s.io/yaml v1.3.0 // indirect
 )