Skip to content

Commit c991fa8

Browse files
AndrewChubatiukAndrewChubatiuk
committed
chore: removed deprecations, that were planned to be removed in 0.52
1 parent 983d167 commit c991fa8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+295
-476
lines changed

‎.github/workflows/main.yaml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ jobs:
5252
echo "Saved $(formatByteCount $SAVED)"
5353
- name: Checkout code
5454
uses: actions/checkout@v5
55-
- name: Restore binaries from cache
56-
uses: actions/cache/restore@v4
55+
- name: Prepare binary cache
56+
uses: actions/cache@v4
5757
with:
5858
path: ./bin
5959
key: binary
@@ -103,8 +103,3 @@ jobs:
103103
if: success() || failure()
104104
with:
105105
report_paths: 'report.xml'
106-
- name: Prepare binary cache
107-
uses: actions/cache@v4
108-
with:
109-
path: ./bin
110-
key: binary

‎.github/workflows/release.yaml‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
steps:
1515
- name: Checkout code
1616
uses: actions/checkout@v5
17-
- name: Restore binaries from cache
18-
uses: actions/cache/restore@v4
17+
- name: Prepare binary cache
18+
uses: actions/cache@v4
1919
with:
2020
path: ./bin
2121
key: binary
@@ -39,11 +39,6 @@ jobs:
3939
gh release upload ${{github.event.release.tag_name}} ./dist/install-no-webhook.yaml#install-no-webhook.yaml --clobber || echo "fix me NOT enough security permissions"
4040
gh release upload ${{github.event.release.tag_name}} ./dist/install-with-webhook.yaml#install-with-webhook.yaml --clobber || echo "fix me NOT enough security permissions"
4141
gh release upload ${{github.event.release.tag_name}} ./config/crd/overlay/crd.yaml#crd.yaml --clobber || echo "fix me NOT enough security permissions"
42-
- name: Prepare binary cache
43-
uses: actions/cache@v4
44-
with:
45-
path: ./bin
46-
key: binary
4742
- uses: actions/upload-artifact@v5
4843
with:
4944
name: olm

‎api/operator/v1/vlagent_types.go‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -289,16 +289,13 @@ func (cr *VLAgent) DefaultStatusFields(vs *VLAgentStatus) {
289289
vs.Replicas = replicaCount
290290
}
291291

