Skip to content

Commit 7c93d1a

Browse files
committed
lint fixes
1 parent 3734433 commit 7c93d1a

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

internal/controllers/storage/controller_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,6 @@ var _ = Describe("Storage controller medium tests", func() {
494494
}
495495

496496
for _, initContainer := range statefulSet.Spec.Template.Spec.InitContainers {
497-
498497
if initContainer.Name == "ydb-storage-init-container" {
499498
return false, nil
500499
}

internal/resources/database_statefulset.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1212
"k8s.io/apimachinery/pkg/util/intstr"
1313
"k8s.io/client-go/rest"
14-
"k8s.io/utils/pointer"
14+
utilptr "k8s.io/utils/ptr"
1515
"sigs.k8s.io/controller-runtime/pkg/client"
1616

1717
api "github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
@@ -160,7 +160,7 @@ func (b *DatabaseStatefulSetBuilder) buildPodTemplateSpec() corev1.PodTemplateSp
160160
// InitContainer only needed for CaBundle manipulation for now,
161161
// may be probably used for other stuff later
162162
generateCABundleContainerEnabled := b.Spec.GenerateCABundleContainer == nil ||
163-
pointer.BoolDeref(b.Spec.GenerateCABundleContainer.Enabled, true)
163+
utilptr.Deref(b.Spec.GenerateCABundleContainer.Enabled, true)
164164
if b.AnyCertificatesAdded() && generateCABundleContainerEnabled {
165165
podTemplate.Spec.InitContainers = append(
166166
[]corev1.Container{b.buildCaStorePatchingInitContainer()},

internal/resources/storage_init_job.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
batchv1 "k8s.io/api/batch/v1"
88
corev1 "k8s.io/api/core/v1"
99
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
10-
"k8s.io/utils/pointer"
10+
utilptr "k8s.io/utils/ptr"
1111
"sigs.k8s.io/controller-runtime/pkg/client"
1212

1313
api "github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
@@ -96,7 +96,7 @@ func (b *StorageInitJobBuilder) buildInitJobPodTemplateSpec() corev1.PodTemplate
9696

9797
// append an init container for updating the ca.crt if we have any certificates
9898
generateCABundleContainerEnabled := b.Spec.GenerateCABundleContainer == nil ||
99-
pointer.BoolDeref(b.Spec.GenerateCABundleContainer.Enabled, true)
99+
utilptr.Deref(b.Spec.GenerateCABundleContainer.Enabled, true)
100100
if b.AnyCertificatesAdded() && generateCABundleContainerEnabled {
101101
podTemplate.Spec.InitContainers = append(
102102
[]corev1.Container{b.buildCaStorePatchingInitContainer()},

internal/resources/storage_statefulset.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1111
"k8s.io/apimachinery/pkg/util/intstr"
1212
"k8s.io/client-go/rest"
13-
"k8s.io/utils/pointer"
13+
utilptr "k8s.io/utils/ptr"
1414
"sigs.k8s.io/controller-runtime/pkg/client"
1515

1616
api "github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
@@ -148,7 +148,7 @@ func (b *StorageStatefulSetBuilder) buildPodTemplateSpec() corev1.PodTemplateSpe
148148
// InitContainer only needed for CaBundle manipulation for now,
149149
// may be probably used for other stuff later
150150
generateCABundleContainerEnabled := b.Spec.GenerateCABundleContainer == nil ||
151-
pointer.BoolDeref(b.Spec.GenerateCABundleContainer.Enabled, true)
151+
utilptr.Deref(b.Spec.GenerateCABundleContainer.Enabled, true)
152152
if b.AnyCertificatesAdded() && generateCABundleContainerEnabled {
153153
podTemplate.Spec.InitContainers = append(
154154
[]corev1.Container{b.buildCaStorePatchingInitContainer()},

0 commit comments

Comments
 (0)