File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -26,13 +26,12 @@ import (
2626 networkingv1 "k8s.io/api/networking/v1"
2727 apimeta "k8s.io/apimachinery/pkg/api/meta"
2828 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
29- "sigs.k8s.io/controller-runtime/pkg/predicate"
30-
3129 "k8s.io/apimachinery/pkg/runtime"
3230 "k8s.io/apimachinery/pkg/types"
3331 ctrl "sigs.k8s.io/controller-runtime"
3432 "sigs.k8s.io/controller-runtime/pkg/client"
3533 "sigs.k8s.io/controller-runtime/pkg/log"
34+ "sigs.k8s.io/controller-runtime/pkg/predicate"
3635
3736 teranodev1alpha1 "github.com/bsv-blockchain/teranode-operator/api/v1alpha1"
3837 "github.com/bsv-blockchain/teranode-operator/internal/utils"
Original file line number Diff line number Diff line change @@ -19,12 +19,13 @@ package controller
1919import (
2020 "context"
2121
22- teranodev1alpha1 "github.com/bsv-blockchain/teranode-operator/api/v1alpha1"
2322 . "github.com/onsi/ginkgo/v2"
2423 . "github.com/onsi/gomega"
2524 "k8s.io/apimachinery/pkg/api/errors"
2625 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2726 "k8s.io/apimachinery/pkg/types"
27+
28+ teranodev1alpha1 "github.com/bsv-blockchain/teranode-operator/api/v1alpha1"
2829)
2930
3031var _ = Describe ("BlockValidator Controller" , func () {
Original file line number Diff line number Diff line change @@ -20,19 +20,17 @@ import (
2020 "context"
2121 "time"
2222
23+ "github.com/go-logr/logr"
2324 corev1 "k8s.io/api/core/v1"
24- "sigs.k8s.io/controller-runtime/pkg/predicate"
25-
2625 networkingv1 "k8s.io/api/networking/v1"
27-
28- "github.com/go-logr/logr"
2926 apimeta "k8s.io/apimachinery/pkg/api/meta"
3027 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3128 "k8s.io/apimachinery/pkg/runtime"
3229 "k8s.io/apimachinery/pkg/types"
3330 ctrl "sigs.k8s.io/controller-runtime"
3431 "sigs.k8s.io/controller-runtime/pkg/client"
3532 "sigs.k8s.io/controller-runtime/pkg/log"
33+ "sigs.k8s.io/controller-runtime/pkg/predicate"
3634
3735 teranodev1alpha1 "github.com/bsv-blockchain/teranode-operator/api/v1alpha1"
3836 "github.com/bsv-blockchain/teranode-operator/internal/utils"
Original file line number Diff line number Diff line change 88// Only fields explicitly set in clusterOverrides will override the target
99//
1010//nolint:gocognit,gocyclo // Function complexity is inherent to handling multiple override fields
11- func mergeDeploymentOverrides (target * teranodev1alpha1. DeploymentOverrides , clusterOverrides * teranodev1alpha1.DeploymentOverrides ) {
11+ func mergeDeploymentOverrides (target , clusterOverrides * teranodev1alpha1.DeploymentOverrides ) {
1212 if clusterOverrides .Replicas != nil {
1313 target .Replicas = clusterOverrides .Replicas
1414 }
Original file line number Diff line number Diff line change @@ -26,14 +26,12 @@ import (
2626 networkingv1 "k8s.io/api/networking/v1"
2727 apimeta "k8s.io/apimachinery/pkg/api/meta"
2828 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
29-
30- "sigs.k8s.io/controller-runtime/pkg/predicate"
31-
3229 "k8s.io/apimachinery/pkg/runtime"
3330 "k8s.io/apimachinery/pkg/types"
3431 ctrl "sigs.k8s.io/controller-runtime"
3532 "sigs.k8s.io/controller-runtime/pkg/client"
3633 "sigs.k8s.io/controller-runtime/pkg/log"
34+ "sigs.k8s.io/controller-runtime/pkg/predicate"
3735
3836 teranodev1alpha1 "github.com/bsv-blockchain/teranode-operator/api/v1alpha1"
3937 "github.com/bsv-blockchain/teranode-operator/internal/utils"
Original file line number Diff line number Diff line change @@ -25,13 +25,12 @@ import (
2525 corev1 "k8s.io/api/core/v1"
2626 apimeta "k8s.io/apimachinery/pkg/api/meta"
2727 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
28- "k8s.io/apimachinery/pkg/types"
29- "sigs.k8s.io/controller-runtime/pkg/predicate"
30-
3128 "k8s.io/apimachinery/pkg/runtime"
29+ "k8s.io/apimachinery/pkg/types"
3230 ctrl "sigs.k8s.io/controller-runtime"
3331 "sigs.k8s.io/controller-runtime/pkg/client"
3432 "sigs.k8s.io/controller-runtime/pkg/log"
33+ "sigs.k8s.io/controller-runtime/pkg/predicate"
3534
3635 teranodev1alpha1 "github.com/bsv-blockchain/teranode-operator/api/v1alpha1"
3736 "github.com/bsv-blockchain/teranode-operator/internal/utils"
You can’t perform that action at this time.
0 commit comments