292-
// AnnotationsFiltered implements build.builderOpts interface
293-
func (cr *VLAgent) AnnotationsFiltered() map[string]string {
294-
if cr.Spec.ManagedMetadata == nil {
295-
return nil
296-
}
297-
dst := make(map[string]string, len(cr.Spec.ManagedMetadata.Annotations))
298-
for k, v := range cr.Spec.ManagedMetadata.Annotations {
299-
dst[k] = v
292+
// FinalAnnotations implements build.builderOpts interface
293+
func (cr *VLAgent) FinalAnnotations() map[string]string {
294+
var v map[string]string
295+
if cr.Spec.ManagedMetadata != nil {
296+
v = labels.Merge(cr.Spec.ManagedMetadata.Annotations, v)
300297
}
301-
return dst
298+
return v
302299
}
303300

304301
// SelectorLabels returns selector labels for querying any vlagent related resources
@@ -321,14 +318,13 @@ func (cr *VLAgent) PodLabels() map[string]string {
321318
return labels.Merge(cr.Spec.PodMetadata.Labels, lbls)
322319
}
323320

324-
// AllLabels returns global labels for all vlagent related resources
325-
func (cr *VLAgent) AllLabels() map[string]string {
326-
selectorLabels := cr.SelectorLabels()
327-
// fast path
328-
if cr.Spec.ManagedMetadata == nil {
329-
return selectorLabels
321+
// FinalLabels returns global labels for all vlagent related resources
322+
func (cr *VLAgent) FinalLabels() map[string]string {
323+
v := cr.SelectorLabels()
324+
if cr.Spec.ManagedMetadata != nil {
325+
v = labels.Merge(cr.Spec.ManagedMetadata.Labels, v)
330326
}
331-
return labels.Merge(selectorLabels, cr.Spec.ManagedMetadata.Labels)
327+
return v
332328
}
333329

334330
// PrefixedName returns name of resource with fixed prefix

‎api/operator/v1/vlcluster_types.go‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,11 @@ func (cr *VLCluster) PodAnnotations(kind vmv1beta1.ClusterComponent) map[string]
163163

164164
// FinalAnnotations returns global annotations to be applied by objects generate for vlcluster
165165
func (cr *VLCluster) FinalAnnotations() map[string]string {
166-
if cr.Spec.ManagedMetadata == nil {
167-
return nil
166+
var v map[string]string
167+
if cr.Spec.ManagedMetadata != nil {
168+
v = labels.Merge(cr.Spec.ManagedMetadata.Annotations, v)
168169
}
169-
return cr.Spec.ManagedMetadata.Annotations
170+
return v
170171
}
171172

172173
// PrefixedName returns prefixed name for the given component kind
@@ -181,12 +182,11 @@ func (cr *VLCluster) PrefixedInternalName(kind vmv1beta1.ClusterComponent) strin
181182

182183
// FinalLabels adds cluster labels to the base labels and filters by prefix if needed
183184
func (cr *VLCluster) FinalLabels(kind vmv1beta1.ClusterComponent) map[string]string {
184-
baseLabels := vmv1beta1.AddClusterLabels(cr.SelectorLabels(kind), "vl")
185-
if cr.Spec.ManagedMetadata == nil {
186-
// fast path
187-
return baseLabels
185+
v := vmv1beta1.AddClusterLabels(cr.SelectorLabels(kind), "vl")
186+
if cr.Spec.ManagedMetadata != nil {
187+
v = labels.Merge(cr.Spec.ManagedMetadata.Labels, v)
188188
}
189-
return labels.Merge(cr.Spec.ManagedMetadata.Labels, baseLabels)
189+
return v
190190
}
191191

192192
// UnmarshalJSON implements json.Unmarshaler interface
@@ -737,11 +737,6 @@ func (cr *VLCluster) AvailableStorageNodeIDs(requestsType string) []int32 {
737737
return result
738738
}
739739

740-
// AnnotationsFiltered implements finalize.crdObject interface
741-
func (cr *VLCluster) AnnotationsFiltered() map[string]string {
742-
return cr.FinalAnnotations()
743-
}
744-
745740
// LastAppliedSpecAsPatch return last applied cluster spec as patch annotation
746741
func (cr *VLCluster) LastAppliedSpecAsPatch() (client.Patch, error) {
747742
return vmv1beta1.LastAppliedChangesAsPatch(cr.Spec)

‎api/operator/v1/vlsingle_types.go‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -227,15 +227,13 @@ func (cr *VLSingle) ProbeNeedLiveness() bool {
227227
return false
228228
}
229229

230-
func (cr *VLSingle) AnnotationsFiltered() map[string]string {
231-
if cr.Spec.ManagedMetadata == nil {
232-
return nil
233-
}
234-
dst := make(map[string]string, len(cr.Spec.ManagedMetadata.Annotations))
235-
for k, v := range cr.Spec.ManagedMetadata.Annotations {
236-
dst[k] = v
230+
// FinalAnnotations returns annotations to be applied for created objects
231+
func (cr *VLSingle) FinalAnnotations() map[string]string {
232+
var v map[string]string
233+
if cr.Spec.ManagedMetadata != nil {
234+
v = labels.Merge(cr.Spec.ManagedMetadata.Annotations, v)
237235
}
238-
return dst
236+
return v
239237
}
240238

241239
// SelectorLabels returns unique labels for object
@@ -257,15 +255,13 @@ func (cr *VLSingle) PodLabels() map[string]string {
257255
return labels.Merge(cr.Spec.PodMetadata.Labels, lbls)
258256
}
259257

260-
// AllLabels returns combination of selector and managed labels
261-
func (cr *VLSingle) AllLabels() map[string]string {
262-
selectorLabels := cr.SelectorLabels()
263-
// fast path
264-
if cr.Spec.ManagedMetadata == nil {
265-
return selectorLabels
258+
// FinalLabels returns combination of selector and managed labels
259+
func (cr *VLSingle) FinalLabels() map[string]string {
260+
v := cr.SelectorLabels()
261+
if cr.Spec.ManagedMetadata != nil {
262+
v = labels.Merge(cr.Spec.ManagedMetadata.Labels, v)
266263
}
267-
268-
return labels.Merge(selectorLabels, cr.Spec.ManagedMetadata.Labels)
264+
return v
269265
}
270266

271267
func (cr *VLSingle) PrefixedName() string {

‎api/operator/v1/vmanomaly_types.go‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -252,16 +252,13 @@ func (cr *VMAnomaly) AsOwner() metav1.OwnerReference {
252252
}
253253
}
254254

255-
// AnnotationsFiltered returns global annotations to be applied for created objects
256-
func (cr *VMAnomaly) AnnotationsFiltered() map[string]string {
257-
if cr.Spec.ManagedMetadata == nil {
258-
return nil
259-
}
260-
dst := make(map[string]string, len(cr.Spec.ManagedMetadata.Annotations))
261-
for k, v := range cr.Spec.ManagedMetadata.Annotations {
262-
dst[k] = v
255+
// FinalAnnotations returns global annotations to be applied for created objects
256+
func (cr *VMAnomaly) FinalAnnotations() map[string]string {
257+
var v map[string]string
258+
if cr.Spec.ManagedMetadata != nil {
259+
v = labels.Merge(cr.Spec.ManagedMetadata.Annotations, v)
263260
}
264-
return dst
261+
return v
265262
}
266263

267264
// PodAnnotations returns annotations to be applied to Pod
@@ -309,18 +306,13 @@ func (cr *VMAnomaly) PodLabels() map[string]string {
309306
return labels.Merge(cr.Spec.PodMetadata.Labels, lbls)
310307
}
311308

312-
// AllLabels returns global labels to be applied for created objects
313-
func (cr *VMAnomaly) AllLabels() map[string]string {
314-
selectorLabels := cr.SelectorLabels()
315-
// fast path
316-
if cr.Labels == nil && cr.Spec.ManagedMetadata == nil {
317-
return selectorLabels
318-
}
319-
var result map[string]string
309+
// FinalLabels returns global labels to be applied for created objects
310+
func (cr *VMAnomaly) FinalLabels() map[string]string {
311+
v := cr.SelectorLabels()
320312
if cr.Spec.ManagedMetadata != nil {
321-
result = labels.Merge(result, cr.Spec.ManagedMetadata.Labels)
313+
v = labels.Merge(cr.Spec.ManagedMetadata.Labels, v)
322314
}
323-
return labels.Merge(result, selectorLabels)
315+
return v
324316
}
325317

326318
// PrefixedName format name of the component with hard-coded prefix

‎api/operator/v1/vtcluster_types.go‎

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,11 @@ func (cr *VTCluster) PodAnnotations(kind vmv1beta1.ClusterComponent) map[string]
163163

164164
// FinalAnnotations returns global annotations to be applied by objects generate for vtcluster
165165
func (cr *VTCluster) FinalAnnotations() map[string]string {
166-
if cr.Spec.ManagedMetadata == nil {
167-
return nil
166+
var v map[string]string
167+
if cr.Spec.ManagedMetadata != nil {
168+
v = labels.Merge(cr.Spec.ManagedMetadata.Annotations, v)
168169
}
169-
return cr.Spec.ManagedMetadata.Annotations
170+
return v
170171
}
171172

172173
// PrefixedName returns prefixed name for the given component kind
@@ -181,12 +182,11 @@ func (cr *VTCluster) PrefixedInternalName(kind vmv1beta1.ClusterComponent) strin
181182

182183
// FinalLabels adds cluster labels to the base labels and filters by prefix if needed
183184
func (cr *VTCluster) FinalLabels(kind vmv1beta1.ClusterComponent) map[string]string {
184-
baseLabels := vmv1beta1.AddClusterLabels(cr.SelectorLabels(kind), "vt")
185-
if cr.Spec.ManagedMetadata == nil {
186-
// fast path
187-
return baseLabels
185+
v := vmv1beta1.AddClusterLabels(cr.SelectorLabels(kind), "vt")
186+
if cr.Spec.ManagedMetadata != nil {
187+
v = labels.Merge(cr.Spec.ManagedMetadata.Labels, v)
188188
}
189-
return labels.Merge(cr.Spec.ManagedMetadata.Labels, baseLabels)
189+
return v
190190
}
191191

192192
// UnmarshalJSON implements json.Unmarshaler interface
@@ -652,11 +652,6 @@ func (cr *VTCluster) AvailableStorageNodeIDs(requestsType string) []int32 {
652652
return result
653653
}
654654

655-
// AnnotationsFiltered implements finalize.crdObject interface
656-
func (cr *VTCluster) AnnotationsFiltered() map[string]string {
657-
return cr.FinalAnnotations()
658-
}
659-
660655
// LastAppliedSpecAsPatch return last applied cluster spec as patch annotation
661656
func (cr *VTCluster) LastAppliedSpecAsPatch() (client.Patch, error) {
662657
return vmv1beta1.LastAppliedChangesAsPatch(cr.Spec)

‎api/operator/v1/vtsingle_types.go‎

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -231,16 +231,13 @@ func (cr *VTSingle) ProbeNeedLiveness() bool {
231231
return false
232232
}
233233

234-
// AnnotationsFiltered returns global annotations to be applied for created objects
235-
func (cr *VTSingle) AnnotationsFiltered() map[string]string {
236-
if cr.Spec.ManagedMetadata == nil {
237-
return nil
238-
}
239-
dst := make(map[string]string, len(cr.Spec.ManagedMetadata.Annotations))
240-
for k, v := range cr.Spec.ManagedMetadata.Annotations {
241-
dst[k] = v
234+
// FinalAnnotations returns annotations to be applied for created objects
235+
func (cr *VTSingle) FinalAnnotations() map[string]string {
236+
var v map[string]string
237+
if cr.Spec.ManagedMetadata != nil {
238+
v = labels.Merge(cr.Spec.ManagedMetadata.Annotations, v)
242239
}
243-
return dst
240+
return v
244241
}
245242

246243
// SelectorLabels returns unique labels for object
@@ -262,15 +259,13 @@ func (cr *VTSingle) PodLabels() map[string]string {
262259
return labels.Merge(cr.Spec.PodMetadata.Labels, lbls)
263260
}
264261

265-
// AllLabels returns combination of selector and managed labels
266-
func (cr *VTSingle) AllLabels() map[string]string {
267-
selectorLabels := cr.SelectorLabels()
268-
// fast path
269-
if cr.Spec.ManagedMetadata == nil {
270-
return selectorLabels
262+
// FinalLabels returns combination of selector and managed labels
263+
func (cr *VTSingle) FinalLabels() map[string]string {
264+
v := cr.SelectorLabels()
265+
if cr.Spec.ManagedMetadata != nil {
266+
v = labels.Merge(cr.Spec.ManagedMetadata.Labels, v)
271267
}
272-
273-
return labels.Merge(selectorLabels, cr.Spec.ManagedMetadata.Labels)
268+
return v
274269
}
275270

276271
// PrefixedName format name of the component with hard-coded prefix

‎api/operator/v1beta1/vlogs_types.go‎

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -217,20 +217,6 @@ func (cr *VLogs) ProbeNeedLiveness() bool {
217217
return false
218218
}
219219

220-
func (cr *VLogs) AnnotationsFiltered() map[string]string {
221-
// TODO: @f41gh7 deprecated at will be removed at v0.52.0 release
222-
dst := filterMapKeysByPrefixes(cr.Annotations, annotationFilterPrefixes)
223-
if cr.Spec.ManagedMetadata != nil {
224-
if dst == nil {
225-
dst = make(map[string]string)
226-
}
227-
for k, v := range cr.Spec.ManagedMetadata.Annotations {
228-
dst[k] = v
229-
}
230-
}
231-
return dst
232-
}
233-
234220
func (cr *VLogs) SelectorLabels() map[string]string {
235221
return map[string]string{
236222
"app.kubernetes.io/name": "vlogs",
@@ -248,21 +234,22 @@ func (cr *VLogs) PodLabels() map[string]string {
248234
return labels.Merge(cr.Spec.PodMetadata.Labels, lbls)
249235
}
250236

251-
func (cr *VLogs) AllLabels() map[string]string {
252-
selectorLabels := cr.SelectorLabels()
253-
// fast path
254-
if cr.Labels == nil && cr.Spec.ManagedMetadata == nil {
255-
return selectorLabels
256-
}
257-
var result map[string]string
258-
// TODO: @f41gh7 deprecated at will be removed at v0.52.0 release
259-
if cr.Labels != nil {
260-
result = filterMapKeysByPrefixes(cr.Labels, labelFilterPrefixes)
237+
// FinalLabels returns combination of selector and managed labels
238+
func (cr *VLogs) FinalLabels() map[string]string {
239+
v := cr.SelectorLabels()
240+
if cr.Spec.ManagedMetadata != nil {
241+
v = labels.Merge(cr.Spec.ManagedMetadata.Labels, v)
261242
}
243+
return v
244+
}
245+
246+
// FinalAnnotations returns annotations to be applied for created objects
247+
func (cr *VLogs) FinalAnnotations() map[string]string {
248+
var v map[string]string
262249
if cr.Spec.ManagedMetadata != nil {
263-
result = labels.Merge(result, cr.Spec.ManagedMetadata.Labels)
250+
v = labels.Merge(cr.Spec.ManagedMetadata.Annotations, v)
264251
}
265-
return labels.Merge(result, selectorLabels)
252+
return v
266253
}
267254

268255
func (cr *VLogs) PrefixedName() string {

0 commit comments

Comments
 (0)