Skip to content

Commit dab0225

Browse files
oliverbaehleroliverbaehler
authored
fix(deps): use new pointer func (#982)
Signed-off-by: Oliver Bähler <oliverbaehler@hotmail.com>
1 parent d1be14d commit dab0225

17 files changed

+41
-40
lines changed

‎controllers/tls/manager.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"k8s.io/apimachinery/pkg/runtime"
2020
"k8s.io/apimachinery/pkg/types"
2121
"k8s.io/client-go/util/retry"
22-
"k8s.io/utils/pointer"
22+
"k8s.io/utils/ptr"
2323
ctrl "sigs.k8s.io/controller-runtime"
2424
"sigs.k8s.io/controller-runtime/pkg/builder"
2525
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -234,8 +234,8 @@ func (r *Reconciler) updateTenantCustomResourceDefinition(ctx context.Context, n
234234
Service: &apiextensionsv1.ServiceReference{
235235
Namespace: r.Namespace,
236236
Name: "capsule-webhook-service",
237-
Path: pointer.String("/convert"),
238-
Port: pointer.Int32(443),
237+
Path: ptr.To("/convert"),
238+
Port: ptr.To(int32(443)),
239239
},
240240
CABundle: caBundle,
241241
},

‎e2e/disable_externalname_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
corev1 "k8s.io/api/core/v1"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
"k8s.io/apimachinery/pkg/util/intstr"
16-
"k8s.io/utils/pointer"
16+
"k8s.io/utils/ptr"
1717

1818
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
1919
"github.com/projectcapsule/capsule/pkg/api"
@@ -33,7 +33,7 @@ var _ = Describe("creating an ExternalName service when it is disabled for Tenan
3333
},
3434
ServiceOptions: &api.ServiceOptions{
3535
AllowedServices: &api.AllowedServices{
36-
ExternalName: pointer.Bool(false),
36+
ExternalName: ptr.To(false),
3737
},
3838
},
3939
},

‎e2e/disable_loadbalancer_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
corev1 "k8s.io/api/core/v1"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
"k8s.io/apimachinery/pkg/util/intstr"
16-
"k8s.io/utils/pointer"
16+
"k8s.io/utils/ptr"
1717

1818
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
1919
"github.com/projectcapsule/capsule/pkg/api"
@@ -33,7 +33,7 @@ var _ = Describe("creating a LoadBalancer service when it is disabled for Tenant
3333
},
3434
ServiceOptions: &api.ServiceOptions{
3535
AllowedServices: &api.AllowedServices{
36-
LoadBalancer: pointer.Bool(false),
36+
LoadBalancer: ptr.To(false),
3737
},
3838
},
3939
},

‎e2e/disable_node_ports_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
corev1 "k8s.io/api/core/v1"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
"k8s.io/apimachinery/pkg/util/intstr"
16-
"k8s.io/utils/pointer"
16+
"k8s.io/utils/ptr"
1717

1818
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
1919
"github.com/projectcapsule/capsule/pkg/api"
@@ -33,7 +33,7 @@ var _ = Describe("creating a nodePort service when it is disabled for Tenant", f
3333
},
3434
ServiceOptions: &api.ServiceOptions{
3535
AllowedServices: &api.AllowedServices{
36-
NodePort: pointer.Bool(false),
36+
NodePort: ptr.To(false),
3737
},
3838
},
3939
},

‎e2e/enable_loadbalancer_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
corev1 "k8s.io/api/core/v1"
1414
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1515
"k8s.io/apimachinery/pkg/util/intstr"
16-
"k8s.io/utils/pointer"
16+
"k8s.io/utils/ptr"
1717

1818
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
1919
"github.com/projectcapsule/capsule/pkg/api"
@@ -33,7 +33,7 @@ var _ = Describe("creating a LoadBalancer service when it is enabled for Tenant"
3333
},
3434
ServiceOptions: &api.ServiceOptions{
3535
AllowedServices: &api.AllowedServices{
36-
LoadBalancer: pointer.Bool(true),
36+
LoadBalancer: ptr.To(true),
3737
},
3838
},
3939
},

