Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump controller runtime to 0.17 #124

Merged
merged 1 commit into from
May 14, 2024
Merged

Bump controller runtime to 0.17 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 76 additions & 0 deletions controllers/controllersfakes/fake_manager.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions controllers/promiserelease_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,6 @@ var _ = Describe("PromiseReleaseController", func() {
BeforeEach(func() {
promiseNamespacedName = types.NamespacedName{
Name: promise.Name,
// Note: Promise is cluster-scoped
}

fakeK8sClient = &mockPromiseCtrlRuntimeClient{
Expand Down Expand Up @@ -312,7 +311,7 @@ var _ = Describe("PromiseReleaseController", func() {
_, err := t.reconcileUntilCompletion(reconciler, &promiseRelease)
Expect(err).To(HaveOccurred())
Expect(eventRecorder.Events).To(Receive(ContainSubstring(
fmt.Sprintf("Promise.platform.kratix.io %q is invalid", promise.Name)),
fmt.Sprintf("%q is invalid", promise.Name)),
))
})

Expand Down Expand Up @@ -502,7 +501,7 @@ var _ = Describe("PromiseReleaseController", func() {
_, err := t.reconcileUntilCompletion(reconciler, &promiseRelease)
Expect(err).To(HaveOccurred())
Expect(<-eventRecorder.Events).To(ContainSubstring(
fmt.Sprintf("Promise.platform.kratix.io %q is invalid", promise.Name)),
fmt.Sprintf("%q is invalid", promise.Name)),
)
})

Expand Down
38 changes: 25 additions & 13 deletions controllers/work_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package controllers_test
import (
"context"
"errors"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
Expand Down Expand Up @@ -59,19 +60,30 @@ var _ = Describe("WorkReconciler", func() {
Name: workResourceName,
Namespace: "default",
}
work = &v1alpha1.Work{}
work.Name = workResourceName
work.Namespace = "default"
work.Spec.Replicas = v1alpha1.ResourceRequestReplicas
work.Spec.WorkloadGroups = []v1alpha1.WorkloadGroup{
{
ID: hash.ComputeHash("."),
Workloads: []v1alpha1.Workload{
{
Content: "{someApi: foo, someValue: bar}",
},
{
Content: "{someApi: baz, someValue: bat}",
work = &v1alpha1.Work{
TypeMeta: v1.TypeMeta{
Kind: "work",
APIVersion: "platform.kratix.io/v1alpha1",
},
ObjectMeta: v1.ObjectMeta{
Name: workResourceName,
Namespace: "default",
},
Spec: v1alpha1.WorkSpec{
Replicas: v1alpha1.ResourceRequestReplicas,
WorkloadCoreFields: v1alpha1.WorkloadCoreFields{
WorkloadGroups: []v1alpha1.WorkloadGroup{
{
ID: hash.ComputeHash("."),
Workloads: []v1alpha1.Workload{
{
Content: "{someApi: foo, someValue: bar}",
},
{
Content: "{someApi: baz, someValue: bat}",
},
},
},
},
},
},
Expand Down
48 changes: 24 additions & 24 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ go 1.22

require (
github.com/go-git/go-git/v5 v5.11.0
github.com/go-logr/logr v1.3.0
github.com/go-logr/logr v1.4.1
github.com/google/uuid v1.6.0
github.com/minio/minio-go/v7 v7.0.68
github.com/onsi/ginkgo/v2 v2.13.2
github.com/onsi/ginkgo/v2 v2.14.0
github.com/onsi/gomega v1.30.0
github.com/pkg/errors v0.9.1
go.uber.org/zap v1.25.0
go.uber.org/zap v1.26.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.28.3
k8s.io/apiextensions-apiserver v0.28.3
k8s.io/apimachinery v0.28.3
k8s.io/client-go v0.28.3
k8s.io/api v0.29.2
k8s.io/apiextensions-apiserver v0.29.2
k8s.io/apimachinery v0.29.2
k8s.io/client-go v0.29.2
sigs.k8s.io/cluster-api v1.5.0
sigs.k8s.io/controller-runtime v0.16.3
sigs.k8s.io/yaml v1.3.0
sigs.k8s.io/controller-runtime v0.17.5
sigs.k8s.io/yaml v1.4.0
)

require (
Expand All @@ -36,11 +36,11 @@ require (
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
github.com/go-git/go-billy/v5 v5.5.0 // indirect
github.com/go-logr/zapr v1.2.4 // indirect
github.com/go-logr/zapr v1.3.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
Expand All @@ -61,17 +61,17 @@ require (
github.com/klauspost/compress v1.17.6 // indirect
github.com/klauspost/cpuid/v2 v2.2.6 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/minio/md5-simd v1.1.2 // indirect
github.com/minio/sha256-simd v1.0.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/prometheus/client_golang v1.18.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/rs/xid v1.5.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/skeema/knownhosts v1.2.1 // indirect
Expand All @@ -82,23 +82,23 @@ require (
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.15.0 // indirect
golang.org/x/tools v0.17.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/component-base v0.28.3 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
k8s.io/component-base v0.29.2 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)
Loading