From 3050c8962df3ca7e1fb845379e0aad6978b42e66 Mon Sep 17 00:00:00 2001 From: Taylor Bot Date: Wed, 13 Dec 2023 16:33:25 +0100 Subject: [PATCH] Release v15.0.0 (#3680) --- CHANGELOG.md | 5 +- flag/flag.go | 2 +- flag/service/aws/aws.go | 12 +-- flag/service/cluster/cluster.go | 6 +- flag/service/cluster/docker/docker.go | 2 +- flag/service/cluster/kubernetes/kubernetes.go | 6 +- .../kubernetes/networksetup/networksetup.go | 2 +- flag/service/guest/guest.go | 4 +- flag/service/installation/guest/guest.go | 4 +- flag/service/installation/guest/ipam/ipam.go | 2 +- .../installation/guest/kubernetes/api/api.go | 4 +- .../guest/kubernetes/api/auth/auth.go | 2 +- .../kubernetes/api/auth/provider/provider.go | 2 +- .../guest/kubernetes/api/security/security.go | 2 +- .../guest/kubernetes/kubernetes.go | 2 +- flag/service/installation/installation.go | 2 +- flag/service/service.go | 10 +- go.mod | 2 +- main.go | 8 +- pkg/project/project.go | 2 +- server/endpoint/endpoint.go | 2 +- server/server.go | 6 +- service/controller/cluster.go | 94 +++++++++---------- service/controller/control_plane.go | 58 ++++++------ service/controller/control_plane_drainer.go | 20 ++-- .../controller/controllercontext/client.go | 2 +- service/controller/key/aws_control_plane.go | 2 +- service/controller/key/cluster.go | 6 +- service/controller/key/common.go | 4 +- service/controller/key/key.go | 4 +- service/controller/key/legacy.go | 2 +- service/controller/key/machine_deployment.go | 2 +- service/controller/machine_deployment.go | 78 +++++++-------- .../controller/machine_deployment_drainer.go | 20 ++-- .../controller/resource/accountid/resource.go | 4 +- .../controller/resource/apiendpoint/create.go | 4 +- .../controller/resource/asgname/resource.go | 6 +- .../controller/resource/asgstatus/resource.go | 2 +- .../controller/resource/awsclient/resource.go | 6 +- .../controller/resource/bridgezone/create.go | 2 +- .../controller/resource/bridgezone/delete.go | 2 +- .../resource/bridgezone/resource.go | 6 +- .../resource/cleanupebsvolumes/delete.go | 6 +- .../controller/resource/cleanupenis/delete.go | 2 +- .../resource/cleanuploadbalancers/delete.go | 4 +- .../resource/cleanuploadbalancers/elb.go | 4 +- .../resource/cleanuploadbalancers/elbv2.go | 4 +- .../cleanupmachinedeployments/delete.go | 4 +- .../cleanupmachinedeployments/resource.go | 2 +- .../resource/cleanuprecordsets/delete.go | 4 +- .../resource/cleanupsecuritygroups/delete.go | 4 +- .../resource/cleanuptccpniamroles/delete.go | 4 +- .../resource/cleanuptcnpiamroles/delete.go | 4 +- .../resource/cleanupvpcpeerings/delete.go | 4 +- .../resource/cproutetables/resource.go | 4 +- service/controller/resource/cpvpc/resource.go | 4 +- .../resource/drainerfinalizer/resource.go | 8 +- .../resource/drainerinitializer/resource.go | 8 +- .../resource/encryptionensurer/create.go | 2 +- .../resource/encryptionensurer/delete.go | 2 +- .../resource/encryptionensurer/resource.go | 2 +- .../controller/resource/endpoints/create.go | 2 +- .../controller/resource/endpoints/current.go | 2 +- .../controller/resource/endpoints/delete.go | 2 +- .../controller/resource/endpoints/desired.go | 4 +- .../controller/resource/endpoints/update.go | 2 +- .../resource/eniconfigcrs/create.go | 8 +- .../resource/ipam/cluster_checker.go | 2 +- service/controller/resource/ipam/create.go | 4 +- .../controller/resource/ipam/create_test.go | 4 +- .../ipam/machine_deployment_checker.go | 2 +- .../ipam/machine_deployment_persister.go | 2 +- service/controller/resource/ipam/resource.go | 2 +- .../resource/ipam/subnet_collector.go | 4 +- .../controller/resource/keepforcrs/delete.go | 4 +- .../resource/natgatewayaddresses/create.go | 2 +- .../resource/natgatewayaddresses/delete.go | 2 +- .../resource/natgatewayaddresses/resource.go | 4 +- .../controller/resource/peerrolearn/create.go | 2 +- .../controller/resource/peerrolearn/delete.go | 2 +- .../resource/peerrolearn/resource.go | 4 +- service/controller/resource/region/create.go | 4 +- .../controller/resource/s3bucket/create.go | 4 +- .../resource/s3bucket/create_test.go | 2 +- .../controller/resource/s3bucket/current.go | 4 +- .../controller/resource/s3bucket/delete.go | 2 +- .../resource/s3bucket/delete_test.go | 2 +- .../controller/resource/s3bucket/desired.go | 4 +- .../resource/s3bucket/desired_test.go | 4 +- .../controller/resource/s3bucket/resource.go | 6 +- .../controller/resource/s3bucket/update.go | 4 +- .../controller/resource/s3object/create.go | 2 +- .../controller/resource/s3object/current.go | 8 +- .../controller/resource/s3object/desired.go | 6 +- .../controller/resource/s3object/resource.go | 4 +- .../controller/resource/s3object/update.go | 2 +- .../resource/secretfinalizer/create.go | 2 +- .../resource/secretfinalizer/delete.go | 2 +- .../secretfinalizer/secret_accessor.go | 2 +- service/controller/resource/service/create.go | 2 +- .../controller/resource/service/current.go | 2 +- service/controller/resource/service/delete.go | 2 +- .../controller/resource/service/desired.go | 4 +- .../resource/service/resource_test.go | 2 +- .../controller/resource/snapshotid/create.go | 4 +- service/controller/resource/tccp/create.go | 8 +- .../controller/resource/tccp/create_test.go | 12 +-- service/controller/resource/tccp/delete.go | 6 +- service/controller/resource/tccp/resource.go | 8 +- .../resource/tccp/template/render.go | 2 +- service/controller/resource/tccpazs/create.go | 8 +- .../resource/tccpazs/create_test.go | 6 +- service/controller/resource/tccpf/create.go | 8 +- .../controller/resource/tccpf/create_test.go | 10 +- service/controller/resource/tccpf/delete.go | 4 +- service/controller/resource/tccpf/resource.go | 6 +- .../resource/tccpf/template/render.go | 2 +- service/controller/resource/tccpi/create.go | 6 +- .../controller/resource/tccpi/create_test.go | 4 +- service/controller/resource/tccpi/delete.go | 4 +- service/controller/resource/tccpi/resource.go | 6 +- .../resource/tccpi/template/render.go | 2 +- service/controller/resource/tccpn/create.go | 14 +-- .../controller/resource/tccpn/create_test.go | 20 ++-- service/controller/resource/tccpn/delete.go | 4 +- service/controller/resource/tccpn/resource.go | 12 +-- .../resource/tccpn/template/render.go | 2 +- .../resource/tccpnatgateways/create.go | 4 +- .../resource/tccpnoutputs/create.go | 6 +- .../controller/resource/tccpoutputs/create.go | 6 +- .../resource/tccpsecuritygroups/resource.go | 4 +- .../resource/tccpsubnets/resource.go | 4 +- .../controller/resource/tccpvpcid/create.go | 4 +- .../resource/tccpvpcidstatus/create.go | 4 +- .../controller/resource/tccpvpcpcx/create.go | 4 +- .../controller/resource/tcnp/autoscaler.go | 4 +- service/controller/resource/tcnp/create.go | 16 ++-- .../controller/resource/tcnp/create_test.go | 16 ++-- service/controller/resource/tcnp/delete.go | 4 +- service/controller/resource/tcnp/resource.go | 12 +-- .../resource/tcnp/template/render.go | 2 +- service/controller/resource/tcnpazs/create.go | 6 +- service/controller/resource/tcnpf/create.go | 8 +- .../controller/resource/tcnpf/create_test.go | 4 +- service/controller/resource/tcnpf/delete.go | 4 +- service/controller/resource/tcnpf/resource.go | 6 +- .../resource/tcnpf/template/render.go | 2 +- .../resource/tcnpinstanceinfo/resource.go | 4 +- .../controller/resource/tcnpoutputs/create.go | 6 +- .../resource/tcnpsecuritygroups/create.go | 2 +- .../resource/tcnpsecuritygroups/resource.go | 4 +- .../resource/tcnpstatus/resource.go | 4 +- .../resource/tenantclients/create.go | 4 +- .../resource/terminateunhealthynode/create.go | 4 +- .../terminateunhealthynode/resource.go | 2 +- .../controller/terminate_unhealthy_node.go | 24 ++--- service/internal/asg/asg.go | 8 +- service/internal/asg/internal/cache/asgs.go | 2 +- .../internal/asg/internal/cache/instances.go | 2 +- service/internal/changedetection/azs.go | 2 +- service/internal/changedetection/azs_test.go | 2 +- service/internal/changedetection/tccp.go | 6 +- service/internal/changedetection/tccpf.go | 4 +- service/internal/changedetection/tccpn.go | 10 +- service/internal/changedetection/tcnp.go | 8 +- service/internal/cloudconfig/config.go | 10 +- service/internal/cloudconfig/legacy.go | 2 +- service/internal/cloudconfig/tccpn.go | 8 +- .../internal/cloudconfig/tccpn_extension.go | 8 +- service/internal/cloudconfig/tcnp.go | 6 +- .../internal/cloudconfig/tcnp_extension.go | 8 +- service/internal/cloudtags/cloudtags.go | 4 +- service/internal/cloudtags/cloudtags_test.go | 2 +- service/internal/cphostedzone/cphostedzone.go | 4 +- service/internal/credential/credential.go | 2 +- service/internal/ebs/ebs.go | 4 +- service/internal/ebs/ebs_test.go | 2 +- service/internal/ebs/filter.go | 2 +- service/internal/ebs/mock_test.go | 2 +- service/internal/encrypter/kms/kms.go | 6 +- service/internal/hamaster/ha_master.go | 6 +- service/internal/hamaster/ha_master_test.go | 2 +- .../internal/hamaster/internal/cache/aws.go | 2 +- .../internal/hamaster/internal/cache/g8s.go | 2 +- service/internal/images/images.go | 6 +- service/internal/images/images_test.go | 2 +- .../internal/images/internal/cache/cluster.go | 2 +- .../internal/images/internal/cache/release.go | 2 +- service/internal/locker/kubelock_locker.go | 2 +- service/internal/releases/releases.go | 4 +- service/internal/unittest/default_cluster.go | 2 +- .../unittest/default_control_plane.go | 4 +- .../unittest/default_controller_context.go | 2 +- .../unittest/default_machine_deployment.go | 4 +- service/service.go | 20 ++-- 195 files changed, 568 insertions(+), 565 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f87d04b58..57e19b38a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [15.0.0] - 2023-12-13 + ### Fixed - Bump k8scc to fix calculation of max pods per node when in ENI mode. @@ -1086,7 +1088,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 -[Unreleased]: https://github.com/giantswarm/aws-operator/compare/v14.24.1...HEAD +[Unreleased]: https://github.com/giantswarm/aws-operator/compare/v15.0.0...HEAD +[15.0.0]: https://github.com/giantswarm/aws-operator/compare/v14.24.1...v15.0.0 [14.24.1]: https://github.com/giantswarm/aws-operator/compare/v14.24.0...v14.24.1 [14.24.0]: https://github.com/giantswarm/aws-operator/compare/v14.23.0...v14.24.0 [14.23.0]: https://github.com/giantswarm/aws-operator/compare/v14.22.0...v14.23.0 diff --git a/flag/flag.go b/flag/flag.go index 1af7a42b10..356953698d 100644 --- a/flag/flag.go +++ b/flag/flag.go @@ -3,7 +3,7 @@ package flag import ( "github.com/giantswarm/microkit/flag" - "github.com/giantswarm/aws-operator/v14/flag/service" + "github.com/giantswarm/aws-operator/v15/flag/service" ) type Flag struct { diff --git a/flag/service/aws/aws.go b/flag/service/aws/aws.go index d62e25be2e..36250f7864 100644 --- a/flag/service/aws/aws.go +++ b/flag/service/aws/aws.go @@ -1,12 +1,12 @@ package aws import ( - "github.com/giantswarm/aws-operator/v14/flag/service/aws/cni" - "github.com/giantswarm/aws-operator/v14/flag/service/aws/hostaccesskey" - "github.com/giantswarm/aws-operator/v14/flag/service/aws/loggingbucket" - "github.com/giantswarm/aws-operator/v14/flag/service/aws/role" - "github.com/giantswarm/aws-operator/v14/flag/service/aws/route53" - "github.com/giantswarm/aws-operator/v14/flag/service/aws/trustedadvisor" + "github.com/giantswarm/aws-operator/v15/flag/service/aws/cni" + "github.com/giantswarm/aws-operator/v15/flag/service/aws/hostaccesskey" + "github.com/giantswarm/aws-operator/v15/flag/service/aws/loggingbucket" + "github.com/giantswarm/aws-operator/v15/flag/service/aws/role" + "github.com/giantswarm/aws-operator/v15/flag/service/aws/route53" + "github.com/giantswarm/aws-operator/v15/flag/service/aws/trustedadvisor" ) type AWS struct { diff --git a/flag/service/cluster/cluster.go b/flag/service/cluster/cluster.go index 46b37434ed..6444f74277 100644 --- a/flag/service/cluster/cluster.go +++ b/flag/service/cluster/cluster.go @@ -1,9 +1,9 @@ package cluster import ( - "github.com/giantswarm/aws-operator/v14/flag/service/cluster/calico" - "github.com/giantswarm/aws-operator/v14/flag/service/cluster/docker" - "github.com/giantswarm/aws-operator/v14/flag/service/cluster/kubernetes" + "github.com/giantswarm/aws-operator/v15/flag/service/cluster/calico" + "github.com/giantswarm/aws-operator/v15/flag/service/cluster/docker" + "github.com/giantswarm/aws-operator/v15/flag/service/cluster/kubernetes" ) type Cluster struct { diff --git a/flag/service/cluster/docker/docker.go b/flag/service/cluster/docker/docker.go index aec4936770..72ce3d871e 100644 --- a/flag/service/cluster/docker/docker.go +++ b/flag/service/cluster/docker/docker.go @@ -1,7 +1,7 @@ package docker import ( - "github.com/giantswarm/aws-operator/v14/flag/service/cluster/docker/daemon" + "github.com/giantswarm/aws-operator/v15/flag/service/cluster/docker/daemon" ) type Docker struct { diff --git a/flag/service/cluster/kubernetes/kubernetes.go b/flag/service/cluster/kubernetes/kubernetes.go index c825bcb8c3..8e12000860 100644 --- a/flag/service/cluster/kubernetes/kubernetes.go +++ b/flag/service/cluster/kubernetes/kubernetes.go @@ -1,9 +1,9 @@ package kubernetes import ( - "github.com/giantswarm/aws-operator/v14/flag/service/cluster/kubernetes/api" - "github.com/giantswarm/aws-operator/v14/flag/service/cluster/kubernetes/networksetup" - "github.com/giantswarm/aws-operator/v14/flag/service/cluster/kubernetes/ssh" + "github.com/giantswarm/aws-operator/v15/flag/service/cluster/kubernetes/api" + "github.com/giantswarm/aws-operator/v15/flag/service/cluster/kubernetes/networksetup" + "github.com/giantswarm/aws-operator/v15/flag/service/cluster/kubernetes/ssh" ) type Kubernetes struct { diff --git a/flag/service/cluster/kubernetes/networksetup/networksetup.go b/flag/service/cluster/kubernetes/networksetup/networksetup.go index 8504c3520b..66adcdad2c 100644 --- a/flag/service/cluster/kubernetes/networksetup/networksetup.go +++ b/flag/service/cluster/kubernetes/networksetup/networksetup.go @@ -1,7 +1,7 @@ package networksetup import ( - "github.com/giantswarm/aws-operator/v14/flag/service/cluster/kubernetes/networksetup/docker" + "github.com/giantswarm/aws-operator/v15/flag/service/cluster/kubernetes/networksetup/docker" ) type NetworkSetup struct { diff --git a/flag/service/guest/guest.go b/flag/service/guest/guest.go index 5c4f5d975a..94b7eecd32 100644 --- a/flag/service/guest/guest.go +++ b/flag/service/guest/guest.go @@ -1,8 +1,8 @@ package guest import ( - "github.com/giantswarm/aws-operator/v14/flag/service/guest/ignition" - "github.com/giantswarm/aws-operator/v14/flag/service/guest/ssh" + "github.com/giantswarm/aws-operator/v15/flag/service/guest/ignition" + "github.com/giantswarm/aws-operator/v15/flag/service/guest/ssh" ) type Guest struct { diff --git a/flag/service/installation/guest/guest.go b/flag/service/installation/guest/guest.go index 72219cc7f7..d40e372fea 100644 --- a/flag/service/installation/guest/guest.go +++ b/flag/service/installation/guest/guest.go @@ -1,8 +1,8 @@ package guest import ( - "github.com/giantswarm/aws-operator/v14/flag/service/installation/guest/ipam" - "github.com/giantswarm/aws-operator/v14/flag/service/installation/guest/kubernetes" + "github.com/giantswarm/aws-operator/v15/flag/service/installation/guest/ipam" + "github.com/giantswarm/aws-operator/v15/flag/service/installation/guest/kubernetes" ) type Guest struct { diff --git a/flag/service/installation/guest/ipam/ipam.go b/flag/service/installation/guest/ipam/ipam.go index 4a7c410d35..c2afca0c3c 100644 --- a/flag/service/installation/guest/ipam/ipam.go +++ b/flag/service/installation/guest/ipam/ipam.go @@ -1,6 +1,6 @@ package ipam -import "github.com/giantswarm/aws-operator/v14/flag/service/installation/guest/ipam/network" +import "github.com/giantswarm/aws-operator/v15/flag/service/installation/guest/ipam/network" type IPAM struct { Network network.Network diff --git a/flag/service/installation/guest/kubernetes/api/api.go b/flag/service/installation/guest/kubernetes/api/api.go index 112fd9b100..8d8c3cd886 100644 --- a/flag/service/installation/guest/kubernetes/api/api.go +++ b/flag/service/installation/guest/kubernetes/api/api.go @@ -1,8 +1,8 @@ package api import ( - "github.com/giantswarm/aws-operator/v14/flag/service/installation/guest/kubernetes/api/auth" - "github.com/giantswarm/aws-operator/v14/flag/service/installation/guest/kubernetes/api/security" + "github.com/giantswarm/aws-operator/v15/flag/service/installation/guest/kubernetes/api/auth" + "github.com/giantswarm/aws-operator/v15/flag/service/installation/guest/kubernetes/api/security" ) type API struct { diff --git a/flag/service/installation/guest/kubernetes/api/auth/auth.go b/flag/service/installation/guest/kubernetes/api/auth/auth.go index 1c0b7e212c..018bfca7a1 100644 --- a/flag/service/installation/guest/kubernetes/api/auth/auth.go +++ b/flag/service/installation/guest/kubernetes/api/auth/auth.go @@ -1,7 +1,7 @@ package auth import ( - "github.com/giantswarm/aws-operator/v14/flag/service/installation/guest/kubernetes/api/auth/provider" + "github.com/giantswarm/aws-operator/v15/flag/service/installation/guest/kubernetes/api/auth/provider" ) type Auth struct { diff --git a/flag/service/installation/guest/kubernetes/api/auth/provider/provider.go b/flag/service/installation/guest/kubernetes/api/auth/provider/provider.go index 01e00329a3..c2f1839281 100644 --- a/flag/service/installation/guest/kubernetes/api/auth/provider/provider.go +++ b/flag/service/installation/guest/kubernetes/api/auth/provider/provider.go @@ -1,7 +1,7 @@ package provider import ( - "github.com/giantswarm/aws-operator/v14/flag/service/installation/guest/kubernetes/api/auth/provider/oidc" + "github.com/giantswarm/aws-operator/v15/flag/service/installation/guest/kubernetes/api/auth/provider/oidc" ) type Provider struct { diff --git a/flag/service/installation/guest/kubernetes/api/security/security.go b/flag/service/installation/guest/kubernetes/api/security/security.go index 8fc963e404..c009dfddb2 100644 --- a/flag/service/installation/guest/kubernetes/api/security/security.go +++ b/flag/service/installation/guest/kubernetes/api/security/security.go @@ -1,6 +1,6 @@ package security -import "github.com/giantswarm/aws-operator/v14/flag/service/installation/guest/kubernetes/api/security/whitelist" +import "github.com/giantswarm/aws-operator/v15/flag/service/installation/guest/kubernetes/api/security/whitelist" type Security struct { Whitelist whitelist.Whitelist diff --git a/flag/service/installation/guest/kubernetes/kubernetes.go b/flag/service/installation/guest/kubernetes/kubernetes.go index 7b7c4c14eb..14741b331e 100644 --- a/flag/service/installation/guest/kubernetes/kubernetes.go +++ b/flag/service/installation/guest/kubernetes/kubernetes.go @@ -1,7 +1,7 @@ package kubernetes import ( - "github.com/giantswarm/aws-operator/v14/flag/service/installation/guest/kubernetes/api" + "github.com/giantswarm/aws-operator/v15/flag/service/installation/guest/kubernetes/api" ) type Kubernetes struct { diff --git a/flag/service/installation/installation.go b/flag/service/installation/installation.go index 9c34c1e69a..4d31e9280c 100644 --- a/flag/service/installation/installation.go +++ b/flag/service/installation/installation.go @@ -1,7 +1,7 @@ package installation import ( - "github.com/giantswarm/aws-operator/v14/flag/service/installation/guest" + "github.com/giantswarm/aws-operator/v15/flag/service/installation/guest" ) type Installation struct { diff --git a/flag/service/service.go b/flag/service/service.go index 0915db4d2b..72c692e9ab 100644 --- a/flag/service/service.go +++ b/flag/service/service.go @@ -3,11 +3,11 @@ package service import ( "github.com/giantswarm/operatorkit/v7/pkg/flag/service/kubernetes" - "github.com/giantswarm/aws-operator/v14/flag/service/aws" - "github.com/giantswarm/aws-operator/v14/flag/service/cluster" - "github.com/giantswarm/aws-operator/v14/flag/service/guest" - "github.com/giantswarm/aws-operator/v14/flag/service/installation" - "github.com/giantswarm/aws-operator/v14/flag/service/registry" + "github.com/giantswarm/aws-operator/v15/flag/service/aws" + "github.com/giantswarm/aws-operator/v15/flag/service/cluster" + "github.com/giantswarm/aws-operator/v15/flag/service/guest" + "github.com/giantswarm/aws-operator/v15/flag/service/installation" + "github.com/giantswarm/aws-operator/v15/flag/service/registry" ) type Service struct { diff --git a/go.mod b/go.mod index 99fb38cad4..7392f5d731 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/giantswarm/aws-operator/v14 +module github.com/giantswarm/aws-operator/v15 go 1.21 diff --git a/main.go b/main.go index 66f9542241..3d27e28b05 100644 --- a/main.go +++ b/main.go @@ -9,10 +9,10 @@ import ( "github.com/giantswarm/micrologger" "github.com/spf13/viper" - "github.com/giantswarm/aws-operator/v14/flag" - "github.com/giantswarm/aws-operator/v14/pkg/project" - "github.com/giantswarm/aws-operator/v14/server" - "github.com/giantswarm/aws-operator/v14/service" + "github.com/giantswarm/aws-operator/v15/flag" + "github.com/giantswarm/aws-operator/v15/pkg/project" + "github.com/giantswarm/aws-operator/v15/server" + "github.com/giantswarm/aws-operator/v15/service" ) var ( diff --git a/pkg/project/project.go b/pkg/project/project.go index ed24ff9fc1..8c4cb74635 100644 --- a/pkg/project/project.go +++ b/pkg/project/project.go @@ -5,7 +5,7 @@ var ( gitSHA = "n/a" name string = "aws-operator" source string = "https://github.com/giantswarm/aws-operator" - version = "14.24.2-dev" + version = "15.0.0" ) func Description() string { diff --git a/server/endpoint/endpoint.go b/server/endpoint/endpoint.go index 62d4c39292..9abac4e924 100644 --- a/server/endpoint/endpoint.go +++ b/server/endpoint/endpoint.go @@ -6,7 +6,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service" + "github.com/giantswarm/aws-operator/v15/service" ) type Config struct { diff --git a/server/server.go b/server/server.go index bb3ed94ded..ade2569ae2 100644 --- a/server/server.go +++ b/server/server.go @@ -12,9 +12,9 @@ import ( "github.com/giantswarm/micrologger" "github.com/spf13/viper" - "github.com/giantswarm/aws-operator/v14/pkg/project" - "github.com/giantswarm/aws-operator/v14/server/endpoint" - "github.com/giantswarm/aws-operator/v14/service" + "github.com/giantswarm/aws-operator/v15/pkg/project" + "github.com/giantswarm/aws-operator/v15/server/endpoint" + "github.com/giantswarm/aws-operator/v15/service" ) type Config struct { diff --git a/service/controller/cluster.go b/service/controller/cluster.go index 74be82fcdd..925ea106cd 100644 --- a/service/controller/cluster.go +++ b/service/controller/cluster.go @@ -21,53 +21,53 @@ import ( "k8s.io/apimachinery/pkg/runtime" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/client/aws" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/pkg/project" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/accountid" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/apiendpoint" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/awsclient" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/bridgezone" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/cleanupebsvolumes" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/cleanupenis" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/cleanuploadbalancers" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/cleanupmachinedeployments" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/cleanuprecordsets" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/cleanupsecuritygroups" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/cleanupvpcpeerings" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/cproutetables" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/cpvpc" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/encryptionensurer" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/endpoints" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/eniconfigcrs" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/ipam" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/keepforcrs" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/natgatewayaddresses" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/peerrolearn" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/region" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/s3bucket" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/secretfinalizer" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/service" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccp" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpazs" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpf" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpi" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpoutputs" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpsecuritygroups" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpsubnets" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpvpcid" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpvpcidstatus" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tenantclients" - "github.com/giantswarm/aws-operator/v14/service/internal/changedetection" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudtags" - "github.com/giantswarm/aws-operator/v14/service/internal/cphostedzone" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter/kms" - "github.com/giantswarm/aws-operator/v14/service/internal/hamaster" - "github.com/giantswarm/aws-operator/v14/service/internal/locker" - event "github.com/giantswarm/aws-operator/v14/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/client/aws" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/pkg/project" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/accountid" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/apiendpoint" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/awsclient" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/bridgezone" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/cleanupebsvolumes" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/cleanupenis" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/cleanuploadbalancers" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/cleanupmachinedeployments" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/cleanuprecordsets" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/cleanupsecuritygroups" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/cleanupvpcpeerings" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/cproutetables" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/cpvpc" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/encryptionensurer" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/endpoints" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/eniconfigcrs" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/ipam" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/keepforcrs" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/natgatewayaddresses" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/peerrolearn" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/region" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/s3bucket" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/secretfinalizer" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/service" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccp" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpazs" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpf" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpi" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpoutputs" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpsecuritygroups" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpsubnets" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpvpcid" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpvpcidstatus" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tenantclients" + "github.com/giantswarm/aws-operator/v15/service/internal/changedetection" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudtags" + "github.com/giantswarm/aws-operator/v15/service/internal/cphostedzone" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter/kms" + "github.com/giantswarm/aws-operator/v15/service/internal/hamaster" + "github.com/giantswarm/aws-operator/v15/service/internal/locker" + event "github.com/giantswarm/aws-operator/v15/service/internal/recorder" ) type ClusterConfig struct { diff --git a/service/controller/control_plane.go b/service/controller/control_plane.go index 3bc9925737..bc4c95964d 100644 --- a/service/controller/control_plane.go +++ b/service/controller/control_plane.go @@ -16,35 +16,35 @@ import ( "github.com/giantswarm/randomkeys/v3" "k8s.io/apimachinery/pkg/labels" - "github.com/giantswarm/aws-operator/v14/client/aws" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/pkg/project" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/accountid" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/awsclient" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/cleanuptccpniamroles" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/cpvpc" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/region" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/s3object" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/snapshotid" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpazs" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpn" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpnoutputs" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpoutputs" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpsecuritygroups" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpsubnets" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpvpcid" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpvpcpcx" - "github.com/giantswarm/aws-operator/v14/service/internal/changedetection" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudconfig" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudtags" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter/kms" - "github.com/giantswarm/aws-operator/v14/service/internal/hamaster" - "github.com/giantswarm/aws-operator/v14/service/internal/images" - event "github.com/giantswarm/aws-operator/v14/service/internal/recorder" - "github.com/giantswarm/aws-operator/v14/service/internal/releases" + "github.com/giantswarm/aws-operator/v15/client/aws" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/pkg/project" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/accountid" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/awsclient" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/cleanuptccpniamroles" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/cpvpc" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/region" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/s3object" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/snapshotid" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpazs" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpn" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpnoutputs" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpoutputs" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpsecuritygroups" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpsubnets" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpvpcid" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpvpcpcx" + "github.com/giantswarm/aws-operator/v15/service/internal/changedetection" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudconfig" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudtags" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter/kms" + "github.com/giantswarm/aws-operator/v15/service/internal/hamaster" + "github.com/giantswarm/aws-operator/v15/service/internal/images" + event "github.com/giantswarm/aws-operator/v15/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/service/internal/releases" "sigs.k8s.io/controller-runtime/pkg/client" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/service/controller/control_plane_drainer.go b/service/controller/control_plane_drainer.go index cb713d00a2..4839ac5a8f 100644 --- a/service/controller/control_plane_drainer.go +++ b/service/controller/control_plane_drainer.go @@ -15,16 +15,16 @@ import ( "k8s.io/apimachinery/pkg/labels" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/client/aws" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/pkg/project" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/awsclient" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/drainerfinalizer" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/drainerinitializer" - "github.com/giantswarm/aws-operator/v14/service/internal/asg" - event "github.com/giantswarm/aws-operator/v14/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/client/aws" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/pkg/project" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/awsclient" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/drainerfinalizer" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/drainerinitializer" + "github.com/giantswarm/aws-operator/v15/service/internal/asg" + event "github.com/giantswarm/aws-operator/v15/service/internal/recorder" ) type ControlPlaneDrainerConfig struct { diff --git a/service/controller/controllercontext/client.go b/service/controller/controllercontext/client.go index cbd94573b3..cc2c70c53d 100644 --- a/service/controller/controllercontext/client.go +++ b/service/controller/controllercontext/client.go @@ -3,7 +3,7 @@ package controllercontext import ( "github.com/giantswarm/k8sclient/v7/pkg/k8sclient" - "github.com/giantswarm/aws-operator/v14/client/aws" + "github.com/giantswarm/aws-operator/v15/client/aws" ) type ContextClient struct { diff --git a/service/controller/key/aws_control_plane.go b/service/controller/key/aws_control_plane.go index eef74ac0d2..cb0f9a63e5 100644 --- a/service/controller/key/aws_control_plane.go +++ b/service/controller/key/aws_control_plane.go @@ -8,7 +8,7 @@ import ( "github.com/giantswarm/k8smetadata/pkg/annotation" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/pkg/label" + "github.com/giantswarm/aws-operator/v15/pkg/label" ) func ControlPlaneAvailabilityZones(cr infrastructurev1alpha3.AWSControlPlane) []string { diff --git a/service/controller/key/cluster.go b/service/controller/key/cluster.go index a33f97bd6a..41080796d4 100644 --- a/service/controller/key/cluster.go +++ b/service/controller/key/cluster.go @@ -14,9 +14,9 @@ import ( "github.com/giantswarm/microerror" apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" - awsoperatorannotation "github.com/giantswarm/aws-operator/v14/pkg/annotation" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/pkg/project" + awsoperatorannotation "github.com/giantswarm/aws-operator/v15/pkg/annotation" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/pkg/project" ) const ( diff --git a/service/controller/key/common.go b/service/controller/key/common.go index 679a8db5a3..a5a94339cb 100644 --- a/service/controller/key/common.go +++ b/service/controller/key/common.go @@ -14,8 +14,8 @@ import ( "github.com/giantswarm/microerror" releasev1alpha1 "github.com/giantswarm/release-operator/v4/api/v1alpha1" - "github.com/giantswarm/aws-operator/v14/pkg/annotation" - "github.com/giantswarm/aws-operator/v14/pkg/label" + "github.com/giantswarm/aws-operator/v15/pkg/annotation" + "github.com/giantswarm/aws-operator/v15/pkg/label" ) const ( diff --git a/service/controller/key/key.go b/service/controller/key/key.go index b9173fb9bf..e47606b4b3 100644 --- a/service/controller/key/key.go +++ b/service/controller/key/key.go @@ -1,8 +1,8 @@ package key import ( - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/pkg/project" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/pkg/project" ) func VersionLabelSelector(enabled bool, overridenVersion string) string { diff --git a/service/controller/key/legacy.go b/service/controller/key/legacy.go index 8bddf86233..3b0bc6fbc6 100644 --- a/service/controller/key/legacy.go +++ b/service/controller/key/legacy.go @@ -3,7 +3,7 @@ package key import ( g8sv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" - "github.com/giantswarm/aws-operator/v14/service/internal/templates/cloudconfig" + "github.com/giantswarm/aws-operator/v15/service/internal/templates/cloudconfig" ) // NOTE that code below is deprecated and needs refactoring. diff --git a/service/controller/key/machine_deployment.go b/service/controller/key/machine_deployment.go index c71d005d39..36ed8aa38f 100644 --- a/service/controller/key/machine_deployment.go +++ b/service/controller/key/machine_deployment.go @@ -9,7 +9,7 @@ import ( "github.com/giantswarm/k8smetadata/pkg/annotation" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tcnp/template" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tcnp/template" ) func MachineDeploymentAvailabilityZones(cr infrastructurev1alpha3.AWSMachineDeployment) []string { diff --git a/service/controller/machine_deployment.go b/service/controller/machine_deployment.go index a99443db6f..a51fe5a91b 100644 --- a/service/controller/machine_deployment.go +++ b/service/controller/machine_deployment.go @@ -21,45 +21,45 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/client/aws" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/pkg/project" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/accountid" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/asgname" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/asgstatus" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/awsclient" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/cleanuptcnpiamroles" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/cproutetables" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/cpvpc" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/ipam" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/region" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/s3object" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpazs" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpnatgateways" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpsecuritygroups" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpsubnets" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpvpcid" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpvpcpcx" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tcnp" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tcnpazs" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tcnpf" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tcnpinstanceinfo" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tcnpoutputs" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tcnpsecuritygroups" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tcnpstatus" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tenantclients" - "github.com/giantswarm/aws-operator/v14/service/internal/changedetection" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudconfig" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudtags" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter/kms" - "github.com/giantswarm/aws-operator/v14/service/internal/hamaster" - "github.com/giantswarm/aws-operator/v14/service/internal/images" - "github.com/giantswarm/aws-operator/v14/service/internal/locker" - event "github.com/giantswarm/aws-operator/v14/service/internal/recorder" - "github.com/giantswarm/aws-operator/v14/service/internal/releases" + "github.com/giantswarm/aws-operator/v15/client/aws" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/pkg/project" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/accountid" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/asgname" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/asgstatus" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/awsclient" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/cleanuptcnpiamroles" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/cproutetables" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/cpvpc" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/ipam" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/region" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/s3object" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpazs" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpnatgateways" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpsecuritygroups" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpsubnets" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpvpcid" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpvpcpcx" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tcnp" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tcnpazs" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tcnpf" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tcnpinstanceinfo" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tcnpoutputs" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tcnpsecuritygroups" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tcnpstatus" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tenantclients" + "github.com/giantswarm/aws-operator/v15/service/internal/changedetection" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudconfig" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudtags" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter/kms" + "github.com/giantswarm/aws-operator/v15/service/internal/hamaster" + "github.com/giantswarm/aws-operator/v15/service/internal/images" + "github.com/giantswarm/aws-operator/v15/service/internal/locker" + event "github.com/giantswarm/aws-operator/v15/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/service/internal/releases" ) type MachineDeploymentConfig struct { diff --git a/service/controller/machine_deployment_drainer.go b/service/controller/machine_deployment_drainer.go index 5581bb9542..1f61a3e89e 100644 --- a/service/controller/machine_deployment_drainer.go +++ b/service/controller/machine_deployment_drainer.go @@ -15,16 +15,16 @@ import ( "k8s.io/apimachinery/pkg/labels" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/client/aws" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/pkg/project" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/awsclient" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/drainerfinalizer" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/drainerinitializer" - "github.com/giantswarm/aws-operator/v14/service/internal/asg" - event "github.com/giantswarm/aws-operator/v14/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/client/aws" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/pkg/project" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/awsclient" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/drainerfinalizer" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/drainerinitializer" + "github.com/giantswarm/aws-operator/v15/service/internal/asg" + event "github.com/giantswarm/aws-operator/v15/service/internal/recorder" ) type MachineDeploymentDrainerConfig struct { diff --git a/service/controller/resource/accountid/resource.go b/service/controller/resource/accountid/resource.go index fce142444d..0138393913 100644 --- a/service/controller/resource/accountid/resource.go +++ b/service/controller/resource/accountid/resource.go @@ -6,8 +6,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/internal/accountid" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/internal/accountid" ) const ( diff --git a/service/controller/resource/apiendpoint/create.go b/service/controller/resource/apiendpoint/create.go index 184dfdcf72..efd40c93f7 100644 --- a/service/controller/resource/apiendpoint/create.go +++ b/service/controller/resource/apiendpoint/create.go @@ -8,8 +8,8 @@ import ( apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/asgname/resource.go b/service/controller/resource/asgname/resource.go index 697512d39b..f7bd294f9b 100644 --- a/service/controller/resource/asgname/resource.go +++ b/service/controller/resource/asgname/resource.go @@ -10,9 +10,9 @@ import ( "github.com/giantswarm/micrologger" "k8s.io/apimachinery/pkg/api/meta" - "github.com/giantswarm/aws-operator/v14/pkg/awstags" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/pkg/awstags" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/controller/resource/asgstatus/resource.go b/service/controller/resource/asgstatus/resource.go index 6a8c83ef39..25f43ad492 100644 --- a/service/controller/resource/asgstatus/resource.go +++ b/service/controller/resource/asgstatus/resource.go @@ -8,7 +8,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" ) const ( diff --git a/service/controller/resource/awsclient/resource.go b/service/controller/resource/awsclient/resource.go index f866576f6c..f0932e973e 100644 --- a/service/controller/resource/awsclient/resource.go +++ b/service/controller/resource/awsclient/resource.go @@ -8,9 +8,9 @@ import ( "github.com/giantswarm/micrologger" "k8s.io/client-go/kubernetes" - "github.com/giantswarm/aws-operator/v14/client/aws" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/internal/credential" + "github.com/giantswarm/aws-operator/v15/client/aws" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/internal/credential" ) const ( diff --git a/service/controller/resource/bridgezone/create.go b/service/controller/resource/bridgezone/create.go index c7388bdf6d..214727055c 100644 --- a/service/controller/resource/bridgezone/create.go +++ b/service/controller/resource/bridgezone/create.go @@ -7,7 +7,7 @@ import ( "github.com/giantswarm/microerror" "golang.org/x/sync/errgroup" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/bridgezone/delete.go b/service/controller/resource/bridgezone/delete.go index c15afa9294..f6397b42a9 100644 --- a/service/controller/resource/bridgezone/delete.go +++ b/service/controller/resource/bridgezone/delete.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go/service/route53" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/bridgezone/resource.go b/service/controller/resource/bridgezone/resource.go index 6deb4ea32c..c99bceb0a6 100644 --- a/service/controller/resource/bridgezone/resource.go +++ b/service/controller/resource/bridgezone/resource.go @@ -11,9 +11,9 @@ import ( "github.com/giantswarm/micrologger" "k8s.io/client-go/kubernetes" - clientaws "github.com/giantswarm/aws-operator/v14/client/aws" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/internal/credential" + clientaws "github.com/giantswarm/aws-operator/v15/client/aws" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/internal/credential" ) const ( diff --git a/service/controller/resource/cleanupebsvolumes/delete.go b/service/controller/resource/cleanupebsvolumes/delete.go index e08ed293f9..b4fd197270 100644 --- a/service/controller/resource/cleanupebsvolumes/delete.go +++ b/service/controller/resource/cleanupebsvolumes/delete.go @@ -7,9 +7,9 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/ebs" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/ebs" ) // EnsureDeleted detaches and deletes the EBS volumes. We don't return diff --git a/service/controller/resource/cleanupenis/delete.go b/service/controller/resource/cleanupenis/delete.go index a14f960491..8e616f185a 100644 --- a/service/controller/resource/cleanupenis/delete.go +++ b/service/controller/resource/cleanupenis/delete.go @@ -8,7 +8,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/cleanuploadbalancers/delete.go b/service/controller/resource/cleanuploadbalancers/delete.go index f441ccfcaf..efb30a1f84 100644 --- a/service/controller/resource/cleanuploadbalancers/delete.go +++ b/service/controller/resource/cleanuploadbalancers/delete.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/service/elbv2" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) // EnsureDeleted ensures that any ELBs from Kubernetes LoadBalancer services diff --git a/service/controller/resource/cleanuploadbalancers/elb.go b/service/controller/resource/cleanuploadbalancers/elb.go index ec70424912..3011d80eb8 100644 --- a/service/controller/resource/cleanuploadbalancers/elb.go +++ b/service/controller/resource/cleanuploadbalancers/elb.go @@ -7,8 +7,8 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) clusterClassicLoadBalancers(ctx context.Context, customObject infrastructurev1alpha3.AWSCluster) (*LoadBalancerState, error) { diff --git a/service/controller/resource/cleanuploadbalancers/elbv2.go b/service/controller/resource/cleanuploadbalancers/elbv2.go index 39585d3460..160eeca7e2 100644 --- a/service/controller/resource/cleanuploadbalancers/elbv2.go +++ b/service/controller/resource/cleanuploadbalancers/elbv2.go @@ -8,8 +8,8 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) clusterLoadBalancersV2(ctx context.Context, cl infrastructurev1alpha3.AWSCluster) (*LoadBalancerStateV2, error) { diff --git a/service/controller/resource/cleanupmachinedeployments/delete.go b/service/controller/resource/cleanupmachinedeployments/delete.go index 2378ff000d..f566c83c37 100644 --- a/service/controller/resource/cleanupmachinedeployments/delete.go +++ b/service/controller/resource/cleanupmachinedeployments/delete.go @@ -10,8 +10,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/cleanupmachinedeployments/resource.go b/service/controller/resource/cleanupmachinedeployments/resource.go index 7d18982612..758bcc8c9b 100644 --- a/service/controller/resource/cleanupmachinedeployments/resource.go +++ b/service/controller/resource/cleanupmachinedeployments/resource.go @@ -4,7 +4,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - event "github.com/giantswarm/aws-operator/v14/service/internal/recorder" + event "github.com/giantswarm/aws-operator/v15/service/internal/recorder" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/service/controller/resource/cleanuprecordsets/delete.go b/service/controller/resource/cleanuprecordsets/delete.go index 603c561399..ff010f5f53 100644 --- a/service/controller/resource/cleanuprecordsets/delete.go +++ b/service/controller/resource/cleanuprecordsets/delete.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/service/route53" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/cleanupsecuritygroups/delete.go b/service/controller/resource/cleanupsecuritygroups/delete.go index e65b1e0ec1..e3ff2a5d5c 100644 --- a/service/controller/resource/cleanupsecuritygroups/delete.go +++ b/service/controller/resource/cleanupsecuritygroups/delete.go @@ -9,8 +9,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/cleanuptccpniamroles/delete.go b/service/controller/resource/cleanuptccpniamroles/delete.go index 212b70c1ff..1d9e72cac9 100644 --- a/service/controller/resource/cleanuptccpniamroles/delete.go +++ b/service/controller/resource/cleanuptccpniamroles/delete.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/service/iam" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/cleanuptcnpiamroles/delete.go b/service/controller/resource/cleanuptcnpiamroles/delete.go index cb0b54e02e..39e14a737f 100644 --- a/service/controller/resource/cleanuptcnpiamroles/delete.go +++ b/service/controller/resource/cleanuptcnpiamroles/delete.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/service/iam" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/cleanupvpcpeerings/delete.go b/service/controller/resource/cleanupvpcpeerings/delete.go index c77bf6fe90..3ee09d737e 100644 --- a/service/controller/resource/cleanupvpcpeerings/delete.go +++ b/service/controller/resource/cleanupvpcpeerings/delete.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/cproutetables/resource.go b/service/controller/resource/cproutetables/resource.go index 2eb95487bb..44a020a6cc 100644 --- a/service/controller/resource/cproutetables/resource.go +++ b/service/controller/resource/cproutetables/resource.go @@ -10,8 +10,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/controller/resource/cpvpc/resource.go b/service/controller/resource/cpvpc/resource.go index b991f39e52..3a76ce08a7 100644 --- a/service/controller/resource/cpvpc/resource.go +++ b/service/controller/resource/cpvpc/resource.go @@ -10,8 +10,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/controller/resource/drainerfinalizer/resource.go b/service/controller/resource/drainerfinalizer/resource.go index b2d10c7d08..924d8da8b9 100644 --- a/service/controller/resource/drainerfinalizer/resource.go +++ b/service/controller/resource/drainerfinalizer/resource.go @@ -14,10 +14,10 @@ import ( "k8s.io/apimachinery/pkg/labels" apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" - "github.com/giantswarm/aws-operator/v14/pkg/annotation" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/asg" + "github.com/giantswarm/aws-operator/v15/pkg/annotation" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/asg" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/service/controller/resource/drainerinitializer/resource.go b/service/controller/resource/drainerinitializer/resource.go index 32d8e44e3b..6b23f68f58 100644 --- a/service/controller/resource/drainerinitializer/resource.go +++ b/service/controller/resource/drainerinitializer/resource.go @@ -15,10 +15,10 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/pkg/annotation" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/asg" + "github.com/giantswarm/aws-operator/v15/pkg/annotation" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/asg" "sigs.k8s.io/controller-runtime/pkg/client" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/service/controller/resource/encryptionensurer/create.go b/service/controller/resource/encryptionensurer/create.go index a3c4ab5d3c..5b4ea6b781 100644 --- a/service/controller/resource/encryptionensurer/create.go +++ b/service/controller/resource/encryptionensurer/create.go @@ -5,7 +5,7 @@ import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/encryptionensurer/delete.go b/service/controller/resource/encryptionensurer/delete.go index a6b9ddb3fa..0478ae32e8 100644 --- a/service/controller/resource/encryptionensurer/delete.go +++ b/service/controller/resource/encryptionensurer/delete.go @@ -5,7 +5,7 @@ import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/encryptionensurer/resource.go b/service/controller/resource/encryptionensurer/resource.go index 8f6717ac4a..cc9319c84f 100644 --- a/service/controller/resource/encryptionensurer/resource.go +++ b/service/controller/resource/encryptionensurer/resource.go @@ -4,7 +4,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter" ) const ( diff --git a/service/controller/resource/endpoints/create.go b/service/controller/resource/endpoints/create.go index 0f07a6865e..d2f0a20210 100644 --- a/service/controller/resource/endpoints/create.go +++ b/service/controller/resource/endpoints/create.go @@ -8,7 +8,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) ApplyCreateChange(ctx context.Context, obj, createChange interface{}) error { diff --git a/service/controller/resource/endpoints/current.go b/service/controller/resource/endpoints/current.go index 96ff41f175..14c611a5e2 100644 --- a/service/controller/resource/endpoints/current.go +++ b/service/controller/resource/endpoints/current.go @@ -8,7 +8,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) GetCurrentState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/resource/endpoints/delete.go b/service/controller/resource/endpoints/delete.go index affad25dd0..f2c4182e8b 100644 --- a/service/controller/resource/endpoints/delete.go +++ b/service/controller/resource/endpoints/delete.go @@ -9,7 +9,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) ApplyDeleteChange(ctx context.Context, obj, deleteChange interface{}) error { diff --git a/service/controller/resource/endpoints/desired.go b/service/controller/resource/endpoints/desired.go index 2ea9fdf1ff..6d5cfc1443 100644 --- a/service/controller/resource/endpoints/desired.go +++ b/service/controller/resource/endpoints/desired.go @@ -13,8 +13,8 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) GetDesiredState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/resource/endpoints/update.go b/service/controller/resource/endpoints/update.go index 6118c5d199..f45e61777a 100644 --- a/service/controller/resource/endpoints/update.go +++ b/service/controller/resource/endpoints/update.go @@ -10,7 +10,7 @@ import ( "github.com/giantswarm/operatorkit/v7/pkg/resource/crud" corev1 "k8s.io/api/core/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) ApplyUpdateChange(ctx context.Context, obj, updateChange interface{}) error { diff --git a/service/controller/resource/eniconfigcrs/create.go b/service/controller/resource/eniconfigcrs/create.go index ac00c43e3e..80685daf40 100644 --- a/service/controller/resource/eniconfigcrs/create.go +++ b/service/controller/resource/eniconfigcrs/create.go @@ -11,10 +11,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/giantswarm/aws-operator/v14/pkg/annotation" - "github.com/giantswarm/aws-operator/v14/pkg/awstags" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/pkg/annotation" + "github.com/giantswarm/aws-operator/v15/pkg/awstags" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/ipam/cluster_checker.go b/service/controller/resource/ipam/cluster_checker.go index 95e4a8fb35..63d793e509 100644 --- a/service/controller/resource/ipam/cluster_checker.go +++ b/service/controller/resource/ipam/cluster_checker.go @@ -7,7 +7,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" "sigs.k8s.io/controller-runtime/pkg/client" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/service/controller/resource/ipam/create.go b/service/controller/resource/ipam/create.go index 7ed0e96f7f..980d2261a9 100644 --- a/service/controller/resource/ipam/create.go +++ b/service/controller/resource/ipam/create.go @@ -12,8 +12,8 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "k8s.io/apimachinery/pkg/types" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/locker" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/locker" ) // EnsureCreated allocates tenant cluster network segments. It gathers existing diff --git a/service/controller/resource/ipam/create_test.go b/service/controller/resource/ipam/create_test.go index ea25c6affd..48b6665c3f 100644 --- a/service/controller/resource/ipam/create_test.go +++ b/service/controller/resource/ipam/create_test.go @@ -9,8 +9,8 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/giantswarm/micrologger/microloggertest" - "github.com/giantswarm/aws-operator/v14/service/internal/locker" - "github.com/giantswarm/aws-operator/v14/service/internal/unittest" + "github.com/giantswarm/aws-operator/v15/service/internal/locker" + "github.com/giantswarm/aws-operator/v15/service/internal/unittest" ) func Test_SubnetAllocator(t *testing.T) { diff --git a/service/controller/resource/ipam/machine_deployment_checker.go b/service/controller/resource/ipam/machine_deployment_checker.go index 104106b31e..80aadc7df2 100644 --- a/service/controller/resource/ipam/machine_deployment_checker.go +++ b/service/controller/resource/ipam/machine_deployment_checker.go @@ -7,7 +7,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" "sigs.k8s.io/controller-runtime/pkg/client" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/service/controller/resource/ipam/machine_deployment_persister.go b/service/controller/resource/ipam/machine_deployment_persister.go index 6292d91a59..8a6ca1b9b9 100644 --- a/service/controller/resource/ipam/machine_deployment_persister.go +++ b/service/controller/resource/ipam/machine_deployment_persister.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/pkg/annotation" + "github.com/giantswarm/aws-operator/v15/pkg/annotation" ) type MachineDeploymentPersisterConfig struct { diff --git a/service/controller/resource/ipam/resource.go b/service/controller/resource/ipam/resource.go index 27e6b9604d..8ddc8d1939 100644 --- a/service/controller/resource/ipam/resource.go +++ b/service/controller/resource/ipam/resource.go @@ -8,7 +8,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/internal/locker" + "github.com/giantswarm/aws-operator/v15/service/internal/locker" ) const ( diff --git a/service/controller/resource/ipam/subnet_collector.go b/service/controller/resource/ipam/subnet_collector.go index 27758d83e3..a212d0e4df 100644 --- a/service/controller/resource/ipam/subnet_collector.go +++ b/service/controller/resource/ipam/subnet_collector.go @@ -14,8 +14,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) type SubnetCollectorConfig struct { diff --git a/service/controller/resource/keepforcrs/delete.go b/service/controller/resource/keepforcrs/delete.go index 11c79bcd47..5ad487d3af 100644 --- a/service/controller/resource/keepforcrs/delete.go +++ b/service/controller/resource/keepforcrs/delete.go @@ -10,8 +10,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/natgatewayaddresses/create.go b/service/controller/resource/natgatewayaddresses/create.go index 0f90530f23..489f439b1e 100644 --- a/service/controller/resource/natgatewayaddresses/create.go +++ b/service/controller/resource/natgatewayaddresses/create.go @@ -5,7 +5,7 @@ import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/natgatewayaddresses/delete.go b/service/controller/resource/natgatewayaddresses/delete.go index 80783a3b53..2affafe50f 100644 --- a/service/controller/resource/natgatewayaddresses/delete.go +++ b/service/controller/resource/natgatewayaddresses/delete.go @@ -5,7 +5,7 @@ import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/natgatewayaddresses/resource.go b/service/controller/resource/natgatewayaddresses/resource.go index 16fbded330..4f85504311 100644 --- a/service/controller/resource/natgatewayaddresses/resource.go +++ b/service/controller/resource/natgatewayaddresses/resource.go @@ -10,8 +10,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/controller/resource/peerrolearn/create.go b/service/controller/resource/peerrolearn/create.go index 0ef456cc6f..c4338b96fb 100644 --- a/service/controller/resource/peerrolearn/create.go +++ b/service/controller/resource/peerrolearn/create.go @@ -5,7 +5,7 @@ import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/peerrolearn/delete.go b/service/controller/resource/peerrolearn/delete.go index 224a4aeb81..d678cb8967 100644 --- a/service/controller/resource/peerrolearn/delete.go +++ b/service/controller/resource/peerrolearn/delete.go @@ -5,7 +5,7 @@ import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/peerrolearn/resource.go b/service/controller/resource/peerrolearn/resource.go index 725107d532..81419cfcc3 100644 --- a/service/controller/resource/peerrolearn/resource.go +++ b/service/controller/resource/peerrolearn/resource.go @@ -9,8 +9,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/controller/resource/region/create.go b/service/controller/resource/region/create.go index 1b166e5a8c..df3f88b1aa 100644 --- a/service/controller/resource/region/create.go +++ b/service/controller/resource/region/create.go @@ -5,8 +5,8 @@ import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/s3bucket/create.go b/service/controller/resource/s3bucket/create.go index 30b3f60279..56784acf31 100644 --- a/service/controller/resource/s3bucket/create.go +++ b/service/controller/resource/s3bucket/create.go @@ -7,8 +7,8 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/controller/resource/s3bucket/create_test.go b/service/controller/resource/s3bucket/create_test.go index 90d94d2233..dcd81ddea2 100644 --- a/service/controller/resource/s3bucket/create_test.go +++ b/service/controller/resource/s3bucket/create_test.go @@ -8,7 +8,7 @@ import ( "github.com/giantswarm/micrologger/microloggertest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/pkg/label" + "github.com/giantswarm/aws-operator/v15/pkg/label" ) func Test_Resource_S3Bucket_newCreate(t *testing.T) { diff --git a/service/controller/resource/s3bucket/current.go b/service/controller/resource/s3bucket/current.go index 2cd38e00c2..38e161b588 100644 --- a/service/controller/resource/s3bucket/current.go +++ b/service/controller/resource/s3bucket/current.go @@ -9,8 +9,8 @@ import ( "github.com/giantswarm/microerror" "golang.org/x/sync/errgroup" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) GetCurrentState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/resource/s3bucket/delete.go b/service/controller/resource/s3bucket/delete.go index 7ecb131441..14ec0b4cd8 100644 --- a/service/controller/resource/s3bucket/delete.go +++ b/service/controller/resource/s3bucket/delete.go @@ -11,7 +11,7 @@ import ( "github.com/giantswarm/operatorkit/v7/pkg/resource/crud" "golang.org/x/sync/errgroup" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" ) const ( diff --git a/service/controller/resource/s3bucket/delete_test.go b/service/controller/resource/s3bucket/delete_test.go index b8fb601a73..a8876ea589 100644 --- a/service/controller/resource/s3bucket/delete_test.go +++ b/service/controller/resource/s3bucket/delete_test.go @@ -8,7 +8,7 @@ import ( "github.com/giantswarm/micrologger/microloggertest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/pkg/label" + "github.com/giantswarm/aws-operator/v15/pkg/label" ) func Test_Resource_S3Bucket_newDelete(t *testing.T) { diff --git a/service/controller/resource/s3bucket/desired.go b/service/controller/resource/s3bucket/desired.go index af4034eb76..59b73d6f3b 100644 --- a/service/controller/resource/s3bucket/desired.go +++ b/service/controller/resource/s3bucket/desired.go @@ -5,8 +5,8 @@ import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) GetDesiredState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/resource/s3bucket/desired_test.go b/service/controller/resource/s3bucket/desired_test.go index ff25290a57..d5b2d29531 100644 --- a/service/controller/resource/s3bucket/desired_test.go +++ b/service/controller/resource/s3bucket/desired_test.go @@ -8,8 +8,8 @@ import ( "github.com/giantswarm/micrologger/microloggertest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" ) func Test_Resource_S3Bucket_GetDesiredState(t *testing.T) { diff --git a/service/controller/resource/s3bucket/resource.go b/service/controller/resource/s3bucket/resource.go index 7615d89d40..eb80c92de2 100644 --- a/service/controller/resource/s3bucket/resource.go +++ b/service/controller/resource/s3bucket/resource.go @@ -11,9 +11,9 @@ import ( apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/pkg/awstags" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/pkg/awstags" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/controller/resource/s3bucket/update.go b/service/controller/resource/s3bucket/update.go index 16f261130a..e7b53bc0b8 100644 --- a/service/controller/resource/s3bucket/update.go +++ b/service/controller/resource/s3bucket/update.go @@ -8,8 +8,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/resource/crud" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) ApplyUpdateChange(ctx context.Context, obj, updateChange interface{}) error { diff --git a/service/controller/resource/s3object/create.go b/service/controller/resource/s3object/create.go index 1ebf5f6da7..9bdc460a57 100644 --- a/service/controller/resource/s3object/create.go +++ b/service/controller/resource/s3object/create.go @@ -6,7 +6,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" ) func (r *Resource) ApplyCreateChange(ctx context.Context, obj, createChange interface{}) error { diff --git a/service/controller/resource/s3object/current.go b/service/controller/resource/s3object/current.go index 6c7d488a64..14840c2eab 100644 --- a/service/controller/resource/s3object/current.go +++ b/service/controller/resource/s3object/current.go @@ -12,10 +12,10 @@ import ( "github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext" "k8s.io/apimachinery/pkg/api/meta" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudconfig" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter/kms" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudconfig" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter/kms" ) func (r *Resource) GetCurrentState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/resource/s3object/desired.go b/service/controller/resource/s3object/desired.go index 77ccc26ab0..d74aad4e04 100644 --- a/service/controller/resource/s3object/desired.go +++ b/service/controller/resource/s3object/desired.go @@ -10,9 +10,9 @@ import ( "github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext" "k8s.io/apimachinery/pkg/api/meta" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudconfig" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudconfig" ) func (r *Resource) GetDesiredState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/resource/s3object/resource.go b/service/controller/resource/s3object/resource.go index 1a4ea037ae..3e785a4cd6 100644 --- a/service/controller/resource/s3object/resource.go +++ b/service/controller/resource/s3object/resource.go @@ -5,8 +5,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudconfig" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudconfig" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter" ) const ( diff --git a/service/controller/resource/s3object/update.go b/service/controller/resource/s3object/update.go index 7ab28cc924..3739e53605 100644 --- a/service/controller/resource/s3object/update.go +++ b/service/controller/resource/s3object/update.go @@ -9,7 +9,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/resource/crud" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" ) func (r *Resource) ApplyUpdateChange(ctx context.Context, obj, updateChange interface{}) error { diff --git a/service/controller/resource/secretfinalizer/create.go b/service/controller/resource/secretfinalizer/create.go index 4c48e20bf2..80ea0b0bd9 100644 --- a/service/controller/resource/secretfinalizer/create.go +++ b/service/controller/resource/secretfinalizer/create.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/secretfinalizer/delete.go b/service/controller/resource/secretfinalizer/delete.go index 20e5fa9ac7..81a0420e0e 100644 --- a/service/controller/resource/secretfinalizer/delete.go +++ b/service/controller/resource/secretfinalizer/delete.go @@ -9,7 +9,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/secretfinalizer/secret_accessor.go b/service/controller/resource/secretfinalizer/secret_accessor.go index 94da253f2f..336680090b 100644 --- a/service/controller/resource/secretfinalizer/secret_accessor.go +++ b/service/controller/resource/secretfinalizer/secret_accessor.go @@ -6,7 +6,7 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) type secretAccessor struct { diff --git a/service/controller/resource/service/create.go b/service/controller/resource/service/create.go index cb72302f28..315777bdf7 100644 --- a/service/controller/resource/service/create.go +++ b/service/controller/resource/service/create.go @@ -9,7 +9,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) ApplyCreateChange(ctx context.Context, obj, createChange interface{}) error { diff --git a/service/controller/resource/service/current.go b/service/controller/resource/service/current.go index a49d607815..6657570517 100644 --- a/service/controller/resource/service/current.go +++ b/service/controller/resource/service/current.go @@ -8,7 +8,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) GetCurrentState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/resource/service/delete.go b/service/controller/resource/service/delete.go index 4568f83088..fd115d6caa 100644 --- a/service/controller/resource/service/delete.go +++ b/service/controller/resource/service/delete.go @@ -9,7 +9,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) ApplyDeleteChange(ctx context.Context, obj, deleteChange interface{}) error { diff --git a/service/controller/resource/service/desired.go b/service/controller/resource/service/desired.go index 2776dba7fb..8bb8cac1f3 100644 --- a/service/controller/resource/service/desired.go +++ b/service/controller/resource/service/desired.go @@ -8,8 +8,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/controller/resource/service/resource_test.go b/service/controller/resource/service/resource_test.go index aaf9e2d424..bebaf3ed59 100644 --- a/service/controller/resource/service/resource_test.go +++ b/service/controller/resource/service/resource_test.go @@ -8,7 +8,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/giantswarm/aws-operator/v14/pkg/label" + "github.com/giantswarm/aws-operator/v15/pkg/label" ) func Test_toService(t *testing.T) { diff --git a/service/controller/resource/snapshotid/create.go b/service/controller/resource/snapshotid/create.go index cafc62df63..63979f58fb 100644 --- a/service/controller/resource/snapshotid/create.go +++ b/service/controller/resource/snapshotid/create.go @@ -9,8 +9,8 @@ import ( "github.com/giantswarm/microerror" "k8s.io/apimachinery/pkg/api/meta" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/tccp/create.go b/service/controller/resource/tccp/create.go index ece59dec85..95fd3079db 100644 --- a/service/controller/resource/tccp/create.go +++ b/service/controller/resource/tccp/create.go @@ -13,10 +13,10 @@ import ( apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/pkg/awstags" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccp/template" + "github.com/giantswarm/aws-operator/v15/pkg/awstags" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccp/template" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/tccp/create_test.go b/service/controller/resource/tccp/create_test.go index 267e7ff710..d07544e73e 100644 --- a/service/controller/resource/tccp/create_test.go +++ b/service/controller/resource/tccp/create_test.go @@ -15,12 +15,12 @@ import ( "github.com/giantswarm/micrologger/microloggertest" "github.com/google/go-cmp/cmp" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccp/template" - "github.com/giantswarm/aws-operator/v14/service/internal/changedetection" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudtags" - "github.com/giantswarm/aws-operator/v14/service/internal/hamaster" - "github.com/giantswarm/aws-operator/v14/service/internal/recorder" - "github.com/giantswarm/aws-operator/v14/service/internal/unittest" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccp/template" + "github.com/giantswarm/aws-operator/v15/service/internal/changedetection" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudtags" + "github.com/giantswarm/aws-operator/v15/service/internal/hamaster" + "github.com/giantswarm/aws-operator/v15/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/service/internal/unittest" ) var update = flag.Bool("update", false, "update .golden CF template file") diff --git a/service/controller/resource/tccp/delete.go b/service/controller/resource/tccp/delete.go index c6e93fe84c..7a41ae6772 100644 --- a/service/controller/resource/tccp/delete.go +++ b/service/controller/resource/tccp/delete.go @@ -13,9 +13,9 @@ import ( "k8s.io/apimachinery/pkg/labels" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/tccp/resource.go b/service/controller/resource/tccp/resource.go index 48a5751506..e9745080ec 100644 --- a/service/controller/resource/tccp/resource.go +++ b/service/controller/resource/tccp/resource.go @@ -5,10 +5,10 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/internal/changedetection" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudtags" - "github.com/giantswarm/aws-operator/v14/service/internal/hamaster" - event "github.com/giantswarm/aws-operator/v14/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/service/internal/changedetection" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudtags" + "github.com/giantswarm/aws-operator/v15/service/internal/hamaster" + event "github.com/giantswarm/aws-operator/v15/service/internal/recorder" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/service/controller/resource/tccp/template/render.go b/service/controller/resource/tccp/template/render.go index 3639f44620..e30289e231 100644 --- a/service/controller/resource/tccp/template/render.go +++ b/service/controller/resource/tccp/template/render.go @@ -3,7 +3,7 @@ package template import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/pkg/template" + "github.com/giantswarm/aws-operator/v15/pkg/template" ) func Render(v interface{}) (string, error) { diff --git a/service/controller/resource/tccpazs/create.go b/service/controller/resource/tccpazs/create.go index c2451f4d45..e3af06c7b7 100644 --- a/service/controller/resource/tccpazs/create.go +++ b/service/controller/resource/tccpazs/create.go @@ -13,10 +13,10 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/pkg/awstags" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/pkg/awstags" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) // MaxAZs is the maximum number of availability zones allowed for a tenant diff --git a/service/controller/resource/tccpazs/create_test.go b/service/controller/resource/tccpazs/create_test.go index d1899eff9c..6201c30d65 100644 --- a/service/controller/resource/tccpazs/create_test.go +++ b/service/controller/resource/tccpazs/create_test.go @@ -13,9 +13,9 @@ import ( "github.com/giantswarm/to" "github.com/google/go-cmp/cmp" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/unittest" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/unittest" ) func Test_EnsureCreated_AZ_Spec(t *testing.T) { diff --git a/service/controller/resource/tccpf/create.go b/service/controller/resource/tccpf/create.go index 3d629d5093..f68cbba4e4 100644 --- a/service/controller/resource/tccpf/create.go +++ b/service/controller/resource/tccpf/create.go @@ -8,10 +8,10 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/pkg/awstags" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpf/template" + "github.com/giantswarm/aws-operator/v15/pkg/awstags" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpf/template" ) const ( diff --git a/service/controller/resource/tccpf/create_test.go b/service/controller/resource/tccpf/create_test.go index e7e596df64..05019acc9e 100644 --- a/service/controller/resource/tccpf/create_test.go +++ b/service/controller/resource/tccpf/create_test.go @@ -14,11 +14,11 @@ import ( "github.com/giantswarm/micrologger/microloggertest" "github.com/google/go-cmp/cmp" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpf/template" - "github.com/giantswarm/aws-operator/v14/service/internal/changedetection" - "github.com/giantswarm/aws-operator/v14/service/internal/cphostedzone" - "github.com/giantswarm/aws-operator/v14/service/internal/recorder" - "github.com/giantswarm/aws-operator/v14/service/internal/unittest" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpf/template" + "github.com/giantswarm/aws-operator/v15/service/internal/changedetection" + "github.com/giantswarm/aws-operator/v15/service/internal/cphostedzone" + "github.com/giantswarm/aws-operator/v15/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/service/internal/unittest" ) var update = flag.Bool("update", false, "update .golden CF template file") diff --git a/service/controller/resource/tccpf/delete.go b/service/controller/resource/tccpf/delete.go index 4002e5e09e..c5130df4c9 100644 --- a/service/controller/resource/tccpf/delete.go +++ b/service/controller/resource/tccpf/delete.go @@ -9,8 +9,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/tccpf/resource.go b/service/controller/resource/tccpf/resource.go index b961ebefa1..db18f2689a 100644 --- a/service/controller/resource/tccpf/resource.go +++ b/service/controller/resource/tccpf/resource.go @@ -4,9 +4,9 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/internal/changedetection" - "github.com/giantswarm/aws-operator/v14/service/internal/cphostedzone" - "github.com/giantswarm/aws-operator/v14/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/service/internal/changedetection" + "github.com/giantswarm/aws-operator/v15/service/internal/cphostedzone" + "github.com/giantswarm/aws-operator/v15/service/internal/recorder" ) const ( diff --git a/service/controller/resource/tccpf/template/render.go b/service/controller/resource/tccpf/template/render.go index cd013747e3..ac0129bfe2 100644 --- a/service/controller/resource/tccpf/template/render.go +++ b/service/controller/resource/tccpf/template/render.go @@ -3,7 +3,7 @@ package template import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/pkg/template" + "github.com/giantswarm/aws-operator/v15/pkg/template" ) func Render(v interface{}) (string, error) { diff --git a/service/controller/resource/tccpi/create.go b/service/controller/resource/tccpi/create.go index 077e19d37b..92169f7c34 100644 --- a/service/controller/resource/tccpi/create.go +++ b/service/controller/resource/tccpi/create.go @@ -8,9 +8,9 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpi/template" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpi/template" ) const ( diff --git a/service/controller/resource/tccpi/create_test.go b/service/controller/resource/tccpi/create_test.go index 2ec74e6535..7aa9cf8d50 100644 --- a/service/controller/resource/tccpi/create_test.go +++ b/service/controller/resource/tccpi/create_test.go @@ -12,8 +12,8 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/google/go-cmp/cmp" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpi/template" - "github.com/giantswarm/aws-operator/v14/service/internal/unittest" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpi/template" + "github.com/giantswarm/aws-operator/v15/service/internal/unittest" ) var update = flag.Bool("update", false, "update .golden CF template file") diff --git a/service/controller/resource/tccpi/delete.go b/service/controller/resource/tccpi/delete.go index 090891a04d..d80bf83cad 100644 --- a/service/controller/resource/tccpi/delete.go +++ b/service/controller/resource/tccpi/delete.go @@ -9,8 +9,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/tccpi/resource.go b/service/controller/resource/tccpi/resource.go index 097f2f8e72..e6489f3bca 100644 --- a/service/controller/resource/tccpi/resource.go +++ b/service/controller/resource/tccpi/resource.go @@ -6,9 +6,9 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/pkg/awstags" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/pkg/awstags" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/recorder" ) const ( diff --git a/service/controller/resource/tccpi/template/render.go b/service/controller/resource/tccpi/template/render.go index 7a7f82460c..ff46e5a1f2 100644 --- a/service/controller/resource/tccpi/template/render.go +++ b/service/controller/resource/tccpi/template/render.go @@ -3,7 +3,7 @@ package template import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/pkg/template" + "github.com/giantswarm/aws-operator/v15/pkg/template" ) func Render(v interface{}) (string, error) { diff --git a/service/controller/resource/tccpn/create.go b/service/controller/resource/tccpn/create.go index df800ea0eb..2ef8c849e9 100644 --- a/service/controller/resource/tccpn/create.go +++ b/service/controller/resource/tccpn/create.go @@ -15,13 +15,13 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/pkg/awstags" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpn/template" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter/kms" - "github.com/giantswarm/aws-operator/v14/service/internal/hamaster" + "github.com/giantswarm/aws-operator/v15/pkg/awstags" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpn/template" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter/kms" + "github.com/giantswarm/aws-operator/v15/service/internal/hamaster" ) const ( diff --git a/service/controller/resource/tccpn/create_test.go b/service/controller/resource/tccpn/create_test.go index 78ced06ead..9b7485a2c5 100644 --- a/service/controller/resource/tccpn/create_test.go +++ b/service/controller/resource/tccpn/create_test.go @@ -14,16 +14,16 @@ import ( "github.com/giantswarm/micrologger/microloggertest" "github.com/google/go-cmp/cmp" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpn/template" - "github.com/giantswarm/aws-operator/v14/service/internal/changedetection" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudtags" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter" - "github.com/giantswarm/aws-operator/v14/service/internal/hamaster" - "github.com/giantswarm/aws-operator/v14/service/internal/images" - "github.com/giantswarm/aws-operator/v14/service/internal/recorder" - "github.com/giantswarm/aws-operator/v14/service/internal/releases" - "github.com/giantswarm/aws-operator/v14/service/internal/unittest" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpn/template" + "github.com/giantswarm/aws-operator/v15/service/internal/changedetection" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudtags" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter" + "github.com/giantswarm/aws-operator/v15/service/internal/hamaster" + "github.com/giantswarm/aws-operator/v15/service/internal/images" + "github.com/giantswarm/aws-operator/v15/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/service/internal/releases" + "github.com/giantswarm/aws-operator/v15/service/internal/unittest" ) var update = flag.Bool("update", false, "update .golden CF template file") diff --git a/service/controller/resource/tccpn/delete.go b/service/controller/resource/tccpn/delete.go index cb7ae6c26d..b1d24c0064 100644 --- a/service/controller/resource/tccpn/delete.go +++ b/service/controller/resource/tccpn/delete.go @@ -9,8 +9,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/tccpn/resource.go b/service/controller/resource/tccpn/resource.go index a3a494bb91..429008344c 100644 --- a/service/controller/resource/tccpn/resource.go +++ b/service/controller/resource/tccpn/resource.go @@ -5,12 +5,12 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/internal/changedetection" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudtags" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter" - "github.com/giantswarm/aws-operator/v14/service/internal/hamaster" - "github.com/giantswarm/aws-operator/v14/service/internal/images" - event "github.com/giantswarm/aws-operator/v14/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/service/internal/changedetection" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudtags" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter" + "github.com/giantswarm/aws-operator/v15/service/internal/hamaster" + "github.com/giantswarm/aws-operator/v15/service/internal/images" + event "github.com/giantswarm/aws-operator/v15/service/internal/recorder" ) const ( diff --git a/service/controller/resource/tccpn/template/render.go b/service/controller/resource/tccpn/template/render.go index 537eac3dee..32dc922415 100644 --- a/service/controller/resource/tccpn/template/render.go +++ b/service/controller/resource/tccpn/template/render.go @@ -3,7 +3,7 @@ package template import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/pkg/template" + "github.com/giantswarm/aws-operator/v15/pkg/template" ) func Render(v interface{}) (string, error) { diff --git a/service/controller/resource/tccpnatgateways/create.go b/service/controller/resource/tccpnatgateways/create.go index f5168c0425..ad589e388e 100644 --- a/service/controller/resource/tccpnatgateways/create.go +++ b/service/controller/resource/tccpnatgateways/create.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/tccpnoutputs/create.go b/service/controller/resource/tccpnoutputs/create.go index a60e58af2f..b68cf9b8ef 100644 --- a/service/controller/resource/tccpnoutputs/create.go +++ b/service/controller/resource/tccpnoutputs/create.go @@ -6,9 +6,9 @@ import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudformation" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudformation" ) const ( diff --git a/service/controller/resource/tccpoutputs/create.go b/service/controller/resource/tccpoutputs/create.go index a8f8fd8480..f8d2eaabe4 100644 --- a/service/controller/resource/tccpoutputs/create.go +++ b/service/controller/resource/tccpoutputs/create.go @@ -5,9 +5,9 @@ import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudformation" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudformation" ) const ( diff --git a/service/controller/resource/tccpsecuritygroups/resource.go b/service/controller/resource/tccpsecuritygroups/resource.go index 49c849d6e8..7c77857336 100644 --- a/service/controller/resource/tccpsecuritygroups/resource.go +++ b/service/controller/resource/tccpsecuritygroups/resource.go @@ -12,8 +12,8 @@ import ( apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/controller/resource/tccpsubnets/resource.go b/service/controller/resource/tccpsubnets/resource.go index 1f677b3f72..98a5f5eae6 100644 --- a/service/controller/resource/tccpsubnets/resource.go +++ b/service/controller/resource/tccpsubnets/resource.go @@ -9,8 +9,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/controller/resource/tccpvpcid/create.go b/service/controller/resource/tccpvpcid/create.go index aa7816be92..81705a6ee9 100644 --- a/service/controller/resource/tccpvpcid/create.go +++ b/service/controller/resource/tccpvpcid/create.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/tccpvpcidstatus/create.go b/service/controller/resource/tccpvpcidstatus/create.go index c6a7101710..b2ea24e180 100644 --- a/service/controller/resource/tccpvpcidstatus/create.go +++ b/service/controller/resource/tccpvpcidstatus/create.go @@ -8,8 +8,8 @@ import ( "github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext" "k8s.io/apimachinery/pkg/types" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/tccpvpcpcx/create.go b/service/controller/resource/tccpvpcpcx/create.go index c5e8bcb816..45a1f8e1bb 100644 --- a/service/controller/resource/tccpvpcpcx/create.go +++ b/service/controller/resource/tccpvpcpcx/create.go @@ -8,8 +8,8 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/tcnp/autoscaler.go b/service/controller/resource/tcnp/autoscaler.go index 3bf9eefdae..561431b228 100644 --- a/service/controller/resource/tcnp/autoscaler.go +++ b/service/controller/resource/tcnp/autoscaler.go @@ -9,8 +9,8 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) getASGName(ctx context.Context, cr infrastructurev1alpha3.AWSMachineDeployment) (string, error) { diff --git a/service/controller/resource/tcnp/create.go b/service/controller/resource/tcnp/create.go index 4a9d35ba3c..7b92f1312b 100644 --- a/service/controller/resource/tcnp/create.go +++ b/service/controller/resource/tcnp/create.go @@ -14,14 +14,14 @@ import ( apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/pkg/awstags" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccpnoutputs" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tcnp/template" - cloudformationutils "github.com/giantswarm/aws-operator/v14/service/internal/cloudformation" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter/kms" + "github.com/giantswarm/aws-operator/v15/pkg/awstags" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccpnoutputs" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tcnp/template" + cloudformationutils "github.com/giantswarm/aws-operator/v15/service/internal/cloudformation" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter/kms" ) const ( diff --git a/service/controller/resource/tcnp/create_test.go b/service/controller/resource/tcnp/create_test.go index a6c5841b34..432732e0f8 100644 --- a/service/controller/resource/tcnp/create_test.go +++ b/service/controller/resource/tcnp/create_test.go @@ -14,14 +14,14 @@ import ( releasev1alpha1 "github.com/giantswarm/release-operator/v4/api/v1alpha1" "github.com/google/go-cmp/cmp" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tcnp/template" - "github.com/giantswarm/aws-operator/v14/service/internal/changedetection" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudtags" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter" - "github.com/giantswarm/aws-operator/v14/service/internal/images" - "github.com/giantswarm/aws-operator/v14/service/internal/recorder" - "github.com/giantswarm/aws-operator/v14/service/internal/releases" - "github.com/giantswarm/aws-operator/v14/service/internal/unittest" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tcnp/template" + "github.com/giantswarm/aws-operator/v15/service/internal/changedetection" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudtags" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter" + "github.com/giantswarm/aws-operator/v15/service/internal/images" + "github.com/giantswarm/aws-operator/v15/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/service/internal/releases" + "github.com/giantswarm/aws-operator/v15/service/internal/unittest" ) var update = flag.Bool("update", false, "update .golden CF template file") diff --git a/service/controller/resource/tcnp/delete.go b/service/controller/resource/tcnp/delete.go index fc45abceeb..8a17bf3a2b 100644 --- a/service/controller/resource/tcnp/delete.go +++ b/service/controller/resource/tcnp/delete.go @@ -9,8 +9,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/tcnp/resource.go b/service/controller/resource/tcnp/resource.go index c40afd9333..d42901b8bb 100644 --- a/service/controller/resource/tcnp/resource.go +++ b/service/controller/resource/tcnp/resource.go @@ -7,12 +7,12 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tcnp/template" - "github.com/giantswarm/aws-operator/v14/service/internal/changedetection" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudtags" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter" - "github.com/giantswarm/aws-operator/v14/service/internal/images" - "github.com/giantswarm/aws-operator/v14/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tcnp/template" + "github.com/giantswarm/aws-operator/v15/service/internal/changedetection" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudtags" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter" + "github.com/giantswarm/aws-operator/v15/service/internal/images" + "github.com/giantswarm/aws-operator/v15/service/internal/recorder" ) const ( diff --git a/service/controller/resource/tcnp/template/render.go b/service/controller/resource/tcnp/template/render.go index d3b1cff668..b66cf5b2c4 100644 --- a/service/controller/resource/tcnp/template/render.go +++ b/service/controller/resource/tcnp/template/render.go @@ -3,7 +3,7 @@ package template import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/pkg/template" + "github.com/giantswarm/aws-operator/v15/pkg/template" ) func Render(v interface{}) (string, error) { diff --git a/service/controller/resource/tcnpazs/create.go b/service/controller/resource/tcnpazs/create.go index 8ae39b3fe0..d1fb5dd9b6 100644 --- a/service/controller/resource/tcnpazs/create.go +++ b/service/controller/resource/tcnpazs/create.go @@ -9,9 +9,9 @@ import ( "github.com/giantswarm/ipam" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/pkg/awstags" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/pkg/awstags" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/tcnpf/create.go b/service/controller/resource/tcnpf/create.go index 0a9c966064..c7379dbe60 100644 --- a/service/controller/resource/tcnpf/create.go +++ b/service/controller/resource/tcnpf/create.go @@ -8,10 +8,10 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/pkg/awstags" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tcnpf/template" + "github.com/giantswarm/aws-operator/v15/pkg/awstags" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tcnpf/template" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/tcnpf/create_test.go b/service/controller/resource/tcnpf/create_test.go index 0ffc8b53cc..54dd054db2 100644 --- a/service/controller/resource/tcnpf/create_test.go +++ b/service/controller/resource/tcnpf/create_test.go @@ -12,8 +12,8 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" "github.com/google/go-cmp/cmp" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tcnpf/template" - "github.com/giantswarm/aws-operator/v14/service/internal/unittest" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tcnpf/template" + "github.com/giantswarm/aws-operator/v15/service/internal/unittest" ) var update = flag.Bool("update", false, "update .golden CF template file") diff --git a/service/controller/resource/tcnpf/delete.go b/service/controller/resource/tcnpf/delete.go index 160287ed24..8578a04332 100644 --- a/service/controller/resource/tcnpf/delete.go +++ b/service/controller/resource/tcnpf/delete.go @@ -9,8 +9,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/tcnpf/resource.go b/service/controller/resource/tcnpf/resource.go index afe429f175..9575958f37 100644 --- a/service/controller/resource/tcnpf/resource.go +++ b/service/controller/resource/tcnpf/resource.go @@ -6,9 +6,9 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/pkg/awstags" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/pkg/awstags" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/recorder" ) const ( diff --git a/service/controller/resource/tcnpf/template/render.go b/service/controller/resource/tcnpf/template/render.go index ff5712efcd..388c8f85e9 100644 --- a/service/controller/resource/tcnpf/template/render.go +++ b/service/controller/resource/tcnpf/template/render.go @@ -3,7 +3,7 @@ package template import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/pkg/template" + "github.com/giantswarm/aws-operator/v15/pkg/template" ) func Render(v interface{}) (string, error) { diff --git a/service/controller/resource/tcnpinstanceinfo/resource.go b/service/controller/resource/tcnpinstanceinfo/resource.go index 1301ad4a25..93b3fb7da1 100644 --- a/service/controller/resource/tcnpinstanceinfo/resource.go +++ b/service/controller/resource/tcnpinstanceinfo/resource.go @@ -9,8 +9,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/controller/resource/tcnpoutputs/create.go b/service/controller/resource/tcnpoutputs/create.go index 4d43c14968..140c78e2be 100644 --- a/service/controller/resource/tcnpoutputs/create.go +++ b/service/controller/resource/tcnpoutputs/create.go @@ -5,9 +5,9 @@ import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudformation" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudformation" ) const ( diff --git a/service/controller/resource/tcnpsecuritygroups/create.go b/service/controller/resource/tcnpsecuritygroups/create.go index 9efb639d52..4e83341080 100644 --- a/service/controller/resource/tcnpsecuritygroups/create.go +++ b/service/controller/resource/tcnpsecuritygroups/create.go @@ -5,7 +5,7 @@ import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/tcnpsecuritygroups/resource.go b/service/controller/resource/tcnpsecuritygroups/resource.go index bdea805bf3..acd5d9ae1f 100644 --- a/service/controller/resource/tcnpsecuritygroups/resource.go +++ b/service/controller/resource/tcnpsecuritygroups/resource.go @@ -11,8 +11,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/controller/resource/tcnpstatus/resource.go b/service/controller/resource/tcnpstatus/resource.go index c19ebd7ef9..5b147e9619 100644 --- a/service/controller/resource/tcnpstatus/resource.go +++ b/service/controller/resource/tcnpstatus/resource.go @@ -9,8 +9,8 @@ import ( "github.com/giantswarm/micrologger" "github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/controller/resource/tenantclients/create.go b/service/controller/resource/tenantclients/create.go index 5f24b9f77f..78c54f4575 100644 --- a/service/controller/resource/tenantclients/create.go +++ b/service/controller/resource/tenantclients/create.go @@ -10,8 +10,8 @@ import ( apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" "k8s.io/client-go/rest" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/resource/terminateunhealthynode/create.go b/service/controller/resource/terminateunhealthynode/create.go index 36e46a644c..bf16bbfb61 100644 --- a/service/controller/resource/terminateunhealthynode/create.go +++ b/service/controller/resource/terminateunhealthynode/create.go @@ -12,8 +12,8 @@ import ( "github.com/giantswarm/microerror" corev1 "k8s.io/api/core/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/controller/resource/terminateunhealthynode/resource.go b/service/controller/resource/terminateunhealthynode/resource.go index e40e88c4f0..ec07808ced 100644 --- a/service/controller/resource/terminateunhealthynode/resource.go +++ b/service/controller/resource/terminateunhealthynode/resource.go @@ -4,7 +4,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - event "github.com/giantswarm/aws-operator/v14/service/internal/recorder" + event "github.com/giantswarm/aws-operator/v15/service/internal/recorder" ) const ( diff --git a/service/controller/terminate_unhealthy_node.go b/service/controller/terminate_unhealthy_node.go index ded6bb7f53..3308c05dd8 100644 --- a/service/controller/terminate_unhealthy_node.go +++ b/service/controller/terminate_unhealthy_node.go @@ -15,18 +15,18 @@ import ( "github.com/giantswarm/tenantcluster/v6/pkg/tenantcluster" "k8s.io/apimachinery/pkg/labels" - "github.com/giantswarm/aws-operator/v14/client/aws" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/pkg/project" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/accountid" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/apiendpoint" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/awsclient" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tenantclients" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/terminateunhealthynode" - "github.com/giantswarm/aws-operator/v14/service/internal/locker" - event "github.com/giantswarm/aws-operator/v14/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/client/aws" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/pkg/project" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/accountid" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/apiendpoint" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/awsclient" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tenantclients" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/terminateunhealthynode" + "github.com/giantswarm/aws-operator/v15/service/internal/locker" + event "github.com/giantswarm/aws-operator/v15/service/internal/recorder" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" ) diff --git a/service/internal/asg/asg.go b/service/internal/asg/asg.go index 969f0e47f4..5ee0d3ae5d 100644 --- a/service/internal/asg/asg.go +++ b/service/internal/asg/asg.go @@ -13,10 +13,10 @@ import ( "k8s.io/apimachinery/pkg/api/meta" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/pkg/awstags" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/asg/internal/cache" + "github.com/giantswarm/aws-operator/v15/pkg/awstags" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/asg/internal/cache" ) type Config struct { diff --git a/service/internal/asg/internal/cache/asgs.go b/service/internal/asg/internal/cache/asgs.go index b4bf81aee3..195f3f12e8 100644 --- a/service/internal/asg/internal/cache/asgs.go +++ b/service/internal/asg/internal/cache/asgs.go @@ -9,7 +9,7 @@ import ( gocache "github.com/patrickmn/go-cache" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) type ASGs struct { diff --git a/service/internal/asg/internal/cache/instances.go b/service/internal/asg/internal/cache/instances.go index db32be28fc..2a0926a0f1 100644 --- a/service/internal/asg/internal/cache/instances.go +++ b/service/internal/asg/internal/cache/instances.go @@ -9,7 +9,7 @@ import ( gocache "github.com/patrickmn/go-cache" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) type Instances struct { diff --git a/service/internal/changedetection/azs.go b/service/internal/changedetection/azs.go index 252d5268ca..9c5e57a857 100644 --- a/service/internal/changedetection/azs.go +++ b/service/internal/changedetection/azs.go @@ -1,7 +1,7 @@ package changedetection import ( - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" ) func availabilityZonesEqual(spec []controllercontext.ContextSpecTenantClusterTCCPAvailabilityZone, status []controllercontext.ContextStatusTenantClusterTCCPAvailabilityZone) bool { diff --git a/service/internal/changedetection/azs_test.go b/service/internal/changedetection/azs_test.go index 356f7ada44..e3ad4e1aab 100644 --- a/service/internal/changedetection/azs_test.go +++ b/service/internal/changedetection/azs_test.go @@ -7,7 +7,7 @@ import ( "github.com/google/go-cmp/cmp" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" ) func Test_Detection_availabilityZonesEqual(t *testing.T) { diff --git a/service/internal/changedetection/tccp.go b/service/internal/changedetection/tccp.go index 75754d8b6d..ae5554367c 100644 --- a/service/internal/changedetection/tccp.go +++ b/service/internal/changedetection/tccp.go @@ -8,9 +8,9 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/recorder" ) type TCCPConfig struct { diff --git a/service/internal/changedetection/tccpf.go b/service/internal/changedetection/tccpf.go index 3edfc7353a..150c16e6ad 100644 --- a/service/internal/changedetection/tccpf.go +++ b/service/internal/changedetection/tccpf.go @@ -8,8 +8,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) type TCCPFConfig struct { diff --git a/service/internal/changedetection/tccpn.go b/service/internal/changedetection/tccpn.go index f959e797cb..2ec1ac525e 100644 --- a/service/internal/changedetection/tccpn.go +++ b/service/internal/changedetection/tccpn.go @@ -10,11 +10,11 @@ import ( "github.com/giantswarm/micrologger" releasev1alpha1 "github.com/giantswarm/release-operator/v4/api/v1alpha1" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/hamaster" - "github.com/giantswarm/aws-operator/v14/service/internal/recorder" - "github.com/giantswarm/aws-operator/v14/service/internal/releases" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/hamaster" + "github.com/giantswarm/aws-operator/v15/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/service/internal/releases" ) type TCCPNConfig struct { diff --git a/service/internal/changedetection/tcnp.go b/service/internal/changedetection/tcnp.go index f893a09097..299a6caf9a 100644 --- a/service/internal/changedetection/tcnp.go +++ b/service/internal/changedetection/tcnp.go @@ -12,10 +12,10 @@ import ( "github.com/giantswarm/micrologger" releasev1alpha1 "github.com/giantswarm/release-operator/v4/api/v1alpha1" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/recorder" - "github.com/giantswarm/aws-operator/v14/service/internal/releases" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/service/internal/releases" ) type TCNPConfig struct { diff --git a/service/internal/cloudconfig/config.go b/service/internal/cloudconfig/config.go index 1276ac3dcd..c055f0ddb2 100644 --- a/service/internal/cloudconfig/config.go +++ b/service/internal/cloudconfig/config.go @@ -7,11 +7,11 @@ import ( "github.com/giantswarm/micrologger" "github.com/giantswarm/randomkeys/v3" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudtags" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter" - "github.com/giantswarm/aws-operator/v14/service/internal/hamaster" - "github.com/giantswarm/aws-operator/v14/service/internal/images" - event "github.com/giantswarm/aws-operator/v14/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudtags" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter" + "github.com/giantswarm/aws-operator/v15/service/internal/hamaster" + "github.com/giantswarm/aws-operator/v15/service/internal/images" + event "github.com/giantswarm/aws-operator/v15/service/internal/recorder" ) type Config struct { diff --git a/service/internal/cloudconfig/legacy.go b/service/internal/cloudconfig/legacy.go index bc3ab97c7b..05d249acb0 100644 --- a/service/internal/cloudconfig/legacy.go +++ b/service/internal/cloudconfig/legacy.go @@ -7,7 +7,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/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) func cmaClusterToG8sConfig(c Config, cr infrastructurev1alpha3.AWSCluster, l string) g8sv1alpha1.AWSConfigSpec { diff --git a/service/internal/cloudconfig/tccpn.go b/service/internal/cloudconfig/tccpn.go index e9eb5c0087..db01ed704d 100644 --- a/service/internal/cloudconfig/tccpn.go +++ b/service/internal/cloudconfig/tccpn.go @@ -19,10 +19,10 @@ import ( apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/hamaster" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/hamaster" ) type TCCPNConfig struct { diff --git a/service/internal/cloudconfig/tccpn_extension.go b/service/internal/cloudconfig/tccpn_extension.go index 3c3b5f8324..fc678d87c9 100644 --- a/service/internal/cloudconfig/tccpn_extension.go +++ b/service/internal/cloudconfig/tccpn_extension.go @@ -12,10 +12,10 @@ import ( "github.com/giantswarm/k8smetadata/pkg/annotation" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudconfig/template" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudconfig/template" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter" ) type TCCPNExtension struct { diff --git a/service/internal/cloudconfig/tcnp.go b/service/internal/cloudconfig/tcnp.go index c975280cde..df68626593 100644 --- a/service/internal/cloudconfig/tcnp.go +++ b/service/internal/cloudconfig/tcnp.go @@ -17,9 +17,9 @@ import ( apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) type TCNPConfig struct { diff --git a/service/internal/cloudconfig/tcnp_extension.go b/service/internal/cloudconfig/tcnp_extension.go index 3b7b67140c..9ccea98fbc 100644 --- a/service/internal/cloudconfig/tcnp_extension.go +++ b/service/internal/cloudconfig/tcnp_extension.go @@ -11,10 +11,10 @@ import ( k8scloudconfig "github.com/giantswarm/k8scloudconfig/v16/pkg/template" "github.com/giantswarm/microerror" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudconfig/template" - "github.com/giantswarm/aws-operator/v14/service/internal/encrypter" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudconfig/template" + "github.com/giantswarm/aws-operator/v15/service/internal/encrypter" ) type TCNPExtension struct { diff --git a/service/internal/cloudtags/cloudtags.go b/service/internal/cloudtags/cloudtags.go index a1c9b29c33..b5d3b1a1aa 100644 --- a/service/internal/cloudtags/cloudtags.go +++ b/service/internal/cloudtags/cloudtags.go @@ -10,8 +10,8 @@ import ( apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) type Config struct { diff --git a/service/internal/cloudtags/cloudtags_test.go b/service/internal/cloudtags/cloudtags_test.go index 7cbabf5748..d487bc5a4c 100644 --- a/service/internal/cloudtags/cloudtags_test.go +++ b/service/internal/cloudtags/cloudtags_test.go @@ -8,7 +8,7 @@ import ( "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/internal/unittest" + "github.com/giantswarm/aws-operator/v15/service/internal/unittest" ) func Test_CloudTags_GetTagsByCluster(t *testing.T) { diff --git a/service/internal/cphostedzone/cphostedzone.go b/service/internal/cphostedzone/cphostedzone.go index 975fbedde4..b7fa4ca933 100644 --- a/service/internal/cphostedzone/cphostedzone.go +++ b/service/internal/cphostedzone/cphostedzone.go @@ -10,8 +10,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) type Config struct { diff --git a/service/internal/credential/credential.go b/service/internal/credential/credential.go index ea82e63e52..d6de9ad364 100644 --- a/service/internal/credential/credential.go +++ b/service/internal/credential/credential.go @@ -9,7 +9,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/internal/ebs/ebs.go b/service/internal/ebs/ebs.go index 467d2abeba..464d5be921 100644 --- a/service/internal/ebs/ebs.go +++ b/service/internal/ebs/ebs.go @@ -12,8 +12,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/pkg/awstags" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/pkg/awstags" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/internal/ebs/ebs_test.go b/service/internal/ebs/ebs_test.go index 47ee1faf36..f75720a5aa 100644 --- a/service/internal/ebs/ebs_test.go +++ b/service/internal/ebs/ebs_test.go @@ -11,7 +11,7 @@ import ( "github.com/giantswarm/micrologger/microloggertest" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/pkg/label" + "github.com/giantswarm/aws-operator/v15/pkg/label" ) func Test_ListVolumes(t *testing.T) { diff --git a/service/internal/ebs/filter.go b/service/internal/ebs/filter.go index 890581dff2..7a1165a6c0 100644 --- a/service/internal/ebs/filter.go +++ b/service/internal/ebs/filter.go @@ -4,7 +4,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) const ( diff --git a/service/internal/ebs/mock_test.go b/service/internal/ebs/mock_test.go index 50298ff64c..0f9ebb2254 100644 --- a/service/internal/ebs/mock_test.go +++ b/service/internal/ebs/mock_test.go @@ -5,7 +5,7 @@ import ( "github.com/aws/aws-sdk-go/service/ec2" infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) type EC2ClientMock struct { diff --git a/service/internal/encrypter/kms/kms.go b/service/internal/encrypter/kms/kms.go index a0261c0ae4..16949fb198 100644 --- a/service/internal/encrypter/kms/kms.go +++ b/service/internal/encrypter/kms/kms.go @@ -9,9 +9,9 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/aws-operator/v14/pkg/awstags" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/pkg/awstags" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) type EncrypterConfig struct { diff --git a/service/internal/hamaster/ha_master.go b/service/internal/hamaster/ha_master.go index cfeb1a16e4..3991ee0444 100644 --- a/service/internal/hamaster/ha_master.go +++ b/service/internal/hamaster/ha_master.go @@ -10,9 +10,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/hamaster/internal/cache" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/hamaster/internal/cache" ) type Config struct { diff --git a/service/internal/hamaster/ha_master_test.go b/service/internal/hamaster/ha_master_test.go index 7eaedd1acb..0dc549a664 100644 --- a/service/internal/hamaster/ha_master_test.go +++ b/service/internal/hamaster/ha_master_test.go @@ -9,7 +9,7 @@ import ( "github.com/giantswarm/operatorkit/v7/pkg/controller/context/cachekeycontext" "github.com/google/go-cmp/cmp" - "github.com/giantswarm/aws-operator/v14/service/internal/unittest" + "github.com/giantswarm/aws-operator/v15/service/internal/unittest" ) func Test_HAMaster_Caching(t *testing.T) { diff --git a/service/internal/hamaster/internal/cache/aws.go b/service/internal/hamaster/internal/cache/aws.go index 2adc9e9aeb..c87a04399c 100644 --- a/service/internal/hamaster/internal/cache/aws.go +++ b/service/internal/hamaster/internal/cache/aws.go @@ -9,7 +9,7 @@ import ( gocache "github.com/patrickmn/go-cache" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) type AWS struct { diff --git a/service/internal/hamaster/internal/cache/g8s.go b/service/internal/hamaster/internal/cache/g8s.go index 9a55987714..974fe46d14 100644 --- a/service/internal/hamaster/internal/cache/g8s.go +++ b/service/internal/hamaster/internal/cache/g8s.go @@ -9,7 +9,7 @@ import ( gocache "github.com/patrickmn/go-cache" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) type G8s struct { diff --git a/service/internal/images/images.go b/service/internal/images/images.go index f111cd6893..9359ddbba5 100644 --- a/service/internal/images/images.go +++ b/service/internal/images/images.go @@ -13,9 +13,9 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/images/internal/cache" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/images/internal/cache" ) type Config struct { diff --git a/service/internal/images/images_test.go b/service/internal/images/images_test.go index 1e14bcea89..93e932de75 100644 --- a/service/internal/images/images_test.go +++ b/service/internal/images/images_test.go @@ -10,7 +10,7 @@ import ( "github.com/giantswarm/operatorkit/v7/pkg/controller/context/cachekeycontext" releasev1alpha1 "github.com/giantswarm/release-operator/v4/api/v1alpha1" - "github.com/giantswarm/aws-operator/v14/service/internal/unittest" + "github.com/giantswarm/aws-operator/v15/service/internal/unittest" ) func Test_Images_Cache(t *testing.T) { diff --git a/service/internal/images/internal/cache/cluster.go b/service/internal/images/internal/cache/cluster.go index 3e90bf2f13..6d63eb62fe 100644 --- a/service/internal/images/internal/cache/cluster.go +++ b/service/internal/images/internal/cache/cluster.go @@ -9,7 +9,7 @@ import ( gocache "github.com/patrickmn/go-cache" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) type Cluster struct { diff --git a/service/internal/images/internal/cache/release.go b/service/internal/images/internal/cache/release.go index cd467b4b2e..d24b5f75bc 100644 --- a/service/internal/images/internal/cache/release.go +++ b/service/internal/images/internal/cache/release.go @@ -9,7 +9,7 @@ import ( gocache "github.com/patrickmn/go-cache" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/controller/key" ) type Release struct { diff --git a/service/internal/locker/kubelock_locker.go b/service/internal/locker/kubelock_locker.go index b29f1787a1..17dd7b8398 100644 --- a/service/internal/locker/kubelock_locker.go +++ b/service/internal/locker/kubelock_locker.go @@ -11,7 +11,7 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/client-go/rest" - "github.com/giantswarm/aws-operator/v14/pkg/project" + "github.com/giantswarm/aws-operator/v15/pkg/project" ) const ( diff --git a/service/internal/releases/releases.go b/service/internal/releases/releases.go index 0cedaa1f0b..3b9f9aa6f9 100644 --- a/service/internal/releases/releases.go +++ b/service/internal/releases/releases.go @@ -9,8 +9,8 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" - "github.com/giantswarm/aws-operator/v14/service/controller/key" - "github.com/giantswarm/aws-operator/v14/service/internal/releases/internal/cache" + "github.com/giantswarm/aws-operator/v15/service/controller/key" + "github.com/giantswarm/aws-operator/v15/service/internal/releases/internal/cache" ) type Config struct { diff --git a/service/internal/unittest/default_cluster.go b/service/internal/unittest/default_cluster.go index 8a7a8fb573..2179222160 100644 --- a/service/internal/unittest/default_cluster.go +++ b/service/internal/unittest/default_cluster.go @@ -7,7 +7,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" - "github.com/giantswarm/aws-operator/v14/pkg/label" + "github.com/giantswarm/aws-operator/v15/pkg/label" ) const ( diff --git a/service/internal/unittest/default_control_plane.go b/service/internal/unittest/default_control_plane.go index 486d3f51a8..f462e217b7 100644 --- a/service/internal/unittest/default_control_plane.go +++ b/service/internal/unittest/default_control_plane.go @@ -6,8 +6,8 @@ import ( infrastructurev1alpha3 "github.com/giantswarm/apiextensions/v6/pkg/apis/infrastructure/v1alpha3" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/pkg/label" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/pkg/label" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" ) func DefaultContextControlPlane() context.Context { diff --git a/service/internal/unittest/default_controller_context.go b/service/internal/unittest/default_controller_context.go index 8199ef26c2..b984ebce38 100644 --- a/service/internal/unittest/default_controller_context.go +++ b/service/internal/unittest/default_controller_context.go @@ -7,7 +7,7 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/ec2" - "github.com/giantswarm/aws-operator/v14/service/controller/controllercontext" + "github.com/giantswarm/aws-operator/v15/service/controller/controllercontext" ) func ChinaControllerContext() controllercontext.Context { diff --git a/service/internal/unittest/default_machine_deployment.go b/service/internal/unittest/default_machine_deployment.go index 7b05ee2fa1..bd44e563ce 100644 --- a/service/internal/unittest/default_machine_deployment.go +++ b/service/internal/unittest/default_machine_deployment.go @@ -6,8 +6,8 @@ import ( "github.com/giantswarm/to" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/aws-operator/v14/pkg/annotation" - "github.com/giantswarm/aws-operator/v14/pkg/label" + "github.com/giantswarm/aws-operator/v15/pkg/annotation" + "github.com/giantswarm/aws-operator/v15/pkg/label" ) const ( diff --git a/service/service.go b/service/service.go index 18fd12a286..88730c80b9 100644 --- a/service/service.go +++ b/service/service.go @@ -24,16 +24,16 @@ import ( "k8s.io/client-go/rest" apiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1" - "github.com/giantswarm/aws-operator/v14/client/aws" - "github.com/giantswarm/aws-operator/v14/flag" - "github.com/giantswarm/aws-operator/v14/pkg/project" - "github.com/giantswarm/aws-operator/v14/service/controller" - "github.com/giantswarm/aws-operator/v14/service/controller/resource/tccp" - "github.com/giantswarm/aws-operator/v14/service/internal/cloudtags" - "github.com/giantswarm/aws-operator/v14/service/internal/hamaster" - "github.com/giantswarm/aws-operator/v14/service/internal/images" - "github.com/giantswarm/aws-operator/v14/service/internal/locker" - "github.com/giantswarm/aws-operator/v14/service/internal/recorder" + "github.com/giantswarm/aws-operator/v15/client/aws" + "github.com/giantswarm/aws-operator/v15/flag" + "github.com/giantswarm/aws-operator/v15/pkg/project" + "github.com/giantswarm/aws-operator/v15/service/controller" + "github.com/giantswarm/aws-operator/v15/service/controller/resource/tccp" + "github.com/giantswarm/aws-operator/v15/service/internal/cloudtags" + "github.com/giantswarm/aws-operator/v15/service/internal/hamaster" + "github.com/giantswarm/aws-operator/v15/service/internal/images" + "github.com/giantswarm/aws-operator/v15/service/internal/locker" + "github.com/giantswarm/aws-operator/v15/service/internal/recorder" ) // Config represents the configuration used to create a new service.