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

Remove OpenAPI compliance policies #398

Merged
merged 1 commit into from
Dec 19, 2023
Merged

Remove OpenAPI compliance policies #398

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
5 changes: 3 additions & 2 deletions api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

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

10 changes: 6 additions & 4 deletions controllers/clusterprofile_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/klog/v2/klogr"
"k8s.io/klog/v2/textlogger"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -63,7 +63,7 @@ var _ = Describe("ClusterProfile: Reconciler", func() {
BeforeEach(func() {
namespace = "reconcile" + randomString()

logger = klogr.New()
logger = textlogger.NewLogger(textlogger.NewConfig(textlogger.Verbosity(1)))
matchingCluster = &clusterv1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: upstreamClusterNamePrefix + randomString(),
Expand Down Expand Up @@ -126,7 +126,8 @@ var _ = Describe("ClusterProfile: Reconciler", func() {
Expect(err).To(BeNil())

// Only clusterSelector is, so only matchingCluster is a match
matching, err := controllers.GetMatchingClusters(reconciler, context.TODO(), clusterProfileScope, klogr.New())
matching, err := controllers.GetMatchingClusters(reconciler, context.TODO(), clusterProfileScope,
textlogger.NewLogger(textlogger.NewConfig(textlogger.Verbosity(1))))
Expect(err).To(BeNil())
Expect(len(matching)).To(Equal(1))

Expand All @@ -141,7 +142,8 @@ var _ = Describe("ClusterProfile: Reconciler", func() {

// Both clusterSelector (matchingCluster is a match) and ClusterRefs (nonMatchingCluster is referenced) are set
// So two clusters are now matching
matching, err = controllers.GetMatchingClusters(reconciler, context.TODO(), clusterProfileScope, klogr.New())
matching, err = controllers.GetMatchingClusters(reconciler, context.TODO(), clusterProfileScope,
textlogger.NewLogger(textlogger.NewConfig(textlogger.Verbosity(1))))
Expect(err).To(BeNil())
Expect(len(matching)).To(Equal(2))
})
Expand Down
8 changes: 4 additions & 4 deletions controllers/clusterprofile_predicates_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/go-logr/logr"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog/v2/klogr"
"k8s.io/klog/v2/textlogger"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
"sigs.k8s.io/controller-runtime/pkg/event"

Expand All @@ -36,7 +36,7 @@ var _ = Describe("ClusterProfile Predicates: SvelotsClusterPredicates", func() {
var cluster *libsveltosv1alpha1.SveltosCluster

BeforeEach(func() {
logger = klogr.New()
logger = textlogger.NewLogger(textlogger.NewConfig(textlogger.Verbosity(1)))
cluster = &libsveltosv1alpha1.SveltosCluster{
ObjectMeta: metav1.ObjectMeta{
Name: upstreamClusterNamePrefix + randomString(),
Expand Down Expand Up @@ -217,7 +217,7 @@ var _ = Describe("ClusterProfile Predicates: ClusterPredicates", func() {
var cluster *clusterv1.Cluster

BeforeEach(func() {
logger = klogr.New()
logger = textlogger.NewLogger(textlogger.NewConfig(textlogger.Verbosity(1)))
cluster = &clusterv1.Cluster{
ObjectMeta: metav1.ObjectMeta{
Name: upstreamClusterNamePrefix + randomString(),
Expand Down Expand Up @@ -374,7 +374,7 @@ var _ = Describe("ClusterProfile Predicates: MachinePredicates", func() {
var machine *clusterv1.Machine

BeforeEach(func() {
logger = klogr.New()
logger = textlogger.NewLogger(textlogger.NewConfig(textlogger.Verbosity(1)))
machine = &clusterv1.Machine{
ObjectMeta: metav1.ObjectMeta{
Name: upstreamMachineNamePrefix + randomString(),
Expand Down
6 changes: 3 additions & 3 deletions controllers/clusterprofile_transformations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/klog/v2/klogr"
"k8s.io/klog/v2/textlogger"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand All @@ -35,7 +35,7 @@ func (r *ClusterProfileReconciler) requeueClusterProfileForCluster(
) []reconcile.Request {

cluster := o
logger := klogr.New().WithValues(
logger := textlogger.NewLogger(textlogger.NewConfig(textlogger.Verbosity(1))).WithValues(
"objectMapper",
"requeueClusterProfileForCluster",
"namespace",
Expand Down Expand Up @@ -96,7 +96,7 @@ func (r *ClusterProfileReconciler) requeueClusterProfileForMachine(
) []reconcile.Request {

machine := o.(*clusterv1.Machine)
logger := klogr.New().WithValues(
logger := textlogger.NewLogger(textlogger.NewConfig(textlogger.Verbosity(1))).WithValues(
"objectMapper",
"requeueClusterProfileForMachine",
"namespace",
Expand Down
Loading