Skip to content

Commit

Permalink
Adapt to gardener-1.102.0
Browse files Browse the repository at this point in the history
axel7born committed Sep 2, 2024
1 parent 1ee2612 commit b0436c3
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cmd/gardener-extension-networking-calico/app/app.go
Original file line number Diff line number Diff line change
@@ -132,7 +132,7 @@ func NewControllerManagerCommand(ctx context.Context) *cobra.Command {
return fmt.Errorf("could not update manager scheme: %w", err)
}

reconcileOpts.Completed().Apply(&calicocontroller.DefaultAddOptions.IgnoreOperationAnnotation)
reconcileOpts.Completed().Apply(&calicocontroller.DefaultAddOptions.IgnoreOperationAnnotation, nil)
calicoCtrlOpts.Completed().Apply(&calicocontroller.DefaultAddOptions.Controller)
configFileOpts.Completed().ApplyHealthCheckConfig(&healthcheck.AddOptions.HealthCheckConfig)
healthCheckCtrlOpts.Completed().Apply(&healthcheck.AddOptions.Controller)
2 changes: 1 addition & 1 deletion imagevector/imagevector.go
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ func init() {
imageVector, err = imagevector.Read([]byte(ImagesYAML))
runtime.Must(err)

imageVector, err = imagevector.WithEnvOverride(imageVector)
imageVector, err = imagevector.WithEnvOverride(imageVector,imagevector.OverrideEnv)
runtime.Must(err)
}

2 changes: 1 addition & 1 deletion test/e2e/common_test.go
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ func defaultShoot(generateName string) *gardencorev1beta1.Shoot {
Spec: gardencorev1beta1.ShootSpec{
Region: "local",
SecretBindingName: pointer.String("local"),
CloudProfileName: "local",
CloudProfileName: pointer.String("local"),
Kubernetes: gardencorev1beta1.Kubernetes{
Version: "1.26.0",
EnableStaticTokenKubeconfig: pointer.Bool(true),
2 changes: 1 addition & 1 deletion test/e2e/force_delete_test.go
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ var _ = Describe("Network Extension Tests", Label("Network"), func() {
By("Wait for Shoot to be force-deleted")
ctx, cancel = context.WithTimeout(parentCtx, 10*time.Minute)
defer cancel()
Expect(f.ForceDeleteShootAndWaitForDeletion(ctx, f.Shoot, f.ShootFramework.SeedClient.Client())).To(Succeed())
Expect(f.ForceDeleteShootAndWaitForDeletion(ctx, f.Shoot)).To(Succeed())

By("Network Test status")
Expect(succeeded).To(BeTrue())

0 comments on commit b0436c3

Please sign in to comment.