‎e2e/globaltenantresource_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"k8s.io/apimachinery/pkg/runtime"
1919
"k8s.io/apimachinery/pkg/selection"
2020
"k8s.io/apimachinery/pkg/types"
21-
"k8s.io/utils/pointer"
21+
"k8s.io/utils/ptr"
2222
"sigs.k8s.io/controller-runtime/pkg/client"
2323

2424
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
@@ -83,7 +83,7 @@ var _ = Describe("Creating a GlobalTenantResource object", func() {
8383
},
8484
TenantResourceSpec: capsulev1beta2.TenantResourceSpec{
8585
ResyncPeriod: metav1.Duration{Duration: time.Minute},
86-
PruningOnDelete: pointer.Bool(true),
86+
PruningOnDelete: ptr.To(true),
8787
Resources: []capsulev1beta2.ResourceSpec{
8888
{
8989
NamespacedItems: []capsulev1beta2.ObjectReference{

‎e2e/ingress_class_extensions_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
1515
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1616
"k8s.io/apimachinery/pkg/util/intstr"
17-
"k8s.io/utils/pointer"
17+
"k8s.io/utils/ptr"
1818

1919
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
2020
"github.com/projectcapsule/capsule/pkg/api"
@@ -131,7 +131,7 @@ var _ = Describe("when Tenant handles Ingress classes with extensions/v1beta1",
131131
Name: "denied-ingress",
132132
},
133133
Spec: extensionsv1beta1.IngressSpec{
134-
IngressClassName: pointer.String("the-worst-ingress-available"),
134+
IngressClassName: ptr.To("the-worst-ingress-available"),
135135
Backend: &extensionsv1beta1.IngressBackend{
136136
ServiceName: "foo",
137137
ServicePort: intstr.FromInt(8080),

‎e2e/ingress_class_networking_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"k8s.io/apimachinery/pkg/labels"
1919
"k8s.io/apimachinery/pkg/selection"
2020
"k8s.io/apimachinery/pkg/types"
21-
"k8s.io/utils/pointer"
21+
"k8s.io/utils/ptr"
2222
"sigs.k8s.io/controller-runtime/pkg/client"
2323

2424
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
@@ -220,7 +220,7 @@ var _ = Describe("when Tenant handles Ingress classes with networking.k8s.io/v1"
220220
Name: "denied-ingress",
221221
},
222222
Spec: networkingv1.IngressSpec{
223-
IngressClassName: pointer.String("the-worst-ingress-available"),
223+
IngressClassName: ptr.To("the-worst-ingress-available"),
224224
DefaultBackend: &networkingv1.IngressBackend{
225225
Service: &networkingv1.IngressServiceBackend{
226226
Name: "foo",

‎e2e/overquota_namespace_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
. "github.com/onsi/ginkgo/v2"
1212
. "github.com/onsi/gomega"
1313
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
14-
"k8s.io/utils/pointer"
14+
"k8s.io/utils/ptr"
1515

1616
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
1717
)
@@ -29,7 +29,7 @@ var _ = Describe("creating a Namespace in over-quota of three", func() {
2929
},
3030
},
3131
NamespaceOptions: &capsulev1beta2.NamespaceOptions{
32-
Quota: pointer.Int32(3),
32+
Quota: ptr.To(int32(3)),
3333
},
3434
},
3535
}

‎e2e/preventing_pv_cross_tenant_mount_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"k8s.io/apimachinery/pkg/api/resource"
1515
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1616
"k8s.io/apimachinery/pkg/types"
17-
"k8s.io/utils/pointer"
17+
"k8s.io/utils/ptr"
1818
"sigs.k8s.io/controller-runtime/pkg/client"
1919

2020
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
@@ -84,7 +84,7 @@ var _ = Describe("preventing PersistentVolume cross-tenant mount", func() {
8484
corev1.ResourceStorage: resource.MustParse("1Gi"),
8585
},
8686
},
87-
StorageClassName: pointer.String("standard"),
87+
StorageClassName: ptr.To("standard"),
8888
},
8989
}
9090

@@ -167,7 +167,7 @@ var _ = Describe("preventing PersistentVolume cross-tenant mount", func() {
167167
return k8sClient.Update(context.Background(), &pv)
168168
}, defaultTimeoutInterval, defaultPollInterval).Should(Succeed())
169169

170-
Expect(k8sClient.Delete(context.Background(), &pod, &client.DeleteOptions{GracePeriodSeconds: pointer.Int64(0)})).ToNot(HaveOccurred())
170+
Expect(k8sClient.Delete(context.Background(), &pod, &client.DeleteOptions{GracePeriodSeconds: ptr.To(int64(0))})).ToNot(HaveOccurred())
171171

172172
ns2 := NewNamespace("")
173173
NamespaceCreation(ns2, tnt2.Spec.Owners[0], defaultTimeoutInterval).Should(Succeed())
@@ -188,7 +188,7 @@ var _ = Describe("preventing PersistentVolume cross-tenant mount", func() {
188188
corev1.ResourceStorage: resource.MustParse("1Gi"),
189189
},
190190
},
191-
StorageClassName: pointer.String("standard"),
191+
StorageClassName: ptr.To("standard"),
192192
VolumeName: pv.Name,
193193
},
194194
}

‎e2e/resource_quota_exceeded_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"k8s.io/apimachinery/pkg/api/resource"
1919
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2020
"k8s.io/apimachinery/pkg/types"
21-
"k8s.io/utils/pointer"
21+
"k8s.io/utils/ptr"
2222

2323
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
2424
)
@@ -135,7 +135,7 @@ var _ = Describe("exceeding a Tenant resource quota", func() {
135135
Name: "my-pause",
136136
},
137137
Spec: appsv1.DeploymentSpec{
138-
Replicas: pointer.Int32(5),
138+
Replicas: ptr.To(int32(5)),
139139
Selector: &metav1.LabelSelector{
140140
MatchLabels: map[string]string{
141141
"app": "pause",

‎e2e/service_metadata_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1919
"k8s.io/apimachinery/pkg/types"
2020
"k8s.io/apimachinery/pkg/util/intstr"
21-
"k8s.io/utils/pointer"
21+
"k8s.io/utils/ptr"
2222
"sigs.k8s.io/controller-runtime/pkg/client"
2323

2424
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
@@ -269,8 +269,8 @@ var _ = Describe("adding metadata to Service objects", func() {
269269
},
270270
Ports: []discoveryv1beta1.EndpointPort{
271271
{
272-
Name: pointer.String("foo"),
273-
Port: pointer.Int32(9999),
272+
Name: ptr.To("foo"),
273+
Port: ptr.To(int32(9999)),
274274
},
275275
},
276276
}
@@ -288,8 +288,8 @@ var _ = Describe("adding metadata to Service objects", func() {
288288
},
289289
Ports: []discoveryv1.EndpointPort{
290290
{
291-
Name: pointer.String("foo"),
292-
Port: pointer.Int32(9999),
291+
Name: ptr.To("foo"),
292+
Port: ptr.To(int32(9999)),
293293
},
294294
},
295295
}

‎e2e/storage_class_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2222
"k8s.io/apimachinery/pkg/labels"
2323
"k8s.io/apimachinery/pkg/selection"
24-
"k8s.io/utils/pointer"
24+
"k8s.io/utils/ptr"
2525
"sigs.k8s.io/controller-runtime/pkg/client"
2626

2727
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
@@ -230,13 +230,14 @@ var _ = Describe("when Tenant handles Storage classes", func() {
230230
TenantNamespaceList(tntNoDefaults, defaultTimeoutInterval).Should(ContainElement(ns.GetName()))
231231
By("using exact matches", func() {
232232
for _, c := range tntNoDefaults.Spec.StorageClasses.Exact {
233+
233234
Eventually(func() (err error) {
234235
p := &corev1.PersistentVolumeClaim{
235236
ObjectMeta: metav1.ObjectMeta{
236237
Name: c,
237238
},
238239
Spec: corev1.PersistentVolumeClaimSpec{
239-
StorageClassName: pointer.String(c),
240+
StorageClassName: ptr.To(c),
240241
AccessModes: []corev1.PersistentVolumeAccessMode{corev1.ReadWriteOnce},
241242
Resources: corev1.ResourceRequirements{
242243
Requests: map[corev1.ResourceName]resource.Quantity{

‎e2e/suite_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"k8s.io/client-go/kubernetes"
1414
"k8s.io/client-go/kubernetes/scheme"
1515
"k8s.io/client-go/rest"
16-
"k8s.io/utils/pointer"
16+
"k8s.io/utils/ptr"
1717
"sigs.k8s.io/controller-runtime/pkg/client"
1818
"sigs.k8s.io/controller-runtime/pkg/client/config"
1919
"sigs.k8s.io/controller-runtime/pkg/envtest"
@@ -43,7 +43,7 @@ var _ = BeforeSuite(func() {
4343

4444
By("bootstrapping test environment")
4545
testEnv = &envtest.Environment{
46-
UseExistingCluster: pointer.Bool(true),
46+
UseExistingCluster: ptr.To(true),
4747
}
4848

4949
var err error

‎e2e/tenantresource_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"k8s.io/apimachinery/pkg/runtime"
2020
"k8s.io/apimachinery/pkg/selection"
2121
"k8s.io/apimachinery/pkg/types"
22-
"k8s.io/utils/pointer"
22+
"k8s.io/utils/ptr"
2323
"sigs.k8s.io/controller-runtime/pkg/client"
2424

2525
capsulev1beta2 "github.com/projectcapsule/capsule/api/v1beta2"
@@ -77,7 +77,7 @@ var _ = Describe("Creating a TenantResource object", func() {
7777
},
7878
Spec: capsulev1beta2.TenantResourceSpec{
7979
ResyncPeriod: metav1.Duration{Duration: time.Minute},
80-
PruningOnDelete: pointer.Bool(true),
80+
PruningOnDelete: ptr.To(true),
8181
Resources: []capsulev1beta2.ResourceSpec{
8282
{
8383
NamespaceSelector: &metav1.LabelSelector{
@@ -371,7 +371,7 @@ var _ = Describe("Creating a TenantResource object", func() {
371371
Expect(k8sClient.Get(context.TODO(), types.NamespacedName{Name: tr.GetName(), Namespace: "solar-system"}, tr)).ToNot(HaveOccurred())
372372
Expect(*tr.Spec.PruningOnDelete).Should(BeTrue())
373373

374-
tr.Spec.PruningOnDelete = pointer.Bool(false)
374+
tr.Spec.PruningOnDelete = ptr.To(false)
375375

376376
Expect(k8sClient.Update(context.TODO(), tr)).ToNot(HaveOccurred())
377377

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ require (
1818
k8s.io/apiextensions-apiserver v0.28.4
1919
k8s.io/apimachinery v0.28.4
2020
k8s.io/client-go v0.28.4
21-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
21+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
2222
sigs.k8s.io/cluster-api v1.6.1
2323
sigs.k8s.io/controller-runtime v0.16.3
2424
)

‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,8 @@ k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
257257
k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
258258
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=
259259
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
260-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
261-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
260+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ=
261+
k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
262262
sigs.k8s.io/cluster-api v1.6.1 h1:I34p/fwgRlEhs+o9cUhKXDwNNfPS3no0yJsd2bJyQVc=
263263
sigs.k8s.io/cluster-api v1.6.1/go.mod h1:DaxwruDvSaEYq5q6FREDaGzX6UsAVUCA99Sp8vfMHyQ=
264264
sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4=

0 commit comments

Comments
 (0)