Skip to content

Commit d8690fc

Browse files
breuerfelixbreuerfelix
authored
update go to 1.26.1 (#56)
Signed-off-by: Felix Breuer <f.breuer94@gmail.com>
1 parent bc5a91b commit d8690fc

Some content is hidden

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

47 files changed

+427
-469
lines changed

‎.golangci.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ linters:
1313
- gosec
1414
- importas
1515
- misspell
16+
- modernize
1617
- nilerr
1718
- nolintlint
1819
- prealloc

‎go.mod‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/stackitcloud/gardener-extension-provider-stackit/v2
22

3-
go 1.25.6
4-
5-
toolchain go1.26.1
3+
go 1.26.1
64

75
require (
86
github.com/Masterminds/semver/v3 v3.4.0

‎pkg/admission/mutator/mutator.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
extensionswebhook "github.com/gardener/gardener/extensions/pkg/webhook"
99
gardencorev1beta1 "github.com/gardener/gardener/pkg/apis/core/v1beta1"
1010
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
11-
"k8s.io/utils/ptr"
1211
"sigs.k8s.io/controller-runtime/pkg/log"
1312
"sigs.k8s.io/controller-runtime/pkg/manager"
1413

@@ -32,7 +31,7 @@ func New(mgr manager.Manager) (*extensionswebhook.Webhook, error) {
3231
Path: "/webhooks/mutate",
3332
Mutators: map[extensionswebhook.Mutator][]extensionswebhook.Type{
3433
NewShootMutator(mgr): {{Obj: &gardencorev1beta1.Shoot{}}},
35-
NewNamespacedCloudProfileMutator(mgr): {{Obj: &gardencorev1beta1.NamespacedCloudProfile{}, Subresource: ptr.To("status")}},
34+
NewNamespacedCloudProfileMutator(mgr): {{Obj: &gardencorev1beta1.NamespacedCloudProfile{}, Subresource: new("status")}},
3635
},
3736
Target: extensionswebhook.TargetSeed,
3837
ObjectSelector: &metav1.LabelSelector{

‎pkg/admission/mutator/namespacedcloudprofile_test.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1818
"k8s.io/apimachinery/pkg/runtime"
1919
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
20-
"k8s.io/utils/ptr"
2120
"sigs.k8s.io/controller-runtime/pkg/client"
2221
fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
2322
"sigs.k8s.io/controller-runtime/pkg/manager"
@@ -66,7 +65,7 @@ var _ = Describe("NamespacedCloudProfile Mutator", func() {
6665
})
6766

6867
It("should skip if NamespacedCloudProfile is in deletion phase", func() {
69-
namespacedCloudProfile.DeletionTimestamp = ptr.To(metav1.Now())
68+
namespacedCloudProfile.DeletionTimestamp = new(metav1.Now())
7069
expectedProfile := namespacedCloudProfile.DeepCopy()
7170

7271
Expect(namespacedCloudProfileMutator.Mutate(ctx, namespacedCloudProfile, nil)).To(Succeed())
@@ -140,7 +139,7 @@ var _ = Describe("NamespacedCloudProfile Mutator", func() {
140139
"Name": Equal("image-1"),
141140
"Versions": ContainElements(
142141
stackitv1alpha1.MachineImageVersion{Version: "1.0", Image: "image-name-1", Regions: []stackitv1alpha1.RegionIDMapping{{Name: "image-region-1", ID: "id-img-reg-1"}}},
143-
stackitv1alpha1.MachineImageVersion{Version: "1.1", Image: "image-name-2", Regions: []stackitv1alpha1.RegionIDMapping{{Name: "image-region-2", ID: "id-img-reg-2", Architecture: ptr.To("armhf")}}},
142+
stackitv1alpha1.MachineImageVersion{Version: "1.1", Image: "image-name-2", Regions: []stackitv1alpha1.RegionIDMapping{{Name: "image-region-2", ID: "id-img-reg-2", Architecture: new("armhf")}}},
144143
),
145144
}),
146145
MatchFields(IgnoreExtras, Fields{

‎pkg/admission/mutator/shoot.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"k8s.io/apimachinery/pkg/runtime/serializer"
1616
"k8s.io/apimachinery/pkg/runtime/serializer/json"
1717
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
18-
"k8s.io/utils/ptr"
1918
"sigs.k8s.io/controller-runtime/pkg/client"
2019
"sigs.k8s.io/controller-runtime/pkg/manager"
2120

@@ -120,7 +119,7 @@ func isShootInMigrationOrRestorePhase(shoot *gardencorev1beta1.Shoot) bool {
120119
// and disables the ntp service.
121120
func (s *shoot) mutateMachineImageVersion(shoot *gardencorev1beta1.Shoot) error {
122121
ptpOverride := configv1alpha1.ExtensionConfig{NTP: &configv1alpha1.NTPConfig{
123-
Enabled: ptr.To(false),
122+
Enabled: new(false),
124123
}}
125124
providerConfigBuf := new(bytes.Buffer)
126125
err := encoder.Encode(&ptpOverride, providerConfigBuf)

‎pkg/admission/mutator/shoot_test.go‎

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import (
1717
"k8s.io/apimachinery/pkg/runtime"
1818
"k8s.io/apimachinery/pkg/runtime/serializer"
1919
"k8s.io/apimachinery/pkg/runtime/serializer/json"
20-
"k8s.io/utils/ptr"
2120

2221
"github.com/stackitcloud/gardener-extension-provider-stackit/v2/pkg/stackit"
2322
)
@@ -53,7 +52,7 @@ var _ = Describe("Shoot mutator", func() {
5352

5453
// Prepare the expected RawExtension for ProviderConfig
5554
ptpOverride := configv1alpha1.ExtensionConfig{NTP: &configv1alpha1.NTPConfig{
56-
Enabled: ptr.To(false),
55+
Enabled: new(false),
5756
}}
5857
buffer := new(bytes.Buffer)
5958

@@ -71,7 +70,7 @@ var _ = Describe("Shoot mutator", func() {
7170
Kubernetes: gardencorev1beta1.Kubernetes{
7271
Version: "1.28.2",
7372
},
74-
SeedName: ptr.To("stackit"),
73+
SeedName: new("stackit"),
7574
Provider: gardencorev1beta1.Provider{
7675
Type: stackit.Type,
7776
Workers: []gardencorev1beta1.Worker{
@@ -81,7 +80,7 @@ var _ = Describe("Shoot mutator", func() {
8180
Type: "c1.2",
8281
Image: &gardencorev1beta1.ShootMachineImage{
8382
Name: "coreos",
84-
Version: ptr.To("4152.2.3"),
83+
Version: new("4152.2.3"),
8584
},
8685
},
8786
},
@@ -91,16 +90,16 @@ var _ = Describe("Shoot mutator", func() {
9190
Type: "c1.2",
9291
Image: &gardencorev1beta1.ShootMachineImage{
9392
Name: "ubuntu", // Non-coreos
94-
Version: ptr.To("22.04"),
93+
Version: new("22.04"),
9594
},
9695
},
9796
},
9897
},
9998
},
10099
Region: "eu01",
101100
Networking: &gardencorev1beta1.Networking{
102-
Nodes: ptr.To("10.250.0.0/16"),
103-
Type: ptr.To("calico"),
101+
Nodes: new("10.250.0.0/16"),
102+
Type: new("calico"),
104103
IPFamilies: []gardencorev1beta1.IPFamily{gardencorev1beta1.IPFamilyIPv4},
105104
},
106105
},
@@ -123,7 +122,7 @@ var _ = Describe("Shoot mutator", func() {
123122
Type: gardencorev1beta1.LastOperationTypeReconcile,
124123
State: gardencorev1beta1.LastOperationStateProcessing,
125124
}
126-
shoot.Status.SeedName = ptr.To("gcp-new") // Different from Spec.SeedName
125+
shoot.Status.SeedName = new("gcp-new") // Different from Spec.SeedName
127126
shootExpected := shoot.DeepCopy()
128127

129128
err := shootMutator.Mutate(ctx, shoot, oldShoot)
@@ -202,21 +201,21 @@ var _ = Describe("Shoot mutator", func() {
202201
Expect(err).NotTo(HaveOccurred())
203202

204203
// worker1 (coreos 4152.2.3) - should not get ProviderConfig because version < 4230.2.1
205-
Expect(shoot.Spec.Provider.Workers[0].Machine.Image.Version).To(Equal(ptr.To("4152.2.3")))
204+
Expect(shoot.Spec.Provider.Workers[0].Machine.Image.Version).To(Equal(new("4152.2.3")))
206205
Expect(shoot.Spec.Provider.Workers[0].Machine.Image.ProviderConfig).To(BeNil())
207206

208207
// worker2 (ubuntu 22.04) - should be untouched
209208
Expect(shoot.Spec.Provider.Workers[1]).To(DeepEqual(shootExpected.Spec.Provider.Workers[1]))
210209
})
211210

212211
It("should not mutate image version but should set ProviderConfig for coreos worker with exact target version", func() {
213-
shoot.Spec.Provider.Workers[0].Machine.Image.Version = ptr.To(FlatcarImageVersion) // Set to exact target
212+
shoot.Spec.Provider.Workers[0].Machine.Image.Version = new(FlatcarImageVersion) // Set to exact target
214213

215214
err := shootMutator.Mutate(ctx, shoot, nil)
216215
Expect(err).NotTo(HaveOccurred())
217216

218217
// Version should remain FlatcarImageVersion
219-
Expect(shoot.Spec.Provider.Workers[0].Machine.Image.Version).To(Equal(ptr.To(FlatcarImageVersion)))
218+
Expect(shoot.Spec.Provider.Workers[0].Machine.Image.Version).To(Equal(new(FlatcarImageVersion)))
220219
// ProviderConfig should be set (because version >= FlatcarImageVersion)
221220
Expect(shoot.Spec.Provider.Workers[0].Machine.Image.ProviderConfig).To(DeepEqual(expectedPTPDisabledProviderConfig))
222221

@@ -225,13 +224,13 @@ var _ = Describe("Shoot mutator", func() {
225224
})
226225

227226
It("should not mutate image version but should set ProviderConfig for coreos worker with newer version", func() {
228-
shoot.Spec.Provider.Workers[0].Machine.Image.Version = ptr.To("4300.0.0") // Newer version
227+
shoot.Spec.Provider.Workers[0].Machine.Image.Version = new("4300.0.0") // Newer version
229228

230229
err := shootMutator.Mutate(ctx, shoot, nil)
231230
Expect(err).NotTo(HaveOccurred())
232231

233232
// Version should remain 4300.0.0
234-
Expect(shoot.Spec.Provider.Workers[0].Machine.Image.Version).To(Equal(ptr.To("4300.0.0")))
233+
Expect(shoot.Spec.Provider.Workers[0].Machine.Image.Version).To(Equal(new("4300.0.0")))
235234
// ProviderConfig should be set (because version >= FlatcarImageVersion)
236235
Expect(shoot.Spec.Provider.Workers[0].Machine.Image.ProviderConfig).To(DeepEqual(expectedPTPDisabledProviderConfig))
237236
})
@@ -241,7 +240,7 @@ var _ = Describe("Shoot mutator", func() {
241240
Expect(err).NotTo(HaveOccurred())
242241

243242
// Version should remain 4152.2.3 (not mutated)
244-
Expect(shoot.Spec.Provider.Workers[0].Machine.Image.Version).To(Equal(ptr.To("4152.2.3")))
243+
Expect(shoot.Spec.Provider.Workers[0].Machine.Image.Version).To(Equal(new("4152.2.3")))
245244
// ProviderConfig should be nil (because version < FlatcarImageVersion)
246245
Expect(shoot.Spec.Provider.Workers[0].Machine.Image.ProviderConfig).To(BeNil())
247246
})
@@ -253,7 +252,7 @@ var _ = Describe("Shoot mutator", func() {
253252
Machine: gardencorev1beta1.Machine{
254253
Image: &gardencorev1beta1.ShootMachineImage{
255254
Name: "coreos",
256-
Version: ptr.To("4100.0.0"), // Older
255+
Version: new("4100.0.0"), // Older
257256
},
258257
},
259258
},
@@ -262,7 +261,7 @@ var _ = Describe("Shoot mutator", func() {
262261
Machine: gardencorev1beta1.Machine{
263262
Image: &gardencorev1beta1.ShootMachineImage{
264263
Name: "coreos",
265-
Version: ptr.To("4230.2.1"), // Exact target
264+
Version: new("4230.2.1"), // Exact target
266265
},
267266
},
268267
},
@@ -271,7 +270,7 @@ var _ = Describe("Shoot mutator", func() {
271270
Machine: gardencorev1beta1.Machine{
272271
Image: &gardencorev1beta1.ShootMachineImage{
273272
Name: "coreos",
274-
Version: ptr.To("4500.0.0"), // Newer
273+
Version: new("4500.0.0"), // Newer
275274
},
276275
},
277276
},
@@ -280,7 +279,7 @@ var _ = Describe("Shoot mutator", func() {
280279
Machine: gardencorev1beta1.Machine{
281280
Image: &gardencorev1beta1.ShootMachineImage{
282281
Name: "suse-jeos",
283-
Version: ptr.To("15.5"),
282+
Version: new("15.5"),
284283
},
285284
},
286285
},
@@ -292,15 +291,15 @@ var _ = Describe("Shoot mutator", func() {
292291
Expect(err).NotTo(HaveOccurred())
293292

294293
// old-coreos: version unchanged, ProviderConfig nil
295-
Expect(shoot.Spec.Provider.Workers[0].Machine.Image.Version).To(Equal(ptr.To("4100.0.0")))
294+
Expect(shoot.Spec.Provider.Workers[0].Machine.Image.Version).To(Equal(new("4100.0.0")))
296295
Expect(shoot.Spec.Provider.Workers[0].Machine.Image.ProviderConfig).To(BeNil())
297296

298297
// new-coreos: version unchanged, ProviderConfig set
299-
Expect(shoot.Spec.Provider.Workers[1].Machine.Image.Version).To(Equal(ptr.To("4230.2.1")))
298+
Expect(shoot.Spec.Provider.Workers[1].Machine.Image.Version).To(Equal(new("4230.2.1")))
300299
Expect(shoot.Spec.Provider.Workers[1].Machine.Image.ProviderConfig).To(DeepEqual(expectedPTPDisabledProviderConfig))
301300

302301
// newer-coreos: version unchanged, ProviderConfig set
303-
Expect(shoot.Spec.Provider.Workers[2].Machine.Image.Version).To(Equal(ptr.To("4500.0.0")))
302+
Expect(shoot.Spec.Provider.Workers[2].Machine.Image.Version).To(Equal(new("4500.0.0")))
304303
Expect(shoot.Spec.Provider.Workers[2].Machine.Image.ProviderConfig).To(DeepEqual(expectedPTPDisabledProviderConfig))
305304

306305
// other-os: untouched

‎pkg/admission/validator/namespacedcloudprofile_test.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import (
1818
"k8s.io/apimachinery/pkg/runtime"
1919
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2020
"k8s.io/apimachinery/pkg/util/validation/field"
21-
"k8s.io/utils/ptr"
2221
"sigs.k8s.io/controller-runtime/pkg/client"
2322
fakeclient "sigs.k8s.io/controller-runtime/pkg/client/fake"
2423
"sigs.k8s.io/controller-runtime/pkg/manager"
@@ -77,7 +76,7 @@ var _ = Describe("NamespacedCloudProfile Validator", func() {
7776
})
7877

7978
It("should succeed if NamespacedCloudProfile is in deletion phase", func() {
80-
namespacedCloudProfile.DeletionTimestamp = ptr.To(metav1.Now())
79+
namespacedCloudProfile.DeletionTimestamp = new(metav1.Now())
8180

8281
Expect(namespacedCloudProfileValidator.Validate(ctx, namespacedCloudProfile, nil)).To(Succeed())
8382
})

‎pkg/apis/config/loader/loader_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ func TestLoader(t *testing.T) {
2222
var _ = Describe("Loader", func() {
2323
Describe("#Load", func() {
2424
buildConfigYAML := func(customLabelDomain string) []byte {
25-
return []byte(fmt.Sprintf(`apiVersion: stackit.provider.extensions.config.stackit.cloud/v1alpha1
25+
return fmt.Appendf(nil, `apiVersion: stackit.provider.extensions.config.stackit.cloud/v1alpha1
2626
kind: ControllerConfiguration
2727
customLabelDomain: %s
28-
`, customLabelDomain))
28+
`, customLabelDomain)
2929
}
3030

3131
It("should apply defaults when data is empty", func() {

‎pkg/apis/stackit/helper/helper.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func FindImageFromCloudProfile(cloudProfileConfig *stackitv1alpha1.CloudProfileC
8686
return &stackitv1alpha1.MachineImage{
8787
Name: imageName,
8888
Version: imageVersion,
89-
Architecture: ptr.To(v1beta1constants.ArchitectureAMD64),
89+
Architecture: new(v1beta1constants.ArchitectureAMD64),
9090
Image: version.Image,
9191
}, nil
9292
}

0 commit comments

Comments
 (0)