CadolesKube/hydra-maester
7
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

build: update CRDs and k8s dependencies (#68)

Browse Source
This commit is contained in:
Julia Iskierka
2021-05-10 10:35:08 +02:00
committed by GitHub
parent 3fa0cc3b66
commit 9b8f463527
12 changed files with 904 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
controllers/oauth2client_controller.go
View File

@ -67,8 +67,7 @@ type OAuth2ClientReconciler struct {
// +kubebuilder:rbac:groups=hydra.ory.sh,resources=oauth2clients/status,verbs=get;update;patch
// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;create;update;patch;delete
func (r *OAuth2ClientReconciler) Reconcile(req ctrl.Request) (ctrl.Result, error) {
ctx := context.Background()
func (r *OAuth2ClientReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
_ = r.Log.WithValues("oauth2client", req.NamespacedName)
var oauth2client hydrav1alpha1.OAuth2Client

35
controllers/oauth2client_controller_integration_test.go
View File

@ -55,7 +55,7 @@ var _ = Describe("OAuth2Client Controller", func() {
// Setup the Manager and Controller. Wrap the Controller Reconcile function so it writes each request to a
// channel when it is finished.
mgr, err := manager.New(cfg, manager.Options{Scheme: s})
mgr, err := manager.New(cfg, manager.Options{Scheme: s, MetricsBindAddress: ":8080"})
Expect(err).NotTo(HaveOccurred())
c := mgr.GetClient()
@ -83,7 +83,7 @@ var _ = Describe("OAuth2Client Controller", func() {
Expect(add(mgr, recFn)).To(Succeed())
//Start the manager and the controller
stopMgr, mgrStopped := StartTestManager(mgr)
stopMgr := StartTestManager(mgr)
instance := testInstance(tstName, tstSecretName)
err = c.Create(context.TODO(), instance)
@ -117,8 +117,7 @@ var _ = Describe("OAuth2Client Controller", func() {
c.Delete(context.TODO(), instance)
//Ensure manager is stopped properly
close(stopMgr)
mgrStopped.Wait()
stopMgr.Done()
})
It("update object status if the call failed", func() {
@ -135,7 +134,7 @@ var _ = Describe("OAuth2Client Controller", func() {
// Setup the Manager and Controller. Wrap the Controller Reconcile function so it writes each request to a
// channel when it is finished.
mgr, err := manager.New(cfg, manager.Options{Scheme: s})
mgr, err := manager.New(cfg, manager.Options{Scheme: s, MetricsBindAddress: ":8081"})
Expect(err).NotTo(HaveOccurred())
c := mgr.GetClient()
@ -150,7 +149,7 @@ var _ = Describe("OAuth2Client Controller", func() {
Expect(add(mgr, recFn)).To(Succeed())
//Start the manager and the controller
stopMgr, mgrStopped := StartTestManager(mgr)
stopMgr := StartTestManager(mgr)
instance := testInstance(tstName, tstSecretName)
err = c.Create(context.TODO(), instance)
@ -183,8 +182,7 @@ var _ = Describe("OAuth2Client Controller", func() {
c.Delete(context.TODO(), instance)
//Ensure manager is stopped properly
close(stopMgr)
mgrStopped.Wait()
stopMgr.Done()
})
It("use provided Secret if it exists", func() {
@ -202,7 +200,7 @@ var _ = Describe("OAuth2Client Controller", func() {
// Setup the Manager and Controller. Wrap the Controller Reconcile function so it writes each request to a
// channel when it is finished.
mgr, err := manager.New(cfg, manager.Options{Scheme: s})
mgr, err := manager.New(cfg, manager.Options{Scheme: s, MetricsBindAddress: ":8082"})
Expect(err).NotTo(HaveOccurred())
c := mgr.GetClient()
@ -232,7 +230,7 @@ var _ = Describe("OAuth2Client Controller", func() {
Expect(add(mgr, recFn)).To(Succeed())
//Start the manager and the controller
stopMgr, mgrStopped := StartTestManager(mgr)
stopMgr := StartTestManager(mgr)
//ensure secret exists
secret := apiv1.Secret{
@ -280,8 +278,7 @@ var _ = Describe("OAuth2Client Controller", func() {
c.Delete(context.TODO(), instance)
//Ensure manager is stopped properly
close(stopMgr)
mgrStopped.Wait()
stopMgr.Done()
})
It("update object status if provided Secret is invalid", func() {
@ -298,7 +295,7 @@ var _ = Describe("OAuth2Client Controller", func() {
// Setup the Manager and Controller. Wrap the Controller Reconcile function so it writes each request to a
// channel when it is finished.
mgr, err := manager.New(cfg, manager.Options{Scheme: s})
mgr, err := manager.New(cfg, manager.Options{Scheme: s, MetricsBindAddress: ":8083"})
Expect(err).NotTo(HaveOccurred())
c := mgr.GetClient()
@ -312,7 +309,7 @@ var _ = Describe("OAuth2Client Controller", func() {
Expect(add(mgr, recFn)).To(Succeed())
//Start the manager and the controller
stopMgr, mgrStopped := StartTestManager(mgr)
stopMgr := StartTestManager(mgr)
//ensure invalid secret exists
secret := apiv1.Secret{
@ -352,8 +349,7 @@ var _ = Describe("OAuth2Client Controller", func() {
c.Delete(context.TODO(), instance)
//Ensure manager is stopped properly
close(stopMgr)
mgrStopped.Wait()
stopMgr.Done()
})
It("tolerate nil client_secret if tokenEndpointAuthMethod is none", func() {
@ -369,7 +365,7 @@ var _ = Describe("OAuth2Client Controller", func() {
// Setup the Manager and Controller. Wrap the Controller Reconcile function so it writes each request to a
// channel when it is finished.
mgr, err := manager.New(cfg, manager.Options{Scheme: s})
mgr, err := manager.New(cfg, manager.Options{Scheme: s, MetricsBindAddress: ":8085"})
Expect(err).NotTo(HaveOccurred())
c := mgr.GetClient()
@ -397,7 +393,7 @@ var _ = Describe("OAuth2Client Controller", func() {
Expect(add(mgr, recFn)).To(Succeed())
//Start the manager and the controller
stopMgr, mgrStopped := StartTestManager(mgr)
stopMgr := StartTestManager(mgr)
instance := testInstance(tstName, tstSecretName)
instance.Spec.TokenEndpointAuthMethod = "none"
@ -432,8 +428,7 @@ var _ = Describe("OAuth2Client Controller", func() {
c.Delete(context.TODO(), instance)
//Ensure manager is stopped properly
close(stopMgr)
mgrStopped.Wait()
stopMgr.Done()
})
})
})

23
controllers/suite_test.go
View File

@ -16,8 +16,8 @@ limitations under the License.
package controllers_test
import (
"context"
"path/filepath"
"sync"
"testing"
. "github.com/onsi/ginkgo"
@ -46,11 +46,11 @@ func TestAPIs(t *testing.T) {
RunSpecsWithDefaultAndCustomReporters(t,
"Controller Suite",
[]Reporter{envtest.NewlineReporter{}})
[]Reporter{})
}
var _ = BeforeSuite(func(done Done) {
logf.SetLogger(zap.LoggerTo(GinkgoWriter, true))
logf.SetLogger(zap.New(zap.UseDevMode(true), zap.WriteTo(GinkgoWriter)))
By("bootstrapping test environment")
testEnv = &envtest.Environment{
@ -81,8 +81,8 @@ var _ = AfterSuite(func() {
// writes the request to requests after Reconcile is finished.
func SetupTestReconcile(inner reconcile.Reconciler) (reconcile.Reconciler, chan reconcile.Request) {
requests := make(chan reconcile.Request)
fn := reconcile.Func(func(req reconcile.Request) (reconcile.Result, error) {
result, err := inner.Reconcile(req)
fn := reconcile.Func(func(ctx context.Context, req reconcile.Request) (reconcile.Result, error) {
result, err := inner.Reconcile(ctx, req)
requests <- req
return result, err
})
@ -90,13 +90,12 @@ func SetupTestReconcile(inner reconcile.Reconciler) (reconcile.Reconciler, chan
}
// StartTestManager adds recFn
func StartTestManager(mgr manager.Manager) (chan struct{}, *sync.WaitGroup) {
stop := make(chan struct{})
wg := &sync.WaitGroup{}
wg.Add(1)
func StartTestManager(mgr manager.Manager) context.Context {
ctx := context.Background()
go func() {
defer wg.Done()
Expect(mgr.Start(stop)).NotTo(HaveOccurred())
defer ctx.Done()
Expect(mgr.Start(ctx)).NotTo(HaveOccurred())
}()
return stop, wg
return ctx
}