Skip to content
This repository has been archived by the owner on Oct 30, 2024. It is now read-only.

Update giantswarm modules (major) #3557

Closed
wants to merge 1 commit into from
Closed

Update giantswarm modules (major) #3557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion flag/service/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package service

import (
"github.com/giantswarm/operatorkit/v7/pkg/flag/service/kubernetes"
"github.com/giantswarm/operatorkit/v8/pkg/flag/service/kubernetes"

"github.com/giantswarm/aws-operator/v14/flag/service/aws"
"github.com/giantswarm/aws-operator/v14/flag/service/cluster"
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ require (
github.com/giantswarm/certs/v4 v4.0.0
github.com/giantswarm/ipam v0.3.0
github.com/giantswarm/k8sclient/v7 v7.0.1
github.com/giantswarm/k8scloudconfig/v16 v16.6.0
github.com/giantswarm/k8scloudconfig/v17 v17.2.0
github.com/giantswarm/k8smetadata v0.23.0
github.com/giantswarm/kubelock/v4 v4.0.0
github.com/giantswarm/microendpoint v1.0.0
github.com/giantswarm/microerror v0.4.0
github.com/giantswarm/microkit v1.0.0
github.com/giantswarm/micrologger v1.0.0
github.com/giantswarm/operatorkit/v7 v7.1.0
github.com/giantswarm/operatorkit/v8 v8.0.0
github.com/giantswarm/randomkeys/v3 v3.0.0
github.com/giantswarm/release-operator/v4 v4.1.0
github.com/giantswarm/tenantcluster/v6 v6.0.0
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,8 @@ github.com/giantswarm/ipam v0.3.0 h1:QNb4k5Zu6nGsqJkAM7dLM1J6TiUP+LGjo9CPR+ewZBk
github.com/giantswarm/ipam v0.3.0/go.mod h1:xG4cMEKwHlbE0aZ7x2H5j7o81U13LIStA73XCECdk+I=
github.com/giantswarm/k8sclient/v7 v7.0.1 h1:UmRwgsw5Uda27tpIblPo7nWjp/nq5qwqxEPHWcvzsHk=
github.com/giantswarm/k8sclient/v7 v7.0.1/go.mod h1:zJTXammjLHSiukMIO4+a6eUDgzj/lJxEXFZ22mC0WXc=
github.com/giantswarm/k8scloudconfig/v16 v16.6.0 h1:k5SoOxOcKusRaTgtqYKAy/4zXMn881g8IGwIM6hHYE4=
github.com/giantswarm/k8scloudconfig/v16 v16.6.0/go.mod h1:9QNKXwjyBCWup2ek+kRZ356zw38QhQ2QgwuHuK9zzQo=
github.com/giantswarm/k8scloudconfig/v17 v17.2.0 h1:qtSF8pRPZmOdgPwxWgJ7LVHjxwWP63HDP8R0kv2JMPc=
github.com/giantswarm/k8scloudconfig/v17 v17.2.0/go.mod h1:peChY0p9SloYvoQfx5zCXIU6T//QdkG4y8LgFEWyuE4=
github.com/giantswarm/k8smetadata v0.23.0 h1:iGwa1Nb45Sfcd5wqJEKBvxY1u5yXFg3Sq5Fw62nyRGA=
github.com/giantswarm/k8smetadata v0.23.0/go.mod h1:QiQAyaZnwco1U0lENLF0Kp4bSN4dIPwIlHWEvUo3ES8=
github.com/giantswarm/kubelock/v4 v4.0.0 h1:qvFGOIlDthAD8r32WcorT8R4gp3c1dpnDbHuLsDU2ZA=
Expand All @@ -251,8 +251,8 @@ github.com/giantswarm/micrologger v1.0.0 h1:5W4h3K414CXhoXQ3rkGbrMl8yUGdbCLKMdg/
github.com/giantswarm/micrologger v1.0.0/go.mod h1:jFY9TUZLYnQ437GwbodmGmwEJ5cImEJ1f5NTPyDHB24=
github.com/giantswarm/microstorage v0.2.0 h1:0m2W2wbWU0x4TRuqlC1U3Ibqt783E6/q8ZpLvELDkHc=
github.com/giantswarm/microstorage v0.2.0/go.mod h1:Ylcw9vGyG5N7R6nhKvwZ5nt6I3B9IhREUWFIxsR/Lfw=
github.com/giantswarm/operatorkit/v7 v7.1.0 h1:yRUwj9ZUqBd+UV0C5n784+Qe6y/olILtg444XD6hjLA=
github.com/giantswarm/operatorkit/v7 v7.1.0/go.mod h1:5enwhyIjd4xKrYXV9+enqttcmB9BE2Ocl1V12IwJIuw=
github.com/giantswarm/operatorkit/v8 v8.0.0 h1:AM1Xxg8X6xQjhxh+Jn1Tiv2MkpG8Ro4gqEsytZBBU5M=
github.com/giantswarm/operatorkit/v8 v8.0.0/go.mod h1:dPrvvQj2UNBw6jLDYqvGhnDfJImwih8A+F3Oc1VS8XM=
github.com/giantswarm/randomkeys/v3 v3.0.0 h1:68C+laq+2DgvfYPs8tz7249Oc0gYE14W93moJ4s7pSg=
github.com/giantswarm/randomkeys/v3 v3.0.0/go.mod h1:O47AZ2x6xJ4+LpSz5Gq4i8duaTFeaffyA8g39amF1FQ=
github.com/giantswarm/release-operator/v4 v4.1.0 h1:8FdLoJH0pZ26lrFwodurL+FMx+W1Jf2TrOXK4x0OOVE=
Expand Down
10 changes: 5 additions & 5 deletions service/controller/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"github.com/giantswarm/k8sclient/v7/pkg/k8sclient"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"github.com/giantswarm/operatorkit/v7/pkg/controller"
"github.com/giantswarm/operatorkit/v7/pkg/resource"
"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/metricsresource"
"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/retryresource"
"github.com/giantswarm/operatorkit/v8/pkg/controller"
"github.com/giantswarm/operatorkit/v8/pkg/resource"
"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/metricsresource"
"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/retryresource"
"github.com/giantswarm/tenantcluster/v6/pkg/tenantcluster"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
8 changes: 4 additions & 4 deletions service/controller/control_plane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"github.com/giantswarm/k8sclient/v7/pkg/k8sclient"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"github.com/giantswarm/operatorkit/v7/pkg/controller"
"github.com/giantswarm/operatorkit/v7/pkg/resource"
"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/metricsresource"
"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/retryresource"
"github.com/giantswarm/operatorkit/v8/pkg/controller"
"github.com/giantswarm/operatorkit/v8/pkg/resource"
"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/metricsresource"
"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/retryresource"
"github.com/giantswarm/randomkeys/v3"
"k8s.io/apimachinery/pkg/labels"

Expand Down
8 changes: 4 additions & 4 deletions service/controller/control_plane_drainer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"github.com/giantswarm/k8sclient/v7/pkg/k8sclient"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"github.com/giantswarm/operatorkit/v7/pkg/controller"
"github.com/giantswarm/operatorkit/v7/pkg/resource"
"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/metricsresource"
"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/retryresource"
"github.com/giantswarm/operatorkit/v8/pkg/controller"
"github.com/giantswarm/operatorkit/v8/pkg/resource"
"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/metricsresource"
"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/retryresource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
ctrlClient "sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
8 changes: 4 additions & 4 deletions service/controller/machine_deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
"github.com/giantswarm/k8sclient/v7/pkg/k8sclient"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"github.com/giantswarm/operatorkit/v7/pkg/controller"
"github.com/giantswarm/operatorkit/v7/pkg/resource"
"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/metricsresource"
"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/retryresource"
"github.com/giantswarm/operatorkit/v8/pkg/controller"
"github.com/giantswarm/operatorkit/v8/pkg/resource"
"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/metricsresource"
"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/retryresource"
"github.com/giantswarm/randomkeys/v3"
"github.com/giantswarm/tenantcluster/v6/pkg/tenantcluster"
"k8s.io/apimachinery/pkg/labels"
Expand Down
8 changes: 4 additions & 4 deletions service/controller/machine_deployment_drainer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"github.com/giantswarm/k8sclient/v7/pkg/k8sclient"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"github.com/giantswarm/operatorkit/v7/pkg/controller"
"github.com/giantswarm/operatorkit/v7/pkg/resource"
"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/metricsresource"
"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/retryresource"
"github.com/giantswarm/operatorkit/v8/pkg/controller"
"github.com/giantswarm/operatorkit/v8/pkg/resource"
"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/metricsresource"
"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/retryresource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
ctrlClient "sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/awsclient/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/reconciliationcanceledcontext"
)

func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error {
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/cleanupenis/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"

"github.com/giantswarm/aws-operator/v14/service/controller/controllercontext"
)
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/cleanupmachinedeployments/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/cleanupsecuritygroups/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/ec2"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"

"github.com/giantswarm/aws-operator/v14/service/controller/controllercontext"
"github.com/giantswarm/aws-operator/v14/service/controller/key"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/drainerfinalizer/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
corev1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/core/v1alpha1"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/drainerinitializer/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/endpoints/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/endpoints/desired.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/aws/aws-sdk-go/service/elb"
infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/resourcecanceledcontext"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/endpoints/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
corev1 "k8s.io/api/core/v1"

"github.com/giantswarm/aws-operator/v14/service/controller/key"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/keepforcrs/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
6 changes: 3 additions & 3 deletions service/controller/resource/s3bucket/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext"
"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/resourcecanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
"golang.org/x/sync/errgroup"

"github.com/giantswarm/aws-operator/v14/service/controller/controllercontext"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/s3bucket/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"

"github.com/giantswarm/aws-operator/v14/service/controller/controllercontext"
"github.com/giantswarm/aws-operator/v14/service/controller/key"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/s3object/current.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/resourcecanceledcontext"
"k8s.io/apimachinery/pkg/api/meta"

"github.com/giantswarm/aws-operator/v14/service/controller/controllercontext"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/s3object/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package s3object
import (
"context"

"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
)

// ApplyDeleteChange is a noop as deletion for now is covered with the deletion
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/s3object/desired.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/resourcecanceledcontext"
"k8s.io/apimachinery/pkg/api/meta"

"github.com/giantswarm/aws-operator/v14/service/controller/controllercontext"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/s3object/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"

"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"

"github.com/giantswarm/aws-operator/v14/service/controller/controllercontext"
)
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/secretfinalizer/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/service/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/resourcecanceledcontext"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/service/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/service/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/tccp/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/aws/aws-sdk-go/service/cloudformation"
infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/tccpf/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/cloudformation"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"

