Skip to content

Commit 6a1aeec

Browse files
kobzonegakobzonega
committed
rename import package to ydbannotations
1 parent e04d41f commit 6a1aeec

File tree

18 files changed

+103
-104
lines changed

18 files changed

+103
-104
lines changed

‎internal/annotations/annotations.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ var (
3636
type Annotations map[string]string
3737

3838
func Common(objAnnotations Annotations) Annotations {
39-
an := Annotations{}
39+
annotations := Annotations{}
4040

41-
an.Merge(getSupportedAnnotations(objAnnotations))
41+
annotations.Merge(getSupportedAnnotations(objAnnotations))
4242

43-
return an
43+
return annotations
4444
}
4545

4646
func (an Annotations) Merge(other map[string]string) map[string]string {

‎internal/annotations/annotations_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import (
55

66
. "github.com/onsi/ginkgo/v2"
77
. "github.com/onsi/gomega"
8-
9-
"github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
8+
ydbannotations "github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
109
)
1110

1211
func TestLabels(t *testing.T) {
@@ -16,12 +15,12 @@ func TestLabels(t *testing.T) {
1615

1716
var _ = Describe("Testing annotations", func() {
1817
It("merges two sets of annotations", func() {
19-
fstLabels := annotations.Annotations{
18+
fstLabels := ydbannotations.Annotations{
2019
"a": "a",
2120
"b": "b",
2221
}
2322

24-
sndLabels := annotations.Annotations{
23+
sndLabels := ydbannotations.Annotations{
2524
"c": "c",
2625
"d": "d",
2726
}
@@ -35,7 +34,7 @@ var _ = Describe("Testing annotations", func() {
3534
})
3635

3736
It("sets correct defaults", func() {
38-
Expect(annotations.Common(map[string]string{
37+
Expect(ydbannotations.Common(map[string]string{
3938
"ydb.tech/skip-initialization": "true",
4039
"ydb.tech/node-host": "ydb-testing.k8s-c.yandex.net",
4140
"ydb.tech/last-applied": "some-body",

‎internal/controllers/remotedatabasenodeset/controller.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"sigs.k8s.io/controller-runtime/pkg/source"
2424

2525
"github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
26-
"github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
26+
ydbannotations "github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
2727
. "github.com/ydb-platform/ydb-kubernetes-operator/internal/controllers/constants" //nolint:revive,stylecheck
2828
"github.com/ydb-platform/ydb-kubernetes-operator/internal/labels"
2929
"github.com/ydb-platform/ydb-kubernetes-operator/internal/resources"
@@ -118,8 +118,8 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager, remoteCluster *cluster.C
118118
annotationFilter := func(mapObj client.Object) []reconcile.Request {
119119
requests := make([]reconcile.Request, 0)
120120

121-
an := mapObj.GetAnnotations()
122-
primaryResourceName, exist := an[annotations.PrimaryResourceDatabase]
121+
annotations := mapObj.GetAnnotations()
122+
primaryResourceName, exist := annotations[ydbannotations.PrimaryResourceDatabase]
123123
if exist {
124124
databaseNodeSets := &v1alpha1.DatabaseNodeSetList{}
125125
if err := r.Client.List(

‎internal/controllers/remotedatabasenodeset/controller_test.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626

2727
"github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
2828
testobjects "github.com/ydb-platform/ydb-kubernetes-operator/e2e/tests/test-objects"
29-
"github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
29+
ydbannotations "github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
3030
. "github.com/ydb-platform/ydb-kubernetes-operator/internal/controllers/constants"
3131
"github.com/ydb-platform/ydb-kubernetes-operator/internal/controllers/database"
3232
"github.com/ydb-platform/ydb-kubernetes-operator/internal/controllers/databasenodeset"
@@ -529,25 +529,25 @@ var _ = Describe("RemoteDatabaseNodeSet controller tests", func() {
529529
return err
530530
}
531531

532-
primaryResourceStorage, exist := remoteSecret.Annotations[annotations.PrimaryResourceStorage]
532+
primaryResourceStorage, exist := remoteSecret.Annotations[ydbannotations.PrimaryResourceStorage]
533533
if !exist {
534-
return fmt.Errorf("annotation %s does not exist on remoteSecret %s", annotations.PrimaryResourceStorage, remoteSecret.Name)
534+
return fmt.Errorf("annotation %s does not exist on remoteSecret %s", ydbannotations.PrimaryResourceStorage, remoteSecret.Name)
535535
}
536536
if primaryResourceStorage != foundRemoteStorageNodeSet.Spec.StorageRef.Name {
537537
return fmt.Errorf("primaryResourceName %s does not equal storageRef name %s", primaryResourceStorage, foundRemoteDatabaseNodeSet.Spec.DatabaseRef.Name)
538538
}
539539

540-
primaryResourceDatabase, exist := remoteSecret.Annotations[annotations.PrimaryResourceDatabase]
540+
primaryResourceDatabase, exist := remoteSecret.Annotations[ydbannotations.PrimaryResourceDatabase]
541541
if !exist {
542-
return fmt.Errorf("annotation %s does not exist on remoteSecret %s", annotations.PrimaryResourceDatabase, remoteSecret.Name)
542+
return fmt.Errorf("annotation %s does not exist on remoteSecret %s", ydbannotations.PrimaryResourceDatabase, remoteSecret.Name)
543543
}
544544
if primaryResourceDatabase != foundRemoteDatabaseNodeSet.Spec.DatabaseRef.Name {
545545
return fmt.Errorf("primaryResourceName %s does not equal databaseRef name %s", primaryResourceDatabase, foundRemoteDatabaseNodeSet.Spec.DatabaseRef.Name)
546546
}
547547

548-
remoteRV, exist := remoteSecret.Annotations[annotations.RemoteResourceVersion]
548+
remoteRV, exist := remoteSecret.Annotations[ydbannotations.RemoteResourceVersion]
549549
if !exist {
550-
return fmt.Errorf("annotation %s does not exist on remoteSecret %s", annotations.RemoteResourceVersion, remoteSecret.Name)
550+
return fmt.Errorf("annotation %s does not exist on remoteSecret %s", ydbannotations.RemoteResourceVersion, remoteSecret.Name)
551551
}
552552
if localSecret.GetResourceVersion() != remoteRV {
553553
return fmt.Errorf("localRV %s does not equal remoteRV %s", localSecret.GetResourceVersion(), remoteRV)
@@ -620,22 +620,22 @@ var _ = Describe("RemoteDatabaseNodeSet controller tests", func() {
620620
return err
621621
}
622622

623-
_, exist := remoteSecret.Annotations[annotations.PrimaryResourceStorage]
623+
_, exist := remoteSecret.Annotations[ydbannotations.PrimaryResourceStorage]
624624
if exist {
625-
return fmt.Errorf("annotation %s still exist on remoteSecret %s", annotations.PrimaryResourceStorage, remoteSecret.Name)
625+
return fmt.Errorf("annotation %s still exist on remoteSecret %s", ydbannotations.PrimaryResourceStorage, remoteSecret.Name)
626626
}
627627

628-
primaryResourceDatabase, exist := remoteSecret.Annotations[annotations.PrimaryResourceDatabase]
628+
primaryResourceDatabase, exist := remoteSecret.Annotations[ydbannotations.PrimaryResourceDatabase]
629629
if !exist {
630-
return fmt.Errorf("annotation %s does not exist on remoteSecret %s", annotations.PrimaryResourceDatabase, remoteSecret.Name)
630+
return fmt.Errorf("annotation %s does not exist on remoteSecret %s", ydbannotations.PrimaryResourceDatabase, remoteSecret.Name)
631631
}
632632
if primaryResourceDatabase != foundRemoteDatabaseNodeSet.Spec.DatabaseRef.Name {
633633
return fmt.Errorf("primaryResourceName %s does not equal databaseRef name %s", primaryResourceDatabase, foundRemoteDatabaseNodeSet.Spec.DatabaseRef.Name)
634634
}
635635

636-
remoteRV, exist := remoteSecret.Annotations[annotations.RemoteResourceVersion]
636+
remoteRV, exist := remoteSecret.Annotations[ydbannotations.RemoteResourceVersion]
637637
if !exist {
638-
return fmt.Errorf("annotation %s does not exist on remoteSecret %s", annotations.RemoteResourceVersion, remoteSecret.Name)
638+
return fmt.Errorf("annotation %s does not exist on remoteSecret %s", ydbannotations.RemoteResourceVersion, remoteSecret.Name)
639639
}
640640
if localSecret.GetResourceVersion() != remoteRV {
641641
return fmt.Errorf("localRV %s does not equal remoteRV %s", localSecret.GetResourceVersion(), remoteRV)
@@ -686,17 +686,17 @@ var _ = Describe("RemoteDatabaseNodeSet controller tests", func() {
686686
return err
687687
}
688688

689-
primaryResourceDatabase, exist := remoteSecret.Annotations[annotations.PrimaryResourceDatabase]
689+
primaryResourceDatabase, exist := remoteSecret.Annotations[ydbannotations.PrimaryResourceDatabase]
690690
if !exist {
691-
return fmt.Errorf("annotation %s does not exist on remoteSecret %s", annotations.PrimaryResourceDatabase, remoteSecret.Name)
691+
return fmt.Errorf("annotation %s does not exist on remoteSecret %s", ydbannotations.PrimaryResourceDatabase, remoteSecret.Name)
692692
}
693693
if primaryResourceDatabase != foundRemoteDatabaseNodeSet.Spec.DatabaseRef.Name {
694694
return fmt.Errorf("primaryResourceName %s does not equal databaseRef name %s", primaryResourceDatabase, foundRemoteDatabaseNodeSet.Spec.DatabaseRef.Name)
695695
}
696696

697-
remoteRV, exist := remoteSecret.Annotations[annotations.RemoteResourceVersion]
697+
remoteRV, exist := remoteSecret.Annotations[ydbannotations.RemoteResourceVersion]
698698
if !exist {
699-
return fmt.Errorf("annotation %s does not exist on remoteSecret %s", annotations.RemoteResourceVersion, remoteSecret.Name)
699+
return fmt.Errorf("annotation %s does not exist on remoteSecret %s", ydbannotations.RemoteResourceVersion, remoteSecret.Name)
700700
}
701701
if localSecret.GetResourceVersion() != remoteRV {
702702
return fmt.Errorf("localRV %s does not equal remoteRV %s", localSecret.GetResourceVersion(), remoteRV)

‎internal/controllers/remotestoragenodeset/controller.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"sigs.k8s.io/controller-runtime/pkg/source"
2424

2525
"github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
26-
"github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
26+
ydbannotations "github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
2727
. "github.com/ydb-platform/ydb-kubernetes-operator/internal/controllers/constants" //nolint:revive,stylecheck
2828
ydblabels "github.com/ydb-platform/ydb-kubernetes-operator/internal/labels"
2929
"github.com/ydb-platform/ydb-kubernetes-operator/internal/resources"
@@ -118,8 +118,8 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager, remoteCluster *cluster.C
118118
annotationFilter := func(mapObj client.Object) []reconcile.Request {
119119
requests := make([]reconcile.Request, 0)
120120

121-
an := mapObj.GetAnnotations()
122-
primaryResourceName, exist := an[annotations.PrimaryResourceStorage]
121+
annotations := mapObj.GetAnnotations()
122+
primaryResourceName, exist := annotations[ydbannotations.PrimaryResourceStorage]
123123
if exist {
124124
storageNodeSets := &v1alpha1.StorageNodeSetList{}
125125
if err := r.Client.List(

‎internal/controllers/remotestoragenodeset/controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
"github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
2727
testobjects "github.com/ydb-platform/ydb-kubernetes-operator/e2e/tests/test-objects"
28-
annotations "github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
28+
annotations ydbannotations "github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
2929
. "github.com/ydb-platform/ydb-kubernetes-operator/internal/controllers/constants"
3030
"github.com/ydb-platform/ydb-kubernetes-operator/internal/controllers/remotestoragenodeset"
3131
"github.com/ydb-platform/ydb-kubernetes-operator/internal/controllers/storage"

‎internal/controllers/remotestoragenodeset/remote_objects.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"sigs.k8s.io/controller-runtime/pkg/client"
1717

1818
"github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
19-
"github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
19+
ydbannotations "github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
2020
. "github.com/ydb-platform/ydb-kubernetes-operator/internal/controllers/constants" //nolint:revive,stylecheck
2121
ydblabels "github.com/ydb-platform/ydb-kubernetes-operator/internal/labels"
2222
"github.com/ydb-platform/ydb-kubernetes-operator/internal/resources"
@@ -277,7 +277,7 @@ func (r *Reconciler) removeUnusedRemoteObjects(
277277

278278
// Remove annotation if no one another StorageNodeSet
279279
if !existInStorage {
280-
patch := []byte(fmt.Sprintf(`{"metadata": {"annotations": {"%s": null}}}`, annotations.PrimaryResourceStorage))
280+
patch := []byte(fmt.Sprintf(`{"metadata": {"annotations": {"%s": null}}}`, ydbannotations.PrimaryResourceStorage))
281281
updateErr := r.Client.Patch(ctx, localObj, client.RawPatch(types.StrategicMergePatchType, patch))
282282
if updateErr != nil {
283283
r.Recorder.Event(
@@ -297,7 +297,7 @@ func (r *Reconciler) removeUnusedRemoteObjects(
297297
}
298298

299299
// Delete resource if annotation `ydb.tech/primary-resource-database` does not exist
300-
_, existInDatabase := localObj.GetAnnotations()[annotations.PrimaryResourceDatabase]
300+
_, existInDatabase := localObj.GetAnnotations()[ydbannotations.PrimaryResourceDatabase]
301301
if !existInDatabase {
302302
// Try to delete unused resource from local cluster
303303
deleteErr := r.Client.Delete(ctx, localObj)

‎internal/controllers/storage/controller_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818

1919
"github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
2020
testobjects "github.com/ydb-platform/ydb-kubernetes-operator/e2e/tests/test-objects"
21-
"github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
21+
ydbannotations "github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
2222
"github.com/ydb-platform/ydb-kubernetes-operator/internal/controllers/storage"
2323
"github.com/ydb-platform/ydb-kubernetes-operator/internal/labels"
2424
"github.com/ydb-platform/ydb-kubernetes-operator/internal/resources"
@@ -123,7 +123,7 @@ var _ = Describe("Storage controller medium tests", func() {
123123
}, &foundStorage)).Should(Succeed())
124124

125125
foundConfigurationChecksumAnnotation := false
126-
if podAnnotations[annotations.ConfigurationChecksum] == resources.GetSHA256Checksum(foundStorage.Spec.Configuration) {
126+
if podAnnotations[ydbannotations.ConfigurationChecksum] == resources.GetSHA256Checksum(foundStorage.Spec.Configuration) {
127127
foundConfigurationChecksumAnnotation = true
128128
}
129129
Expect(foundConfigurationChecksumAnnotation).To(BeTrue())

‎internal/resources/database.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"k8s.io/client-go/rest"
88

99
api "github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
10-
"github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
10+
ydbannotations "github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
1111
"github.com/ydb-platform/ydb-kubernetes-operator/internal/configuration/schema"
1212
"github.com/ydb-platform/ydb-kubernetes-operator/internal/labels"
1313
"github.com/ydb-platform/ydb-kubernetes-operator/internal/metrics"
@@ -35,10 +35,10 @@ func (b *DatabaseBuilder) NewLabels() labels.Labels {
3535
return l
3636
}
3737

38-
func (b *DatabaseBuilder) NewAnnotations() annotations.Annotations {
39-
an := annotations.Common(b.Annotations)
38+
func (b *DatabaseBuilder) NewAnnotations() ydbannotations.Annotations {
39+
annotations := ydbannotations.Common(b.Annotations)
4040

41-
return an
41+
return annotations
4242
}
4343

4444
func (b *DatabaseBuilder) Unwrap() *api.Database {
@@ -60,9 +60,9 @@ func (b *DatabaseBuilder) GetResourceBuilders(restConfig *rest.Config) []Resourc
6060
statefulSetAnnotations := databaseAnnotations.Copy()
6161
statefulSetAnnotations.Merge(b.Spec.AdditionalAnnotations)
6262
if b.Spec.Configuration != "" {
63-
statefulSetAnnotations.Merge(map[string]string{annotations.ConfigurationChecksum: GetSHA256Checksum(b.Spec.Configuration)})
63+
statefulSetAnnotations.Merge(map[string]string{ydbannotations.ConfigurationChecksum: GetSHA256Checksum(b.Spec.Configuration)})
6464
} else {
65-
statefulSetAnnotations.Merge(map[string]string{annotations.ConfigurationChecksum: GetSHA256Checksum(b.Storage.Spec.Configuration)})
65+
statefulSetAnnotations.Merge(map[string]string{ydbannotations.ConfigurationChecksum: GetSHA256Checksum(b.Storage.Spec.Configuration)})
6666
}
6767

6868
grpcServiceLabels := databaseLabels.Copy()
@@ -249,7 +249,7 @@ func (b *DatabaseBuilder) GetResourceBuilders(restConfig *rest.Config) []Resourc
249249

250250
func (b *DatabaseBuilder) getNodeSetBuilders(
251251
databaseLabels labels.Labels,
252-
databaseAnnotations annotations.Annotations,
252+
databaseAnnotations ydbannotations.Annotations,
253253
) []ResourceBuilder {
254254
var nodeSetBuilders []ResourceBuilder
255255

@@ -266,9 +266,9 @@ func (b *DatabaseBuilder) getNodeSetBuilders(
266266
nodeSetAnnotations := databaseAnnotations.Copy()
267267
nodeSetAnnotations.Merge(nodeSetSpecInline.Annotations)
268268
if b.Spec.Configuration != "" {
269-
nodeSetAnnotations.Merge(map[string]string{annotations.ConfigurationChecksum: GetSHA256Checksum(b.Spec.Configuration)})
269+
nodeSetAnnotations.Merge(map[string]string{ydbannotations.ConfigurationChecksum: GetSHA256Checksum(b.Spec.Configuration)})
270270
} else {
271-
nodeSetAnnotations.Merge(map[string]string{annotations.ConfigurationChecksum: GetSHA256Checksum(b.Storage.Spec.Configuration)})
271+
nodeSetAnnotations.Merge(map[string]string{ydbannotations.ConfigurationChecksum: GetSHA256Checksum(b.Storage.Spec.Configuration)})
272272
}
273273

274274
databaseNodeSetSpec := b.recastDatabaseNodeSetSpecInline(nodeSetSpecInline.DeepCopy())

‎internal/resources/database_statefulset.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"sigs.k8s.io/controller-runtime/pkg/client"
1818

1919
api "github.com/ydb-platform/ydb-kubernetes-operator/api/v1alpha1"
20-
"github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
20+
ydbannotations "github.com/ydb-platform/ydb-kubernetes-operator/internal/annotations"
2121
"github.com/ydb-platform/ydb-kubernetes-operator/internal/labels"
2222
"github.com/ydb-platform/ydb-kubernetes-operator/internal/ptr"
2323
)
@@ -148,7 +148,7 @@ func (b *DatabaseStatefulSetBuilder) buildPodTemplateSpec() corev1.PodTemplateSp
148148
}
149149

150150
if value, ok := b.ObjectMeta.Annotations[api.AnnotationUpdateDNSPolicy]; ok {
151-
for _, acceptedPolicy := range annotations.AcceptedDNSPolicy {
151+
for _, acceptedPolicy := range ydbannotations.AcceptedDNSPolicy {
152152
if value == acceptedPolicy {
153153
podTemplate.Spec.DNSPolicy = corev1.DNSPolicy(value)
154154
}

0 commit comments

Comments
 (0)