Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 14b94a5

Browse files
lubronzhanlubronzhan
committedMay 3, 2024·
Fix the integration test logic when there are multiple test competing with each other
Signed-off-by: Lubron Zhan <lubronzhan@gmail.com>
1 parent cadc346 commit 14b94a5

File tree

7 files changed

+359
-308
lines changed

7 files changed

+359
-308
lines changed
 

‎api/v1alpha1/akodeploymentconfig_webhook_test.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/vmware/alb-sdk/go/models"
1313
corev1 "k8s.io/api/core/v1"
1414
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
15-
"k8s.io/utils/pointer"
15+
"k8s.io/utils/ptr"
1616
"sigs.k8s.io/controller-runtime/pkg/client/fake"
1717
)
1818

@@ -103,17 +103,17 @@ func afterEach(adminSecret, certificateSecret *corev1.Secret, g *WithT) {
103103

104104
func configureAVIController() {
105105
aviClient.ServiceEngineGroupCreate(&models.ServiceEngineGroup{
106-
Name: pointer.StringPtr("fake-seg"),
106+
Name: ptr.To("fake-seg"),
107107
})
108108
aviClient.CloudCreate(&models.Cloud{
109-
Name: pointer.StringPtr("fake-cloud"),
110-
IPAMProviderRef: pointer.StringPtr("https://10.0.0.x/api/ipamdnsproviderprofile/test"),
109+
Name: ptr.To("fake-cloud"),
110+
IPAMProviderRef: ptr.To("https://10.0.0.x/api/ipamdnsproviderprofile/test"),
111111
})
112112
aviClient.NetworkCreate(&models.Network{
113-
Name: pointer.StringPtr("fake-control-plane"),
113+
Name: ptr.To("fake-control-plane"),
114114
})
115115
aviClient.NetworkCreate(&models.Network{
116-
Name: pointer.StringPtr("fake-data-plane"),
116+
Name: ptr.To("fake-data-plane"),
117117
})
118118
}
119119

@@ -404,14 +404,14 @@ func TestUpdateExistingAKODeploymentConfig(t *testing.T) {
404404
new: staticADC.DeepCopy(),
405405
customizeInput: func(adminSecret, certificateSecret *corev1.Secret, adc *AKODeploymentConfig) (*corev1.Secret, *corev1.Secret, *AKODeploymentConfig) {
406406
aviClient.CloudCreate(&models.Cloud{
407-
Name: pointer.StringPtr("fake-new-cloud"),
408-
IPAMProviderRef: pointer.StringPtr("https://10.0.0.x/api/ipamdnsproviderprofile/test"),
407+
Name: ptr.To("fake-new-cloud"),
408+
IPAMProviderRef: ptr.To("https://10.0.0.x/api/ipamdnsproviderprofile/test"),
409409
})
410410
aviClient.ServiceEngineGroupCreate(&models.ServiceEngineGroup{
411-
Name: pointer.StringPtr("fake-seg"),
411+
Name: ptr.To("fake-seg"),
412412
})
413413
aviClient.NetworkCreate(&models.Network{
414-
Name: pointer.StringPtr("fake-new-data-plane"),
414+
Name: ptr.To("fake-new-data-plane"),
415415
})
416416
adc.Spec.CloudName = "fake-new-cloud"
417417
adc.Spec.ServiceEngineGroup = "fake-new-seg"

‎controllers/akodeploymentconfig/akodeploymentconfig_controller_avi_phase.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,20 @@ import (
77
"bytes"
88
"context"
99
"errors"
10-
"github.com/vmware-tanzu/load-balancer-operator-for-kubernetes/pkg/utils"
1110
"sync"
1211

12+
"github.com/vmware-tanzu/load-balancer-operator-for-kubernetes/pkg/utils"
13+
1314
"net"
1415
"sort"
1516

1617
"github.com/go-logr/logr"
1718
"github.com/vmware/alb-sdk/go/models"
18-
"k8s.io/utils/pointer"
1919

2020
corev1 "k8s.io/api/core/v1"
2121
apierrors "k8s.io/apimachinery/pkg/api/errors"
2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
23+
"k8s.io/utils/ptr"
2324
ctrl "sigs.k8s.io/controller-runtime"
2425
"sigs.k8s.io/controller-runtime/pkg/client"
2526

@@ -328,9 +329,9 @@ func (r *AKODeploymentConfigReconciler) createAviInfraSetting(adc *akoov1alpha1.
328329
}}
329330
}
330331

331-
t1LR := pointer.StringPtr("")
332+
t1LR := ptr.To("")
332333
if adc.Spec.ExtraConfigs.NetworksConfig.NsxtT1LR != "" {
333-
t1LR = pointer.StringPtr(adc.Spec.ExtraConfigs.NetworksConfig.NsxtT1LR)
334+
t1LR = ptr.To(adc.Spec.ExtraConfigs.NetworksConfig.NsxtT1LR)
334335
}
335336

336337
return &akov1beta1.AviInfraSetting{

‎controllers/akodeploymentconfig/akodeploymentconfig_controller_intg_test.go

+209-161
Large diffs are not rendered by default.

‎controllers/akodeploymentconfig/user/ako_role.go

+123-123
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package user
55

66
import (
77
"github.com/vmware/alb-sdk/go/models"
8-
"k8s.io/utils/pointer"
8+
"k8s.io/utils/ptr"
99
)
1010

1111
var AkoRolePermissionMap = map[string]string{
@@ -76,247 +76,247 @@ var AkoRolePermissionMap = map[string]string{
7676

7777
var AkoRolePermission = []*models.Permission{
7878
{
79-
Type: pointer.StringPtr("WRITE_ACCESS"),
80-
Resource: pointer.StringPtr("PERMISSION_VIRTUALSERVICE"),
79+
Type: ptr.To("WRITE_ACCESS"),
80+
Resource: ptr.To("PERMISSION_VIRTUALSERVICE"),
8181
},
8282
{
83-
Type: pointer.StringPtr("WRITE_ACCESS"),
84-
Resource: pointer.StringPtr("PERMISSION_POOL"),
83+
Type: ptr.To("WRITE_ACCESS"),
84+
Resource: ptr.To("PERMISSION_POOL"),
8585
},
8686
{
87-
Type: pointer.StringPtr("WRITE_ACCESS"),
88-
Resource: pointer.StringPtr("PERMISSION_POOLGROUP"),
87+
Type: ptr.To("WRITE_ACCESS"),
88+
Resource: ptr.To("PERMISSION_POOLGROUP"),
8989
},
9090
{
91-
Type: pointer.StringPtr("WRITE_ACCESS"),
92-
Resource: pointer.StringPtr("PERMISSION_HTTPPOLICYSET"),
91+
Type: ptr.To("WRITE_ACCESS"),
92+
Resource: ptr.To("PERMISSION_HTTPPOLICYSET"),
9393
},
9494
{
95-
Type: pointer.StringPtr("WRITE_ACCESS"),
96-
Resource: pointer.StringPtr("PERMISSION_NETWORKSECURITYPOLICY"),
95+
Type: ptr.To("WRITE_ACCESS"),
96+
Resource: ptr.To("PERMISSION_NETWORKSECURITYPOLICY"),
9797
},
9898
{
99-
Type: pointer.StringPtr("WRITE_ACCESS"),
100-
Resource: pointer.StringPtr("PERMISSION_AUTOSCALE"),
99+
Type: ptr.To("WRITE_ACCESS"),
100+
Resource: ptr.To("PERMISSION_AUTOSCALE"),
101101
},
102102
{
103-
Type: pointer.StringPtr("WRITE_ACCESS"),
104-
Resource: pointer.StringPtr("PERMISSION_DNSPOLICY"),
103+
Type: ptr.To("WRITE_ACCESS"),
104+
Resource: ptr.To("PERMISSION_DNSPOLICY"),
105105
},
106106
{
107-
Type: pointer.StringPtr("WRITE_ACCESS"),
108-
Resource: pointer.StringPtr("PERMISSION_NETWORKPROFILE"),
107+
Type: ptr.To("WRITE_ACCESS"),
108+
Resource: ptr.To("PERMISSION_NETWORKPROFILE"),
109109
},
110110
{
111-
Type: pointer.StringPtr("WRITE_ACCESS"),
112-
Resource: pointer.StringPtr("PERMISSION_APPLICATIONPROFILE"),
111+
Type: ptr.To("WRITE_ACCESS"),
112+
Resource: ptr.To("PERMISSION_APPLICATIONPROFILE"),
113113
},
114114
{
115-
Type: pointer.StringPtr("WRITE_ACCESS"),
116-
Resource: pointer.StringPtr("PERMISSION_APPLICATIONPERSISTENCEPROFILE"),
115+
Type: ptr.To("WRITE_ACCESS"),
116+
Resource: ptr.To("PERMISSION_APPLICATIONPERSISTENCEPROFILE"),
117117
},
118118
{
119-
Type: pointer.StringPtr("WRITE_ACCESS"),
120-
Resource: pointer.StringPtr("PERMISSION_HEALTHMONITOR"),
119+
Type: ptr.To("WRITE_ACCESS"),
120+
Resource: ptr.To("PERMISSION_HEALTHMONITOR"),
121121
},
122122
{
123-
Type: pointer.StringPtr("WRITE_ACCESS"),
124-
Resource: pointer.StringPtr("PERMISSION_ANALYTICSPROFILE"),
123+
Type: ptr.To("WRITE_ACCESS"),
124+
Resource: ptr.To("PERMISSION_ANALYTICSPROFILE"),
125125
},
126126
{
127-
Type: pointer.StringPtr("WRITE_ACCESS"),
128-
Resource: pointer.StringPtr("PERMISSION_IPAMDNSPROVIDERPROFILE"),
127+
Type: ptr.To("WRITE_ACCESS"),
128+
Resource: ptr.To("PERMISSION_IPAMDNSPROVIDERPROFILE"),
129129
},
130130
{
131-
Type: pointer.StringPtr("WRITE_ACCESS"),
132-
Resource: pointer.StringPtr("PERMISSION_CUSTOMIPAMDNSPROFILE"),
131+
Type: ptr.To("WRITE_ACCESS"),
132+
Resource: ptr.To("PERMISSION_CUSTOMIPAMDNSPROFILE"),
133133
},
134134
{
135-
Type: pointer.StringPtr("WRITE_ACCESS"),
136-
Resource: pointer.StringPtr("PERMISSION_TRAFFICCLONEPROFILE"),
135+
Type: ptr.To("WRITE_ACCESS"),
136+
Resource: ptr.To("PERMISSION_TRAFFICCLONEPROFILE"),
137137
},
138138
{
139-
Type: pointer.StringPtr("READ_ACCESS"),
140-
Resource: pointer.StringPtr("PERMISSION_IPADDRGROUP"),
139+
Type: ptr.To("READ_ACCESS"),
140+
Resource: ptr.To("PERMISSION_IPADDRGROUP"),
141141
},
142142
{
143-
Type: pointer.StringPtr("READ_ACCESS"),
144-
Resource: pointer.StringPtr("PERMISSION_STRINGGROUP"),
143+
Type: ptr.To("READ_ACCESS"),
144+
Resource: ptr.To("PERMISSION_STRINGGROUP"),
145145
},
146146
{
147-
Type: pointer.StringPtr("WRITE_ACCESS"),
148-
Resource: pointer.StringPtr("PERMISSION_VSDATASCRIPTSET"),
147+
Type: ptr.To("WRITE_ACCESS"),
148+
Resource: ptr.To("PERMISSION_VSDATASCRIPTSET"),
149149
},
150150
{
151-
Type: pointer.StringPtr("READ_ACCESS"),
152-
Resource: pointer.StringPtr("PERMISSION_PROTOCOLPARSER"),
151+
Type: ptr.To("READ_ACCESS"),
152+
Resource: ptr.To("PERMISSION_PROTOCOLPARSER"),
153153
},
154154
{
155-
Type: pointer.StringPtr("READ_ACCESS"),
156-
Resource: pointer.StringPtr("PERMISSION_SSLPROFILE"),
155+
Type: ptr.To("READ_ACCESS"),
156+
Resource: ptr.To("PERMISSION_SSLPROFILE"),
157157
},
158158
{
159-
Type: pointer.StringPtr("READ_ACCESS"),
160-
Resource: pointer.StringPtr("PERMISSION_AUTHPROFILE"),
159+
Type: ptr.To("READ_ACCESS"),
160+
Resource: ptr.To("PERMISSION_AUTHPROFILE"),
161161
},
162162
{
163-
Type: pointer.StringPtr("READ_ACCESS"),
164-
Resource: pointer.StringPtr("PERMISSION_PINGACCESSAGENT"),
163+
Type: ptr.To("READ_ACCESS"),
164+
Resource: ptr.To("PERMISSION_PINGACCESSAGENT"),
165165
},
166166
{
167-
Type: pointer.StringPtr("WRITE_ACCESS"),
168-
Resource: pointer.StringPtr("PERMISSION_PKIPROFILE"),
167+
Type: ptr.To("WRITE_ACCESS"),
168+
Resource: ptr.To("PERMISSION_PKIPROFILE"),
169169
},
170170
{
171-
Type: pointer.StringPtr("WRITE_ACCESS"),
172-
Resource: pointer.StringPtr("PERMISSION_SSLKEYANDCERTIFICATE"),
171+
Type: ptr.To("WRITE_ACCESS"),
172+
Resource: ptr.To("PERMISSION_SSLKEYANDCERTIFICATE"),
173173
},
174174
{
175-
Type: pointer.StringPtr("READ_ACCESS"),
176-
Resource: pointer.StringPtr("PERMISSION_CERTIFICATEMANAGEMENTPROFILE"),
175+
Type: ptr.To("READ_ACCESS"),
176+
Resource: ptr.To("PERMISSION_CERTIFICATEMANAGEMENTPROFILE"),
177177
},
178178
{
179-
Type: pointer.StringPtr("READ_ACCESS"),
180-
Resource: pointer.StringPtr("PERMISSION_HARDWARESECURITYMODULEGROUP"),
179+
Type: ptr.To("READ_ACCESS"),
180+
Resource: ptr.To("PERMISSION_HARDWARESECURITYMODULEGROUP"),
181181
},
182182
{
183-
Type: pointer.StringPtr("READ_ACCESS"),
184-
Resource: pointer.StringPtr("PERMISSION_SSOPOLICY"),
183+
Type: ptr.To("READ_ACCESS"),
184+
Resource: ptr.To("PERMISSION_SSOPOLICY"),
185185
},
186186
{
187-
Type: pointer.StringPtr("NO_ACCESS"),
188-
Resource: pointer.StringPtr("PERMISSION_NATPOLICY"),
187+
Type: ptr.To("NO_ACCESS"),
188+
Resource: ptr.To("PERMISSION_NATPOLICY"),
189189
},
190190
{
191-
Type: pointer.StringPtr("READ_ACCESS"),
192-
Resource: pointer.StringPtr("PERMISSION_WAFPROFILE"),
191+
Type: ptr.To("READ_ACCESS"),
192+
Resource: ptr.To("PERMISSION_WAFPROFILE"),
193193
},
194194
{
195-
Type: pointer.StringPtr("READ_ACCESS"),
196-
Resource: pointer.StringPtr("PERMISSION_WAFPOLICY"),
195+
Type: ptr.To("READ_ACCESS"),
196+
Resource: ptr.To("PERMISSION_WAFPOLICY"),
197197
},
198198
{
199-
Type: pointer.StringPtr("NO_ACCESS"),
200-
Resource: pointer.StringPtr("PERMISSION_WAFPOLICYPSMGROUP"),
199+
Type: ptr.To("NO_ACCESS"),
200+
Resource: ptr.To("PERMISSION_WAFPOLICYPSMGROUP"),
201201
},
202202
{
203-
Type: pointer.StringPtr("NO_ACCESS"),
204-
Resource: pointer.StringPtr("PERMISSION_ERRORPAGEPROFILE"),
203+
Type: ptr.To("NO_ACCESS"),
204+
Resource: ptr.To("PERMISSION_ERRORPAGEPROFILE"),
205205
},
206206
{
207-
Type: pointer.StringPtr("NO_ACCESS"),
208-
Resource: pointer.StringPtr("PERMISSION_ERRORPAGEBODY"),
207+
Type: ptr.To("NO_ACCESS"),
208+
Resource: ptr.To("PERMISSION_ERRORPAGEBODY"),
209209
},
210210
{
211-
Type: pointer.StringPtr("NO_ACCESS"),
212-
Resource: pointer.StringPtr("PERMISSION_ALERTCONFIG"),
211+
Type: ptr.To("NO_ACCESS"),
212+
Resource: ptr.To("PERMISSION_ALERTCONFIG"),
213213
},
214214
{
215-
Type: pointer.StringPtr("NO_ACCESS"),
216-
Resource: pointer.StringPtr("PERMISSION_ALERT"),
215+
Type: ptr.To("NO_ACCESS"),
216+
Resource: ptr.To("PERMISSION_ALERT"),
217217
},
218218
{
219-
Type: pointer.StringPtr("NO_ACCESS"),
220-
Resource: pointer.StringPtr("PERMISSION_ACTIONGROUPCONFIG"),
219+
Type: ptr.To("NO_ACCESS"),
220+
Resource: ptr.To("PERMISSION_ACTIONGROUPCONFIG"),
221221
},
222222
{
223-
Type: pointer.StringPtr("NO_ACCESS"),
224-
Resource: pointer.StringPtr("PERMISSION_ALERTSYSLOGCONFIG"),
223+
Type: ptr.To("NO_ACCESS"),
224+
Resource: ptr.To("PERMISSION_ALERTSYSLOGCONFIG"),
225225
},
226226
{
227-
Type: pointer.StringPtr("NO_ACCESS"),
228-
Resource: pointer.StringPtr("PERMISSION_ALERTEMAILCONFIG"),
227+
Type: ptr.To("NO_ACCESS"),
228+
Resource: ptr.To("PERMISSION_ALERTEMAILCONFIG"),
229229
},
230230
{
231-
Type: pointer.StringPtr("NO_ACCESS"),
232-
Resource: pointer.StringPtr("PERMISSION_SNMPTRAPPROFILE"),
231+
Type: ptr.To("NO_ACCESS"),
232+
Resource: ptr.To("PERMISSION_SNMPTRAPPROFILE"),
233233
},
234234
{
235-
Type: pointer.StringPtr("NO_ACCESS"),
236-
Resource: pointer.StringPtr("PERMISSION_TRAFFIC_CAPTURE"),
235+
Type: ptr.To("NO_ACCESS"),
236+
Resource: ptr.To("PERMISSION_TRAFFIC_CAPTURE"),
237237
},
238238
{
239-
Type: pointer.StringPtr("READ_ACCESS"),
240-
Resource: pointer.StringPtr("PERMISSION_CLOUD"),
239+
Type: ptr.To("READ_ACCESS"),
240+
Resource: ptr.To("PERMISSION_CLOUD"),
241241
},
242242
{
243-
Type: pointer.StringPtr("NO_ACCESS"),
244-
Resource: pointer.StringPtr("PERMISSION_SERVICEENGINE"),
243+
Type: ptr.To("NO_ACCESS"),
244+
Resource: ptr.To("PERMISSION_SERVICEENGINE"),
245245
},
246246
{
247-
Type: pointer.StringPtr("WRITE_ACCESS"),
248-
Resource: pointer.StringPtr("PERMISSION_SERVICEENGINEGROUP"),
247+
Type: ptr.To("WRITE_ACCESS"),
248+
Resource: ptr.To("PERMISSION_SERVICEENGINEGROUP"),
249249
},
250250
{
251-
Type: pointer.StringPtr("WRITE_ACCESS"),
252-
Resource: pointer.StringPtr("PERMISSION_NETWORK"),
251+
Type: ptr.To("WRITE_ACCESS"),
252+
Resource: ptr.To("PERMISSION_NETWORK"),
253253
},
254254
{
255-
Type: pointer.StringPtr("WRITE_ACCESS"),
256-
Resource: pointer.StringPtr("PERMISSION_VRFCONTEXT"),
255+
Type: ptr.To("WRITE_ACCESS"),
256+
Resource: ptr.To("PERMISSION_VRFCONTEXT"),
257257
},
258258
{
259-
Type: pointer.StringPtr("NO_ACCESS"),
260-
Resource: pointer.StringPtr("PERMISSION_USER_CREDENTIAL"),
259+
Type: ptr.To("NO_ACCESS"),
260+
Resource: ptr.To("PERMISSION_USER_CREDENTIAL"),
261261
},
262262
{
263-
Type: pointer.StringPtr("READ_ACCESS"),
264-
Resource: pointer.StringPtr("PERMISSION_SYSTEMCONFIGURATION"),
263+
Type: ptr.To("READ_ACCESS"),
264+
Resource: ptr.To("PERMISSION_SYSTEMCONFIGURATION"),
265265
},
266266
{
267-
Type: pointer.StringPtr("READ_ACCESS"),
268-
Resource: pointer.StringPtr("PERMISSION_CONTROLLER"),
267+
Type: ptr.To("READ_ACCESS"),
268+
Resource: ptr.To("PERMISSION_CONTROLLER"),
269269
},
270270
{
271-
Type: pointer.StringPtr("NO_ACCESS"),
272-
Resource: pointer.StringPtr("PERMISSION_REBOOT"),
271+
Type: ptr.To("NO_ACCESS"),
272+
Resource: ptr.To("PERMISSION_REBOOT"),
273273
},
274274
{
275-
Type: pointer.StringPtr("NO_ACCESS"),
276-
Resource: pointer.StringPtr("PERMISSION_UPGRADE"),
275+
Type: ptr.To("NO_ACCESS"),
276+
Resource: ptr.To("PERMISSION_UPGRADE"),
277277
},
278278
{
279-
Type: pointer.StringPtr("NO_ACCESS"),
280-
Resource: pointer.StringPtr("PERMISSION_TECHSUPPORT"),
279+
Type: ptr.To("NO_ACCESS"),
280+
Resource: ptr.To("PERMISSION_TECHSUPPORT"),
281281
},
282282
{
283-
Type: pointer.StringPtr("NO_ACCESS"),
284-
Resource: pointer.StringPtr("PERMISSION_INTERNAL"),
283+
Type: ptr.To("NO_ACCESS"),
284+
Resource: ptr.To("PERMISSION_INTERNAL"),
285285
},
286286
{
287-
Type: pointer.StringPtr("NO_ACCESS"),
288-
Resource: pointer.StringPtr("PERMISSION_CONTROLLERSITE"),
287+
Type: ptr.To("NO_ACCESS"),
288+
Resource: ptr.To("PERMISSION_CONTROLLERSITE"),
289289
},
290290
{
291-
Type: pointer.StringPtr("NO_ACCESS"),
292-
Resource: pointer.StringPtr("PERMISSION_IMAGE"),
291+
Type: ptr.To("NO_ACCESS"),
292+
Resource: ptr.To("PERMISSION_IMAGE"),
293293
},
294294
{
295-
Type: pointer.StringPtr("NO_ACCESS"),
296-
Resource: pointer.StringPtr("PERMISSION_USER"),
295+
Type: ptr.To("NO_ACCESS"),
296+
Resource: ptr.To("PERMISSION_USER"),
297297
},
298298
{
299-
Type: pointer.StringPtr("NO_ACCESS"),
300-
Resource: pointer.StringPtr("PERMISSION_ROLE"),
299+
Type: ptr.To("NO_ACCESS"),
300+
Resource: ptr.To("PERMISSION_ROLE"),
301301
},
302302
{
303-
Type: pointer.StringPtr("READ_ACCESS"),
304-
Resource: pointer.StringPtr("PERMISSION_TENANT"),
303+
Type: ptr.To("READ_ACCESS"),
304+
Resource: ptr.To("PERMISSION_TENANT"),
305305
},
306306
{
307-
Type: pointer.StringPtr("NO_ACCESS"),
308-
Resource: pointer.StringPtr("PERMISSION_GSLB"),
307+
Type: ptr.To("NO_ACCESS"),
308+
Resource: ptr.To("PERMISSION_GSLB"),
309309
},
310310
{
311-
Type: pointer.StringPtr("NO_ACCESS"),
312-
Resource: pointer.StringPtr("PERMISSION_GSLBSERVICE"),
311+
Type: ptr.To("NO_ACCESS"),
312+
Resource: ptr.To("PERMISSION_GSLBSERVICE"),
313313
},
314314
{
315-
Type: pointer.StringPtr("NO_ACCESS"),
316-
Resource: pointer.StringPtr("PERMISSION_GSLBGEODBPROFILE"),
315+
Type: ptr.To("NO_ACCESS"),
316+
Resource: ptr.To("PERMISSION_GSLBGEODBPROFILE"),
317317
},
318318
{
319-
Type: pointer.StringPtr("WRITE_ACCESS"),
320-
Resource: pointer.StringPtr("PERMISSION_L4POLICYSET"),
319+
Type: ptr.To("WRITE_ACCESS"),
320+
Resource: ptr.To("PERMISSION_L4POLICYSET"),
321321
},
322322
}

‎controllers/akodeploymentconfig/user/user_controller.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1818
"k8s.io/apimachinery/pkg/runtime"
1919
"k8s.io/utils/pointer"
20+
"k8s.io/utils/ptr"
2021
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
2122
"sigs.k8s.io/cluster-api/util/conditions"
2223
ctrl "sigs.k8s.io/controller-runtime"
@@ -309,7 +310,7 @@ func (r *AkoUserReconciler) getOrCreateAkoUserRole(roleTenantRef *string) (*mode
309310
//not found ako user role, create one
310311
if aviclient.IsAviRoleNonExistentError(err) {
311312
role = &models.Role{
312-
Name: pointer.StringPtr(akoov1alpha1.AkoUserRoleName),
313+
Name: ptr.To(akoov1alpha1.AkoUserRoleName),
313314
Privileges: AkoRolePermission,
314315
TenantRef: roleTenantRef,
315316
}
@@ -332,7 +333,7 @@ func (r *AkoUserReconciler) ensureAkoUserRole() (*models.Role, error) {
332333
for i, permission := range role.Privileges {
333334
if AkoRolePermissionMap[*permission.Resource] != *permission.Type {
334335
needSync = true
335-
role.Privileges[i].Type = pointer.StringPtr(AkoRolePermissionMap[*permission.Resource])
336+
role.Privileges[i].Type = ptr.To(AkoRolePermissionMap[*permission.Resource])
336337
}
337338
}
338339
if needSync {

‎pkg/haprovider/haprovider_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
fakeClient "sigs.k8s.io/controller-runtime/pkg/client/fake"
1313

1414
apierrors "k8s.io/apimachinery/pkg/api/errors"
15-
"k8s.io/utils/pointer"
15+
"k8s.io/utils/ptr"
1616

1717
corev1 "k8s.io/api/core/v1"
1818
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -421,7 +421,7 @@ var _ = Describe("Control Plane HA provider", func() {
421421
Expect(haProvider.Client.Get(ctx, key, ep)).ShouldNot(HaveOccurred())
422422
Expect(len(ep.Subsets[0].Addresses)).Should(Equal(1))
423423
Expect(ep.Subsets[0].Addresses[0].IP).Should(Equal("1.1.1.1"))
424-
Expect(ep.Subsets[0].Addresses[0].NodeName).Should(Equal(pointer.StringPtr("test-mc")))
424+
Expect(ep.Subsets[0].Addresses[0].NodeName).Should(Equal(ptr.To("test-mc")))
425425
})
426426

427427
It("should not add a duplicated machine", func() {
@@ -431,7 +431,7 @@ var _ = Describe("Control Plane HA provider", func() {
431431
Expect(haProvider.Client.Get(ctx, key, ep)).ShouldNot(HaveOccurred())
432432
Expect(len(ep.Subsets[0].Addresses)).Should(Equal(1))
433433
Expect(ep.Subsets[0].Addresses[0].IP).Should(Equal("1.1.1.1"))
434-
Expect(ep.Subsets[0].Addresses[0].NodeName).Should(Equal(pointer.StringPtr("test-mc")))
434+
Expect(ep.Subsets[0].Addresses[0].NodeName).Should(Equal(ptr.To("test-mc")))
435435
})
436436

437437
It("should not add machine's other type IP", func() {
@@ -452,7 +452,7 @@ var _ = Describe("Control Plane HA provider", func() {
452452
Expect(haProvider.Client.Get(ctx, key, ep)).ShouldNot(HaveOccurred())
453453
Expect(len(ep.Subsets[0].Addresses)).Should(Equal(1))
454454
Expect(ep.Subsets[0].Addresses[0].IP).Should(Equal("1.1.1.1"))
455-
Expect(ep.Subsets[0].Addresses[0].NodeName).Should(Equal(pointer.StringPtr("test-mc")))
455+
Expect(ep.Subsets[0].Addresses[0].NodeName).Should(Equal(ptr.To("test-mc")))
456456
})
457457

458458
It("should update endpoints when machine ip changed", func() {
@@ -475,7 +475,7 @@ var _ = Describe("Control Plane HA provider", func() {
475475
Expect(haProvider.Client.Get(ctx, key, ep)).ShouldNot(HaveOccurred())
476476
Expect(len(ep.Subsets[0].Addresses)).Should(Equal(1))
477477
Expect(ep.Subsets[0].Addresses[0].IP).Should(Equal("1.1.1.2"))
478-
Expect(ep.Subsets[0].Addresses[0].NodeName).Should(Equal(pointer.StringPtr("test-mc")))
478+
Expect(ep.Subsets[0].Addresses[0].NodeName).Should(Equal(ptr.To("test-mc")))
479479
})
480480

481481
It("should remove machine from endpoints when machine deleting", func() {
@@ -508,7 +508,7 @@ var _ = Describe("Control Plane HA provider", func() {
508508
Expect(haProvider.Client.Get(ctx, key, ep)).ShouldNot(HaveOccurred())
509509
Expect(len(ep.Subsets[0].Addresses)).Should(Equal(1))
510510
Expect(ep.Subsets[0].Addresses[0].IP).Should(Equal("1.1.1.2"))
511-
Expect(ep.Subsets[0].Addresses[0].NodeName).Should(Equal(pointer.StringPtr("test-mc-2")))
511+
Expect(ep.Subsets[0].Addresses[0].NodeName).Should(Equal(ptr.To("test-mc-2")))
512512

513513
mc2.DeletionTimestamp = &time
514514

‎pkg/test/util/data.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import (
1515

1616
const (
1717
// CharSet defines the alphanumeric set for random string generation.
18-
CharSet = "0123456789abcdefghijklmnopqrstuvwxyz"
18+
CharSet = "0123456789abcdefghijklmnopqrstuvwxyz"
19+
CustomADCName = "ako-deployment-config"
1920
)
2021

2122
var rnd = rand.New(rand.NewSource(time.Now().UnixNano())) //nolint:gosec
@@ -96,7 +97,7 @@ func GetCustomizedADC(labels map[string]string) *akoov1alpha1.AKODeploymentConfi
9697
}
9798
return &akoov1alpha1.AKODeploymentConfig{
9899
ObjectMeta: metav1.ObjectMeta{
99-
Name: "ako-deployment-config",
100+
Name: CustomADCName,
100101
},
101102
Spec: *spec,
102103
}

0 commit comments

Comments
 (0)
Please sign in to comment.