"github.com/giantswarm/aws-operator/v14/service/controller/controllercontext"
"github.com/giantswarm/aws-operator/v14/service/controller/key"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/tccpi/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/cloudformation"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"

"github.com/giantswarm/aws-operator/v14/service/controller/controllercontext"
"github.com/giantswarm/aws-operator/v14/service/controller/key"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/tccpn/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/cloudformation"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"

"github.com/giantswarm/aws-operator/v14/service/controller/controllercontext"
"github.com/giantswarm/aws-operator/v14/service/controller/key"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/tccpvpcidstatus/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/reconciliationcanceledcontext"
"k8s.io/apimachinery/pkg/types"

"github.com/giantswarm/aws-operator/v14/service/controller/controllercontext"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/tcnp/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/cloudformation"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"

"github.com/giantswarm/aws-operator/v14/service/controller/controllercontext"
"github.com/giantswarm/aws-operator/v14/service/controller/key"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/tcnpf/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/service/cloudformation"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"

"github.com/giantswarm/aws-operator/v14/service/controller/controllercontext"
"github.com/giantswarm/aws-operator/v14/service/controller/key"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/resource/tcnpstatus/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/giantswarm/k8sclient/v7/pkg/k8sclient"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/reconciliationcanceledcontext"

"github.com/giantswarm/aws-operator/v14/service/controller/controllercontext"
"github.com/giantswarm/aws-operator/v14/service/controller/key"
Expand Down
8 changes: 4 additions & 4 deletions service/controller/terminate_unhealthy_node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"github.com/giantswarm/k8sclient/v7/pkg/k8sclient"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"github.com/giantswarm/operatorkit/v7/pkg/controller"
"github.com/giantswarm/operatorkit/v7/pkg/resource"
"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/metricsresource"
"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/retryresource"
"github.com/giantswarm/operatorkit/v8/pkg/controller"
"github.com/giantswarm/operatorkit/v8/pkg/resource"
"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/metricsresource"
"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/retryresource"
"github.com/giantswarm/tenantcluster/v6/pkg/tenantcluster"
"k8s.io/apimachinery/pkg/labels"

Expand Down
Loading