Update controller-runtime and controller-gen to v0.9.0

- Bump controller-runtime  to v0.9.0
- Bump controller-gen to v0.5.0
- Bump kubebuilder to 3.1.0
- Use Environment.AddUser to generate the envtest cluster admin kubeconfig

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>

.github/workflows/e2e.yaml

@@ -29,6 +29,8 @@ jobs:
  uses: fluxcd/pkg//actions/kustomize@main
  - name: Setup Kubebuilder
  uses: fluxcd/pkg//actions/kubebuilder@main
+ with:
+ version: 3.1.0
  - name: Setup Kubectl
  uses: fluxcd/pkg/actions/kubectl@main
  with:

Makefile

@@ -107,7 +107,7 @@ ifeq (, $(shell which controller-gen))
  CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
  cd $$CONTROLLER_GEN_TMP_DIR ;\
  go mod init tmp ;\
- go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1 ;\
+ go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.5.0 ;\
  rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
  }
 CONTROLLER_GEN=$(GOBIN)/controller-gen

api/go.mod

@@ -6,7 +6,7 @@ require (
  github.com/fluxcd/pkg/apis/kustomize v0.0.1
  github.com/fluxcd/pkg/apis/meta v0.9.0
  github.com/fluxcd/pkg/runtime v0.11.0
- k8s.io/apiextensions-apiserver v0.20.4
- k8s.io/apimachinery v0.20.4
- sigs.k8s.io/controller-runtime v0.8.3
+ k8s.io/apiextensions-apiserver v0.21.1
+ k8s.io/apimachinery v0.21.1
+ sigs.k8s.io/controller-runtime v0.9.0
 )

controllers/kustomization_controller_test.go

@@ -36,8 +36,6 @@ import (
  apimeta "k8s.io/apimachinery/pkg/api/meta"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
  "k8s.io/apimachinery/pkg/types"
- "k8s.io/client-go/tools/clientcmd"
- clientcmdapi "k8s.io/client-go/tools/clientcmd/api"
  "sigs.k8s.io/controller-runtime/pkg/client"
 
  "github.com/fluxcd/pkg/apis/meta"
@@ -366,29 +364,12 @@ spec:
 })
 
 func kubeConfigSecret() (*corev1.Secret, error) {
- c := clientcmdapi.NewConfig()
- c.CurrentContext = "default"
- c.Clusters["default"] = &clientcmdapi.Cluster{
- Server: cfg.Host,
- }
- c.Contexts["default"] = &clientcmdapi.Context{
- Cluster: "default",
- Namespace: "default",
- AuthInfo: "default",
- }
- c.AuthInfos["default"] = &clientcmdapi.AuthInfo{
- Token: cfg.BearerToken,
- }
- cb, err := clientcmd.Write(*c)
- if err != nil {
- return nil, err
- }
  return &corev1.Secret{
  ObjectMeta: metav1.ObjectMeta{
  Name: "kubeconfig",
  },
  Data: map[string][]byte{
- "value": cb,
+ "value": kubeConfig,
  },
  }, nil
 }

controllers/suite_test.go

@@ -46,6 +46,7 @@ var cfg *rest.Config
 var k8sClient client.Client
 var k8sManager ctrl.Manager
 var testEnv *envtest.Environment
+var kubeConfig []byte
 
 func TestAPIs(t *testing.T) {
  RegisterFailHandler(Fail)
@@ -77,6 +78,15 @@ var _ = BeforeSuite(func(done Done) {
  Expect(err).ToNot(HaveOccurred())
  Expect(cfg).ToNot(BeNil())
 
+ user, err := testEnv.ControlPlane.AddUser(envtest.User{
+ Name: "envtest-admin",
+ Groups: []string{"system:masters"},
+ }, nil)
+ Expect(err).ToNot(HaveOccurred())
+
+ kubeConfig, err = user.KubeConfig()
+ Expect(err).ToNot(HaveOccurred())
+
  err = kustomizev1.AddToScheme(scheme.Scheme)
  Expect(err).NotTo(HaveOccurred())
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/fluxcd/kustomize-controller
 
-go 1.15
+go 1.16
 
 replace github.com/fluxcd/kustomize-controller/api => ./api
 
@@ -21,8 +21,8 @@ require (
  github.com/hashicorp/go-retryablehttp v0.6.8
  github.com/howeyc/gopass v0.0.0-20170109162249-bf9dde6d0d2c
  github.com/mattn/go-colorable v0.1.4 // indirect
- github.com/onsi/ginkgo v1.16.2
- github.com/onsi/gomega v1.12.0
+ github.com/onsi/ginkgo v1.16.4
+ github.com/onsi/gomega v1.13.0
  github.com/spf13/pflag v1.0.5
  go.mozilla.org/gopgagent v0.0.0-20170926210634-4d7ea76ff71a
  go.mozilla.org/sops/v3 v3.7.1
@@ -35,7 +35,7 @@ require (
  k8s.io/apimachinery v0.21.1
  k8s.io/client-go v0.21.1
  sigs.k8s.io/cli-utils v0.25.1-0.20210603052138-670dee18a123
- sigs.k8s.io/controller-runtime v0.9.0-beta.5.0.20210524185538-7181f1162e79
+ sigs.k8s.io/controller-runtime v0.9.0
  sigs.k8s.io/kustomize/api v0.8.10
  sigs.k8s.io/yaml v1.2.0
 )
@@ -44,7 +44,7 @@ require (
 // *resultAdapter does not implement metrics.ResultMetric (wrong type for Increment method)
 // have Increment(string, string, string)
 // want Increment(context.Context, string, string, string)
-replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.9.0-beta.5
+replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.9.0
 
 // pin kustomize to v4.1.3
 replace (