diff --git a/flag/service/service.go b/flag/service/service.go index 0915db4d2b..780631be8f 100644 --- a/flag/service/service.go +++ b/flag/service/service.go @@ -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" diff --git a/go.mod b/go.mod index df5acfe5f3..ef8a48f048 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index 2307bf74d3..0c3a1d6e24 100644 --- a/go.sum +++ b/go.sum @@ -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= @@ -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= diff --git a/service/controller/cluster.go b/service/controller/cluster.go index 3c4a29defa..4afe849d1d 100644 --- a/service/controller/cluster.go +++ b/service/controller/cluster.go @@ -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" diff --git a/service/controller/control_plane.go b/service/controller/control_plane.go index 3bc9925737..7aeb1404fe 100644 --- a/service/controller/control_plane.go +++ b/service/controller/control_plane.go @@ -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" diff --git a/service/controller/control_plane_drainer.go b/service/controller/control_plane_drainer.go index cb713d00a2..1fc0c9a8a4 100644 --- a/service/controller/control_plane_drainer.go +++ b/service/controller/control_plane_drainer.go @@ -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" diff --git a/service/controller/machine_deployment.go b/service/controller/machine_deployment.go index a99443db6f..19af15f0c1 100644 --- a/service/controller/machine_deployment.go +++ b/service/controller/machine_deployment.go @@ -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" diff --git a/service/controller/machine_deployment_drainer.go b/service/controller/machine_deployment_drainer.go index 5581bb9542..170915d918 100644 --- a/service/controller/machine_deployment_drainer.go +++ b/service/controller/machine_deployment_drainer.go @@ -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" diff --git a/service/controller/resource/awsclient/create.go b/service/controller/resource/awsclient/create.go index 7041c13080..caa3c9fd4d 100644 --- a/service/controller/resource/awsclient/create.go +++ b/service/controller/resource/awsclient/create.go @@ -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 { diff --git a/service/controller/resource/cleanupenis/delete.go b/service/controller/resource/cleanupenis/delete.go index a14f960491..389a8a0187 100644 --- a/service/controller/resource/cleanupenis/delete.go +++ b/service/controller/resource/cleanupenis/delete.go @@ -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" ) diff --git a/service/controller/resource/cleanupmachinedeployments/delete.go b/service/controller/resource/cleanupmachinedeployments/delete.go index 2378ff000d..fc67fff738 100644 --- a/service/controller/resource/cleanupmachinedeployments/delete.go +++ b/service/controller/resource/cleanupmachinedeployments/delete.go @@ -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" diff --git a/service/controller/resource/cleanupsecuritygroups/delete.go b/service/controller/resource/cleanupsecuritygroups/delete.go index e65b1e0ec1..f591248067 100644 --- a/service/controller/resource/cleanupsecuritygroups/delete.go +++ b/service/controller/resource/cleanupsecuritygroups/delete.go @@ -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" diff --git a/service/controller/resource/drainerfinalizer/resource.go b/service/controller/resource/drainerfinalizer/resource.go index b2d10c7d08..78896c4bda 100644 --- a/service/controller/resource/drainerfinalizer/resource.go +++ b/service/controller/resource/drainerfinalizer/resource.go @@ -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" diff --git a/service/controller/resource/drainerinitializer/resource.go b/service/controller/resource/drainerinitializer/resource.go index 32d8e44e3b..439689557a 100644 --- a/service/controller/resource/drainerinitializer/resource.go +++ b/service/controller/resource/drainerinitializer/resource.go @@ -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" diff --git a/service/controller/resource/endpoints/delete.go b/service/controller/resource/endpoints/delete.go index affad25dd0..64f1bfa000 100644 --- a/service/controller/resource/endpoints/delete.go +++ b/service/controller/resource/endpoints/delete.go @@ -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" diff --git a/service/controller/resource/endpoints/desired.go b/service/controller/resource/endpoints/desired.go index 2ea9fdf1ff..39239522c7 100644 --- a/service/controller/resource/endpoints/desired.go +++ b/service/controller/resource/endpoints/desired.go @@ -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" diff --git a/service/controller/resource/endpoints/update.go b/service/controller/resource/endpoints/update.go index 6118c5d199..664d586124 100644 --- a/service/controller/resource/endpoints/update.go +++ b/service/controller/resource/endpoints/update.go @@ -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" diff --git a/service/controller/resource/keepforcrs/delete.go b/service/controller/resource/keepforcrs/delete.go index 11c79bcd47..75ce6560f6 100644 --- a/service/controller/resource/keepforcrs/delete.go +++ b/service/controller/resource/keepforcrs/delete.go @@ -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" diff --git a/service/controller/resource/s3bucket/delete.go b/service/controller/resource/s3bucket/delete.go index 7ecb131441..4fbf146bbb 100644 --- a/service/controller/resource/s3bucket/delete.go +++ b/service/controller/resource/s3bucket/delete.go @@ -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" diff --git a/service/controller/resource/s3bucket/update.go b/service/controller/resource/s3bucket/update.go index 16f261130a..2d70b1a890 100644 --- a/service/controller/resource/s3bucket/update.go +++ b/service/controller/resource/s3bucket/update.go @@ -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" diff --git a/service/controller/resource/s3object/current.go b/service/controller/resource/s3object/current.go index 6c7d488a64..422c15c568 100644 --- a/service/controller/resource/s3object/current.go +++ b/service/controller/resource/s3object/current.go @@ -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" diff --git a/service/controller/resource/s3object/delete.go b/service/controller/resource/s3object/delete.go index 92d7593285..34b351e00a 100644 --- a/service/controller/resource/s3object/delete.go +++ b/service/controller/resource/s3object/delete.go @@ -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 diff --git a/service/controller/resource/s3object/desired.go b/service/controller/resource/s3object/desired.go index 77ccc26ab0..7104de6c7f 100644 --- a/service/controller/resource/s3object/desired.go +++ b/service/controller/resource/s3object/desired.go @@ -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" diff --git a/service/controller/resource/s3object/update.go b/service/controller/resource/s3object/update.go index 7ab28cc924..cbf2cc0f51 100644 --- a/service/controller/resource/s3object/update.go +++ b/service/controller/resource/s3object/update.go @@ -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" ) diff --git a/service/controller/resource/secretfinalizer/delete.go b/service/controller/resource/secretfinalizer/delete.go index 20e5fa9ac7..93004b503b 100644 --- a/service/controller/resource/secretfinalizer/delete.go +++ b/service/controller/resource/secretfinalizer/delete.go @@ -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" diff --git a/service/controller/resource/service/create.go b/service/controller/resource/service/create.go index cb72302f28..27391c3cab 100644 --- a/service/controller/resource/service/create.go +++ b/service/controller/resource/service/create.go @@ -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" diff --git a/service/controller/resource/service/delete.go b/service/controller/resource/service/delete.go index 4568f83088..ec605b42f1 100644 --- a/service/controller/resource/service/delete.go +++ b/service/controller/resource/service/delete.go @@ -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" diff --git a/service/controller/resource/service/update.go b/service/controller/resource/service/update.go index 33a72f9ffa..635efce1d7 100644 --- a/service/controller/resource/service/update.go +++ b/service/controller/resource/service/update.go @@ -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" ) diff --git a/service/controller/resource/tccp/delete.go b/service/controller/resource/tccp/delete.go index c6e93fe84c..6ca11fb7ff 100644 --- a/service/controller/resource/tccp/delete.go +++ b/service/controller/resource/tccp/delete.go @@ -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" diff --git a/service/controller/resource/tccpf/delete.go b/service/controller/resource/tccpf/delete.go index 4002e5e09e..e9cc3e498c 100644 --- a/service/controller/resource/tccpf/delete.go +++ b/service/controller/resource/tccpf/delete.go @@ -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" diff --git a/service/controller/resource/tccpi/delete.go b/service/controller/resource/tccpi/delete.go index 090891a04d..3b3693ea6f 100644 --- a/service/controller/resource/tccpi/delete.go +++ b/service/controller/resource/tccpi/delete.go @@ -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" diff --git a/service/controller/resource/tccpn/delete.go b/service/controller/resource/tccpn/delete.go index cb7ae6c26d..09366a70aa 100644 --- a/service/controller/resource/tccpn/delete.go +++ b/service/controller/resource/tccpn/delete.go @@ -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" diff --git a/service/controller/resource/tccpvpcidstatus/create.go b/service/controller/resource/tccpvpcidstatus/create.go index c6a7101710..076f9b5adc 100644 --- a/service/controller/resource/tccpvpcidstatus/create.go +++ b/service/controller/resource/tccpvpcidstatus/create.go @@ -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" diff --git a/service/controller/resource/tcnp/delete.go b/service/controller/resource/tcnp/delete.go index fc45abceeb..39acf3034d 100644 --- a/service/controller/resource/tcnp/delete.go +++ b/service/controller/resource/tcnp/delete.go @@ -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" diff --git a/service/controller/resource/tcnpf/delete.go b/service/controller/resource/tcnpf/delete.go index 160287ed24..e96abaef56 100644 --- a/service/controller/resource/tcnpf/delete.go +++ b/service/controller/resource/tcnpf/delete.go @@ -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" diff --git a/service/controller/resource/tcnpstatus/resource.go b/service/controller/resource/tcnpstatus/resource.go index c19ebd7ef9..43dc058db5 100644 --- a/service/controller/resource/tcnpstatus/resource.go +++ b/service/controller/resource/tcnpstatus/resource.go @@ -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" diff --git a/service/controller/terminate_unhealthy_node.go b/service/controller/terminate_unhealthy_node.go index ded6bb7f53..170be5cdb5 100644 --- a/service/controller/terminate_unhealthy_node.go +++ b/service/controller/terminate_unhealthy_node.go @@ -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" diff --git a/service/internal/asg/internal/cache/asgs.go b/service/internal/asg/internal/cache/asgs.go index b4bf81aee3..ebdb60a839 100644 --- a/service/internal/asg/internal/cache/asgs.go +++ b/service/internal/asg/internal/cache/asgs.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/aws/aws-sdk-go/service/autoscaling" - "github.com/giantswarm/operatorkit/v7/pkg/controller/context/cachekeycontext" + "github.com/giantswarm/operatorkit/v8/pkg/controller/context/cachekeycontext" gocache "github.com/patrickmn/go-cache" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/service/internal/asg/internal/cache/instances.go b/service/internal/asg/internal/cache/instances.go index db32be28fc..0e32c19149 100644 --- a/service/internal/asg/internal/cache/instances.go +++ b/service/internal/asg/internal/cache/instances.go @@ -5,7 +5,7 @@ import ( "fmt" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/giantswarm/operatorkit/v7/pkg/controller/context/cachekeycontext" + "github.com/giantswarm/operatorkit/v8/pkg/controller/context/cachekeycontext" gocache "github.com/patrickmn/go-cache" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/service/internal/cloudconfig/tccpn.go b/service/internal/cloudconfig/tccpn.go index e9eb5c0087..a64f8025d6 100644 --- a/service/internal/cloudconfig/tccpn.go +++ b/service/internal/cloudconfig/tccpn.go @@ -10,7 +10,7 @@ import ( "github.com/blang/semver" infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/giantswarm/certs/v4/pkg/certs" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v16/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v17/pkg/template" "github.com/giantswarm/k8smetadata/pkg/annotation" "github.com/giantswarm/microerror" "github.com/giantswarm/randomkeys/v3" diff --git a/service/internal/cloudconfig/tccpn_extension.go b/service/internal/cloudconfig/tccpn_extension.go index 3c3b5f8324..dc779277ad 100644 --- a/service/internal/cloudconfig/tccpn_extension.go +++ b/service/internal/cloudconfig/tccpn_extension.go @@ -8,7 +8,7 @@ import ( "github.com/blang/semver" infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/giantswarm/certs/v4/pkg/certs" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v16/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v17/pkg/template" "github.com/giantswarm/k8smetadata/pkg/annotation" "github.com/giantswarm/microerror" diff --git a/service/internal/cloudconfig/tcnp.go b/service/internal/cloudconfig/tcnp.go index c975280cde..9aef0bdb80 100644 --- a/service/internal/cloudconfig/tcnp.go +++ b/service/internal/cloudconfig/tcnp.go @@ -8,7 +8,7 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/giantswarm/certs/v4/pkg/certs" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v16/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v17/pkg/template" "github.com/giantswarm/k8smetadata/pkg/annotation" "github.com/giantswarm/microerror" "github.com/giantswarm/randomkeys/v3" diff --git a/service/internal/cloudconfig/tcnp_extension.go b/service/internal/cloudconfig/tcnp_extension.go index 3b7b67140c..b237fe4e85 100644 --- a/service/internal/cloudconfig/tcnp_extension.go +++ b/service/internal/cloudconfig/tcnp_extension.go @@ -8,7 +8,7 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" g8sv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" "github.com/giantswarm/certs/v4/pkg/certs" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v16/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v17/pkg/template" "github.com/giantswarm/microerror" "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" diff --git a/service/internal/encrypter/kms/cache.go b/service/internal/encrypter/kms/cache.go index 86a6879c45..b2191a10d9 100644 --- a/service/internal/encrypter/kms/cache.go +++ b/service/internal/encrypter/kms/cache.go @@ -6,7 +6,7 @@ import ( "time" "github.com/aws/aws-sdk-go/service/kms" - "github.com/giantswarm/operatorkit/v7/pkg/controller/context/cachekeycontext" + "github.com/giantswarm/operatorkit/v8/pkg/controller/context/cachekeycontext" gocache "github.com/patrickmn/go-cache" ) diff --git a/service/internal/hamaster/ha_master_test.go b/service/internal/hamaster/ha_master_test.go index 7eaedd1acb..466addaedc 100644 --- a/service/internal/hamaster/ha_master_test.go +++ b/service/internal/hamaster/ha_master_test.go @@ -6,7 +6,7 @@ import ( "testing" infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" - "github.com/giantswarm/operatorkit/v7/pkg/controller/context/cachekeycontext" + "github.com/giantswarm/operatorkit/v8/pkg/controller/context/cachekeycontext" "github.com/google/go-cmp/cmp" "github.com/giantswarm/aws-operator/v14/service/internal/unittest" diff --git a/service/internal/hamaster/internal/cache/aws.go b/service/internal/hamaster/internal/cache/aws.go index 2adc9e9aeb..d54a50b4aa 100644 --- a/service/internal/hamaster/internal/cache/aws.go +++ b/service/internal/hamaster/internal/cache/aws.go @@ -5,7 +5,7 @@ import ( "fmt" infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" - "github.com/giantswarm/operatorkit/v7/pkg/controller/context/cachekeycontext" + "github.com/giantswarm/operatorkit/v8/pkg/controller/context/cachekeycontext" gocache "github.com/patrickmn/go-cache" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/service/internal/hamaster/internal/cache/g8s.go b/service/internal/hamaster/internal/cache/g8s.go index 9a55987714..57a39cb8d7 100644 --- a/service/internal/hamaster/internal/cache/g8s.go +++ b/service/internal/hamaster/internal/cache/g8s.go @@ -5,7 +5,7 @@ import ( "fmt" infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" - "github.com/giantswarm/operatorkit/v7/pkg/controller/context/cachekeycontext" + "github.com/giantswarm/operatorkit/v8/pkg/controller/context/cachekeycontext" gocache "github.com/patrickmn/go-cache" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/service/internal/images/images.go b/service/internal/images/images.go index f111cd6893..d83683b069 100644 --- a/service/internal/images/images.go +++ b/service/internal/images/images.go @@ -5,7 +5,7 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/giantswarm/k8sclient/v7/pkg/k8sclient" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v16/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v17/pkg/template" "github.com/giantswarm/microerror" releasev1alpha1 "github.com/giantswarm/release-operator/v4/api/v1alpha1" "k8s.io/apimachinery/pkg/api/meta" diff --git a/service/internal/images/images_test.go b/service/internal/images/images_test.go index 1e14bcea89..fe473c35fe 100644 --- a/service/internal/images/images_test.go +++ b/service/internal/images/images_test.go @@ -7,7 +7,7 @@ import ( "testing" infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" - "github.com/giantswarm/operatorkit/v7/pkg/controller/context/cachekeycontext" + "github.com/giantswarm/operatorkit/v8/pkg/controller/context/cachekeycontext" releasev1alpha1 "github.com/giantswarm/release-operator/v4/api/v1alpha1" "github.com/giantswarm/aws-operator/v14/service/internal/unittest" diff --git a/service/internal/images/internal/cache/cluster.go b/service/internal/images/internal/cache/cluster.go index 3e90bf2f13..ccca2de925 100644 --- a/service/internal/images/internal/cache/cluster.go +++ b/service/internal/images/internal/cache/cluster.go @@ -5,7 +5,7 @@ import ( "fmt" infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" - "github.com/giantswarm/operatorkit/v7/pkg/controller/context/cachekeycontext" + "github.com/giantswarm/operatorkit/v8/pkg/controller/context/cachekeycontext" gocache "github.com/patrickmn/go-cache" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/service/internal/images/internal/cache/release.go b/service/internal/images/internal/cache/release.go index cd467b4b2e..e3b23e6c18 100644 --- a/service/internal/images/internal/cache/release.go +++ b/service/internal/images/internal/cache/release.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/giantswarm/operatorkit/v7/pkg/controller/context/cachekeycontext" + "github.com/giantswarm/operatorkit/v8/pkg/controller/context/cachekeycontext" releasev1alpha1 "github.com/giantswarm/release-operator/v4/api/v1alpha1" gocache "github.com/patrickmn/go-cache" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/service/internal/images/spec.go b/service/internal/images/spec.go index e588b703d3..93bf5bd282 100644 --- a/service/internal/images/spec.go +++ b/service/internal/images/spec.go @@ -3,7 +3,7 @@ package images import ( "context" - k8scloudconfig "github.com/giantswarm/k8scloudconfig/v16/pkg/template" + k8scloudconfig "github.com/giantswarm/k8scloudconfig/v17/pkg/template" ) type Interface interface { diff --git a/service/internal/releases/internal/cache/release.go b/service/internal/releases/internal/cache/release.go index 55ce8edaa9..36edfdfb69 100644 --- a/service/internal/releases/internal/cache/release.go +++ b/service/internal/releases/internal/cache/release.go @@ -3,7 +3,7 @@ package cache import ( "context" - "github.com/giantswarm/operatorkit/v7/pkg/controller/context/cachekeycontext" + "github.com/giantswarm/operatorkit/v8/pkg/controller/context/cachekeycontext" releasev1alpha1 "github.com/giantswarm/release-operator/v4/api/v1alpha1" gocache "github.com/patrickmn/go-cache" ) diff --git a/service/internal/unittest/default_images.go b/service/internal/unittest/default_images.go index 68d11bb43b..a140c4bf24 100644 --- a/service/internal/unittest/default_images.go +++ b/service/internal/unittest/default_images.go @@ -1,6 +1,6 @@ package unittest -import k8scloudconfig "github.com/giantswarm/k8scloudconfig/v16/pkg/template" +import k8scloudconfig "github.com/giantswarm/k8scloudconfig/v17/pkg/template" func DefaultImages() k8scloudconfig.Images { return k8scloudconfig.Images{