diff --git a/charts/karpenter-crd/templates/karpenter.azure.com_aksnodeclasses.yaml b/charts/karpenter-crd/templates/karpenter.azure.com_aksnodeclasses.yaml index 6311bd8bf..fb3d0ab25 100644 --- a/charts/karpenter-crd/templates/karpenter.azure.com_aksnodeclasses.yaml +++ b/charts/karpenter-crd/templates/karpenter.azure.com_aksnodeclasses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.1 + controller-gen.kubebuilder.io/version: v0.17.2 name: aksnodeclasses.karpenter.azure.com spec: group: karpenter.azure.com diff --git a/go.mod b/go.mod index 399e18867..c5701aaeb 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/Azure/karpenter-provider-azure -go 1.23.6 +go 1.23 require ( github.com/Azure/azure-kusto-go v0.16.1 diff --git a/pkg/apis/crds/karpenter.azure.com_aksnodeclasses.yaml b/pkg/apis/crds/karpenter.azure.com_aksnodeclasses.yaml index 6311bd8bf..fb3d0ab25 100644 --- a/pkg/apis/crds/karpenter.azure.com_aksnodeclasses.yaml +++ b/pkg/apis/crds/karpenter.azure.com_aksnodeclasses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.17.1 + controller-gen.kubebuilder.io/version: v0.17.2 name: aksnodeclasses.karpenter.azure.com spec: group: karpenter.azure.com diff --git a/test/pkg/environment/azure/environment.go b/test/pkg/environment/azure/environment.go index 8450fe485..16a596619 100644 --- a/test/pkg/environment/azure/environment.go +++ b/test/pkg/environment/azure/environment.go @@ -49,12 +49,12 @@ type Environment struct { } type Vars struct { - NodeResourceGroup string - Region string - SubscriptionID string - VNETResourceGroup string - ACRName string - ClusterName string + NodeResourceGroup string + Region string + SubscriptionID string + VNETResourceGroup string + ACRName string + ClusterName string ClusterResourceGroup string } type AzureClients struct { @@ -67,18 +67,17 @@ func NewEnvironment(t *testing.T) *Environment { azureEnv := &Environment{ Environment: env, Vars: Vars{ - SubscriptionID: os.Getenv("AZURE_SUBSCRIPTION_ID"), - ClusterName: os.Getenv("AZURE_CLUSTER_NAME"), + SubscriptionID: os.Getenv("AZURE_SUBSCRIPTION_ID"), + ClusterName: os.Getenv("AZURE_CLUSTER_NAME"), ClusterResourceGroup: os.Getenv("AZURE_RESOURCE_GROUP"), - ACRName: os.Getenv("AZURE_ACR_NAME"), - Region: lo.Ternary(os.Getenv("AZURE_LOCATION") == "", "westus2", os.Getenv("AZURE_LOCATION")), - + ACRName: os.Getenv("AZURE_ACR_NAME"), + Region: lo.Ternary(os.Getenv("AZURE_LOCATION") == "", "westus2", os.Getenv("AZURE_LOCATION")), }, } - - defaultNodeRG := fmt.Sprintf("MC_%s_%s_%s", azureEnv.ClusterResourceGroup, azureEnv.ClusterName, azureEnv.Region) - azureEnv.VNETResourceGroup = lo.Ternary(os.Getenv("VNET_RESOURCE_GROUP")=="", defaultNodeRG, os.Getenv("VNET_RESOURCE_GROUP")) - azureEnv.NodeResourceGroup = defaultNodeRG + + defaultNodeRG := fmt.Sprintf("MC_%s_%s_%s", azureEnv.ClusterResourceGroup, azureEnv.ClusterName, azureEnv.Region) + azureEnv.VNETResourceGroup = lo.Ternary(os.Getenv("VNET_RESOURCE_GROUP") == "", defaultNodeRG, os.Getenv("VNET_RESOURCE_GROUP")) + azureEnv.NodeResourceGroup = defaultNodeRG cred, err := azidentity.NewDefaultAzureCredential(nil) if err != nil { diff --git a/test/pkg/environment/azure/expectations.go b/test/pkg/environment/azure/expectations.go index b0f479c58..896ebe74e 100644 --- a/test/pkg/environment/azure/expectations.go +++ b/test/pkg/environment/azure/expectations.go @@ -1,11 +1,27 @@ +/* +Portions Copyright (c) Microsoft Corporation. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + package azure import ( - "fmt" "context" + "fmt" "strings" "time" - + "github.com/samber/lo" . "github.com/onsi/ginkgo/v2" @@ -39,17 +55,17 @@ func (env *Environment) EventuallyExpectKarpenterNicsToBeDeleted() { func (env *Environment) ExpectCreatedInterface(networkInterface armnetwork.Interface) { GinkgoHelper() - poller, err := env.InterfacesClient.BeginCreateOrUpdate(env.Context, env.NodeResourceGroup, lo.FromPtr(networkInterface.Name), networkInterface, nil) - Expect(err).ToNot(HaveOccurred()) + poller, err := env.InterfacesClient.BeginCreateOrUpdate(env.Context, env.NodeResourceGroup, lo.FromPtr(networkInterface.Name), networkInterface, nil) + Expect(err).ToNot(HaveOccurred()) _, err = poller.PollUntilDone(env.Context, nil) Expect(err).ToNot(HaveOccurred()) } func (env *Environment) GetClusterSubnet() *armnetwork.Subnet { GinkgoHelper() - vnet, err := getVNET(env.Context, env.VNETClient, env.VNETResourceGroup) - Expect(err).ToNot(HaveOccurred()) - return vnet.Properties.Subnets[0] + vnet, err := getVNET(env.Context, env.VNETClient, env.VNETResourceGroup) + Expect(err).ToNot(HaveOccurred()) + return vnet.Properties.Subnets[0] } func getVNET(ctx context.Context, client *armnetwork.VirtualNetworksClient, vnetRG string) (*armnetwork.VirtualNetwork, error) { diff --git a/test/suites/azuregarbagecollection/suite_test.go b/test/suites/azuregarbagecollection/suite_test.go index 88c77225a..5e7f3d4d7 100644 --- a/test/suites/azuregarbagecollection/suite_test.go +++ b/test/suites/azuregarbagecollection/suite_test.go @@ -53,24 +53,22 @@ var _ = AfterEach(func() { env.AfterEach() }) var _ = Describe("gc", func() { It("should garbage collect network interfaces created by karpenter", func() { env.ExpectCreatedInterface(armnetwork.Interface{ - Name: lo.ToPtr("orphan-nic"), + Name: lo.ToPtr("orphan-nic"), Location: lo.ToPtr(env.Region), - Tags: azkarptest.ManagedTags("default"), + Tags: azkarptest.ManagedTags("default"), Properties: &armnetwork.InterfacePropertiesFormat{ IPConfigurations: []*armnetwork.InterfaceIPConfiguration{ { - Name: lo.ToPtr("ip-config"), + Name: lo.ToPtr("ip-config"), Properties: &armnetwork.InterfaceIPConfigurationPropertiesFormat{ - Primary: lo.ToPtr(true), - Subnet: env.GetClusterSubnet(), + Primary: lo.ToPtr(true), + Subnet: env.GetClusterSubnet(), PrivateIPAllocationMethod: lo.ToPtr(armnetwork.IPAllocationMethodDynamic), }, - }, + }, }, - }, - }) - env.EventuallyExpectKarpenterNicsToBeDeleted() + }) + env.EventuallyExpectKarpenterNicsToBeDeleted() }) }) -