Skip to content

Commit

Permalink
fix: ci
Browse files Browse the repository at this point in the history
  • Loading branch information
Bryce-Soghigian committed Jan 19, 2025
1 parent 437a67c commit ccd19a4
Show file tree
Hide file tree
Showing 5 changed files with 37 additions and 6 deletions.
3 changes: 1 addition & 2 deletions pkg/controllers/controllers.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,11 @@ import (

func NewControllers(ctx context.Context, mgr manager.Manager, kubeClient client.Client, recorder events.Recorder,
cloudProvider cloudprovider.CloudProvider, instanceProvider instance.Provider) []controller.Controller {

controllers := []controller.Controller{
nodeclasshash.NewController(kubeClient),
nodeclassstatus.NewController(kubeClient),
nodeclasstermination.NewController(kubeClient, recorder),

nodeclaimgarbagecollection.NewVirtualMachine(kubeClient, cloudProvider),
nodeclaimgarbagecollection.NewNetworkInterface(kubeClient, instanceProvider),

Expand Down
6 changes: 3 additions & 3 deletions pkg/controllers/nodeclaim/garbagecollection/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -428,9 +428,9 @@ var _ = Describe("NetworkInterface Garbage Collection", func() {
Expect(len(nicsAfterGC)).To(Equal(1))

ExpectSingletonReconciled(ctx, virtualMachineGCController)
nicsAfterVMReconcilation, err := azureEnv.InstanceProvider.ListNics(ctx)
ExpectNoError(err)
Expect(len(nicsAfterVMReconcilation)).To(Equal(0))
nicsAfterVMReconciliation, err := azureEnv.InstanceProvider.ListNics(ctx)
ExpectNoError(err)
Expect(len(nicsAfterVMReconciliation)).To(Equal(0))

})
})
2 changes: 1 addition & 1 deletion pkg/test/expectations/expectations.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"fmt"
"strings"

"github.com/Azure/karpenter-provider-azure/pkg/test"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/Azure/karpenter-provider-azure/pkg/test"
)

func ExpectUnavailable(env *test.Environment, instanceType string, zone string, capacityType string) {
Expand Down
16 changes: 16 additions & 0 deletions pkg/test/networkinterfaces.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
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 test

import (
Expand Down
16 changes: 16 additions & 0 deletions pkg/test/virtualmachines.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
/*
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 test

import (
Expand Down

0 comments on commit ccd19a4

Please sign in to comment.