From 49e271f24dae2fe9ab1161755983b6ba4e367a58 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 11 Jan 2023 15:38:05 +0100 Subject: [PATCH] Release v7.0.0 (#1695) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- CHANGELOG.md | 5 +- client/azure_client_set.go | 6 +- client/factory.go | 4 +- client/organization_factory.go | 4 +- client/senddecorator/metrics.go | 2 +- .../senddecorator/ratelimit_circuitbreaker.go | 4 +- flag/flag.go | 2 +- flag/service/azure/azure.go | 6 +- .../service/azure/hostcluster/host_cluster.go | 2 +- flag/service/azure/template/template.go | 2 +- flag/service/cluster/cluster.go | 8 +-- flag/service/cluster/docker/docker.go | 2 +- flag/service/cluster/kubernetes/kubernetes.go | 8 +-- flag/service/installation/guest/guest.go | 2 +- flag/service/installation/guest/ipam/ipam.go | 2 +- flag/service/installation/installation.go | 4 +- .../installation/tenant/kubernetes/api/api.go | 2 +- .../tenant/kubernetes/api/auth/auth.go | 2 +- .../kubernetes/api/auth/provider/provider.go | 2 +- .../tenant/kubernetes/kubernetes.go | 2 +- flag/service/installation/tenant/tenant.go | 2 +- flag/service/service.go | 14 ++-- flag/service/tenant/tenant.go | 4 +- go.mod | 2 +- integration/test/crmapping/crmapping_test.go | 6 +- main.go | 8 +-- pkg/azureconditions/deploymentchecker.go | 2 +- pkg/checksum/checksum_test.go | 6 +- pkg/credential/credential.go | 2 +- pkg/credential/credential_test.go | 6 +- pkg/handler/ipam/azure_config_checker.go | 2 +- pkg/handler/ipam/azure_config_persister.go | 2 +- .../azure_machinepool_network_range_getter.go | 4 +- .../ipam/azure_machinepool_subnet_checker.go | 2 +- .../azure_machinepool_subnet_collector.go | 6 +- .../azure_machinepool_subnet_persister.go | 2 +- .../ipam/azure_machinepool_subnet_releaser.go | 2 +- pkg/handler/ipam/create.go | 2 +- pkg/handler/ipam/create_test.go | 2 +- pkg/handler/ipam/delete.go | 2 +- pkg/handler/ipam/resource.go | 2 +- pkg/handler/ipam/virtualnetwork_collector.go | 8 +-- pkg/handler/nodes/draining.go | 2 +- pkg/handler/nodes/instances.go | 2 +- pkg/handler/nodes/resource.go | 12 ++-- pkg/handler/nodes/upgrade.go | 2 +- pkg/handler/release/create.go | 4 +- pkg/handler/release/create_test.go | 6 +- pkg/helpers/azuremachine.go | 2 +- pkg/helpers/vmss/templates.go | 4 +- pkg/locker/kubelock_locker.go | 2 +- pkg/project/project.go | 2 +- pkg/tenantcluster/cached.go | 2 +- pkg/tenantcluster/factory.go | 4 +- server/endpoint/endpoint.go | 2 +- server/server.go | 4 +- service/controller/azurecluster/controller.go | 32 +++++----- .../conditionvnetpeeringready.go | 2 +- .../handler/azureclusterconditions/create.go | 2 +- .../azureclusterconditions/resource.go | 2 +- .../handler/azureclusterconfig/create.go | 4 +- .../handler/azureclusterconfig/delete.go | 2 +- .../handler/azureclusteridentity/create.go | 4 +- .../handler/azureclusteridentity/resource.go | 2 +- .../handler/azureclusterupgrade/resource.go | 4 +- .../handler/azureconfig/create.go | 8 +-- .../handler/azureconfig/delete.go | 2 +- .../handler/azureconfig/equality.go | 2 +- .../handler/azureconfig/resource.go | 2 +- .../azurecluster/handler/subnet/resource.go | 8 +-- service/controller/azureconfig/controller.go | 64 +++++++++---------- .../handler/azureconfigfinalizer/resource.go | 2 +- .../azureconfig/handler/blobobject/create.go | 4 +- .../azureconfig/handler/blobobject/current.go | 6 +- .../azureconfig/handler/blobobject/desired.go | 6 +- .../azureconfig/handler/blobobject/mock.go | 4 +- .../handler/blobobject/resource.go | 6 +- .../azureconfig/handler/blobobject/update.go | 4 +- .../handler/blobobject/update_test.go | 4 +- .../azureconfig/handler/capzcrs/create.go | 4 +- .../handler/capzcrs/create_test.go | 2 +- .../azureconfig/handler/clusterid/resource.go | 4 +- .../handler/containerurl/create.go | 2 +- .../handler/containerurl/resource.go | 2 +- .../handler/deployment/deployment.go | 6 +- .../azureconfig/handler/deployment/natgw.go | 2 +- .../handler/deployment/resource.go | 10 +-- .../handler/deployment/serviceendpoints.go | 2 +- .../azureconfig/handler/dnsrecord/create.go | 2 +- .../azureconfig/handler/dnsrecord/current.go | 4 +- .../azureconfig/handler/dnsrecord/delete.go | 2 +- .../azureconfig/handler/dnsrecord/desired.go | 4 +- .../azureconfig/handler/dnsrecord/resource.go | 2 +- .../azureconfig/handler/dnsrecord/types.go | 2 +- .../handler/encryptionkey/create.go | 2 +- .../handler/encryptionkey/delete.go | 2 +- .../azureconfig/handler/endpoints/create.go | 2 +- .../azureconfig/handler/endpoints/current.go | 2 +- .../azureconfig/handler/endpoints/delete.go | 2 +- .../azureconfig/handler/endpoints/desired.go | 4 +- .../azureconfig/handler/endpoints/nic.go | 2 +- .../azureconfig/handler/endpoints/update.go | 2 +- .../azureconfig/handler/masters/create.go | 4 +- ...reate_cluster_upgrade_requirement_check.go | 6 +- .../masters/create_deployment_completed.go | 10 +-- .../masters/create_deployment_initialized.go | 4 +- .../create_deployment_uninitialized.go | 10 +-- .../handler/masters/create_empty.go | 2 +- .../create_master_instances_upgrading.go | 10 +-- .../masters/create_provisioning_successful.go | 2 +- .../azureconfig/handler/masters/delete.go | 2 +- .../azureconfig/handler/masters/deployment.go | 14 ++-- .../azureconfig/handler/masters/instances.go | 2 +- .../azureconfig/handler/masters/resource.go | 6 +- .../azureconfig/handler/namespace/current.go | 2 +- .../azureconfig/handler/namespace/desired.go | 2 +- .../handler/namespace/desired_test.go | 4 +- .../handler/resourcegroup/resource.go | 10 +-- .../azureconfig/handler/service/create.go | 2 +- .../azureconfig/handler/service/current.go | 2 +- .../azureconfig/handler/service/delete.go | 2 +- .../azureconfig/handler/service/desired.go | 2 +- .../handler/service/desired_test.go | 2 +- .../handler/service/resource_test.go | 2 +- .../handler/storageclassmigrator/resource.go | 4 +- .../azureconfig/handler/vnetpeering/create.go | 2 +- .../azureconfig/handler/vnetpeering/delete.go | 2 +- .../handler/vnetpeering/resource.go | 2 +- .../handler/workermigration/create.go | 4 +- .../handler/workermigration/create_test.go | 10 +-- .../workermigration/internal/azure/api.go | 2 +- .../internal/mock_azure/api.go | 2 +- .../handler/workermigration/resource.go | 6 +- .../workermigration/security_groups.go | 4 +- service/controller/azuremachine/controller.go | 14 ++-- .../conditionsubnetready.go | 4 +- .../conditionvmssready.go | 2 +- .../handler/azuremachineconditions/create.go | 2 +- .../azuremachineconditions/resource.go | 4 +- .../handler/azuremachinemetadata/create.go | 4 +- .../controller/azuremachinepool/controller.go | 36 +++++------ .../conditionsubnetready.go | 4 +- .../conditionvmssready.go | 2 +- .../azuremachinepoolconditions/create.go | 2 +- .../azuremachinepoolconditions/resource.go | 4 +- .../handler/cloudconfigblob/create.go | 4 +- .../handler/cloudconfigblob/delete.go | 4 +- .../handler/cloudconfigblob/resource.go | 2 +- .../migration/azuremachinepool_test.go | 2 +- .../handler/migration/resource.go | 4 +- .../handler/nodepool/cluster_autoscaler.go | 2 +- .../handler/nodepool/cordon_old_workers.go | 8 +-- .../handler/nodepool/create.go | 8 +-- .../create_deployment_uninitialized.go | 6 +- .../handler/nodepool/create_scale_workers.go | 14 ++-- .../nodepool/create_terminate_old_workers.go | 4 +- .../create_wait_for_nodes_to_become_ready.go | 6 +- .../handler/nodepool/delete.go | 4 +- .../handler/nodepool/deployment.go | 18 +++--- .../handler/nodepool/drain_old_workers.go | 8 +-- .../handler/nodepool/resource.go | 8 +-- .../handler/nodepool/status.go | 2 +- .../azuremachinepool/handler/spark/create.go | 10 +-- .../azuremachinepool/handler/spark/delete.go | 2 +- .../handler/spark/delete_test.go | 2 +- .../handler/spark/resource.go | 12 ++-- .../controller/cloudconfig/base_extension.go | 6 +- .../controller/cloudconfig/cloud_config.go | 2 +- service/controller/cloudconfig/interface.go | 2 +- .../controller/cloudconfig/master_template.go | 6 +- .../controller/cloudconfig/worker_template.go | 8 +-- service/controller/cluster/controller.go | 16 ++--- .../handler/clusterdependents/resource.go | 2 +- .../clusterownerreference/controlplane.go | 2 +- .../handler/clusterownerreference/resource.go | 2 +- .../clusterownerreference/resource_test.go | 4 +- .../checkupgradeprogress.go | 4 +- .../handler/clusterreleaseversion/create.go | 4 +- .../cluster/handler/clusterupgrade/create.go | 8 +-- .../handler/clusterupgrade/resource.go | 2 +- .../controller/controllercontext/context.go | 4 +- service/controller/debugger/debugger.go | 2 +- service/controller/internal/vmsku/vmsku.go | 2 +- service/controller/key/common.go | 4 +- service/controller/key/key.go | 8 +-- service/controller/key/key_test.go | 2 +- service/controller/machinepool/controller.go | 16 ++--- .../handler/machinepooldependents/resource.go | 2 +- .../machinepoolownerreference/resource.go | 2 +- .../resource_test.go | 2 +- .../lastdeployedreleaseversion.go | 4 +- .../handler/machinepoolupgrade/resource.go | 4 +- .../handler/migration/machinepool_test.go | 2 +- .../machinepool/handler/migration/resource.go | 4 +- .../machinepool/handler/nodestatus/create.go | 4 +- .../handler/nodestatus/create_test.go | 4 +- .../handler/nodestatus/resource.go | 2 +- .../controller/machinepoolexp/controller.go | 6 +- .../handler/migration/azuremachinepool.go | 2 +- .../handler/migration/machinepool.go | 2 +- .../handler/migration/resource.go | 2 +- .../controller/templates/templates_test.go | 2 +- .../controller/unhealthynode/controller.go | 12 ++-- .../handler/terminateunhealthynode/create.go | 2 +- .../terminateunhealthynode/resource.go | 2 +- service/service.go | 34 +++++----- 206 files changed, 502 insertions(+), 499 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6f71c6f038..78f3813683 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [7.0.0] - 2023-01-11 + ### Changed - Bump k8scc to support k8s 1.24. @@ -628,7 +630,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 -[Unreleased]: https://github.com/giantswarm/azure-operator/compare/v6.0.3...HEAD +[Unreleased]: https://github.com/giantswarm/azure-operator/compare/v7.0.0...HEAD +[7.0.0]: https://github.com/giantswarm/azure-operator/compare/v6.0.3...v7.0.0 [6.0.3]: https://github.com/giantswarm/azure-operator/compare/v6.0.2...v6.0.3 [6.0.2]: https://github.com/giantswarm/azure-operator/compare/v6.0.1...v6.0.2 [6.0.1]: https://github.com/giantswarm/azure-operator/compare/v6.0.0...v6.0.1 diff --git a/client/azure_client_set.go b/client/azure_client_set.go index 23a8d58276..0711e30246 100644 --- a/client/azure_client_set.go +++ b/client/azure_client_set.go @@ -13,9 +13,9 @@ import ( "github.com/Azure/go-autorest/autorest/azure/auth" "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/client/senddecorator" - "github.com/giantswarm/azure-operator/v6/pkg/backpressure" - "github.com/giantswarm/azure-operator/v6/service/collector" + "github.com/giantswarm/azure-operator/v7/client/senddecorator" + "github.com/giantswarm/azure-operator/v7/pkg/backpressure" + "github.com/giantswarm/azure-operator/v7/service/collector" ) const ( diff --git a/client/factory.go b/client/factory.go index 0d46f601d3..90d022bb5b 100644 --- a/client/factory.go +++ b/client/factory.go @@ -18,8 +18,8 @@ import ( "github.com/giantswarm/micrologger" gocache "github.com/patrickmn/go-cache" - "github.com/giantswarm/azure-operator/v6/pkg/credential" - "github.com/giantswarm/azure-operator/v6/service/collector" + "github.com/giantswarm/azure-operator/v7/pkg/credential" + "github.com/giantswarm/azure-operator/v7/service/collector" ) const ( diff --git a/client/organization_factory.go b/client/organization_factory.go index ff617976fc..634f5c0533 100644 --- a/client/organization_factory.go +++ b/client/organization_factory.go @@ -17,8 +17,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/client/senddecorator/metrics.go b/client/senddecorator/metrics.go index 60e2b7d595..9c17d487d1 100644 --- a/client/senddecorator/metrics.go +++ b/client/senddecorator/metrics.go @@ -8,7 +8,7 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/prometheus/client_golang/prometheus" - "github.com/giantswarm/azure-operator/v6/service/collector" + "github.com/giantswarm/azure-operator/v7/service/collector" ) const metricsNamespace = "azure_operator_azure_api" diff --git a/client/senddecorator/ratelimit_circuitbreaker.go b/client/senddecorator/ratelimit_circuitbreaker.go index 009cfe82a5..3083ed84ec 100644 --- a/client/senddecorator/ratelimit_circuitbreaker.go +++ b/client/senddecorator/ratelimit_circuitbreaker.go @@ -7,8 +7,8 @@ import ( "github.com/Azure/go-autorest/autorest" "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/pkg/backpressure" - "github.com/giantswarm/azure-operator/v6/pkg/httputil" + "github.com/giantswarm/azure-operator/v7/pkg/backpressure" + "github.com/giantswarm/azure-operator/v7/pkg/httputil" ) const ( diff --git a/flag/flag.go b/flag/flag.go index aa5fd372fc..59674e4221 100644 --- a/flag/flag.go +++ b/flag/flag.go @@ -3,7 +3,7 @@ package flag import ( "github.com/giantswarm/microkit/flag" - "github.com/giantswarm/azure-operator/v6/flag/service" + "github.com/giantswarm/azure-operator/v7/flag/service" ) type Flag struct { diff --git a/flag/service/azure/azure.go b/flag/service/azure/azure.go index c7d5222e15..e60e6704d4 100644 --- a/flag/service/azure/azure.go +++ b/flag/service/azure/azure.go @@ -1,9 +1,9 @@ package azure import ( - "github.com/giantswarm/azure-operator/v6/flag/service/azure/hostcluster" - "github.com/giantswarm/azure-operator/v6/flag/service/azure/msi" - "github.com/giantswarm/azure-operator/v6/flag/service/azure/template" + "github.com/giantswarm/azure-operator/v7/flag/service/azure/hostcluster" + "github.com/giantswarm/azure-operator/v7/flag/service/azure/msi" + "github.com/giantswarm/azure-operator/v7/flag/service/azure/template" ) type Azure struct { diff --git a/flag/service/azure/hostcluster/host_cluster.go b/flag/service/azure/hostcluster/host_cluster.go index 4e4c5627c8..e482a1feb9 100644 --- a/flag/service/azure/hostcluster/host_cluster.go +++ b/flag/service/azure/hostcluster/host_cluster.go @@ -1,7 +1,7 @@ package hostcluster import ( - "github.com/giantswarm/azure-operator/v6/flag/service/azure/hostcluster/tenant" + "github.com/giantswarm/azure-operator/v7/flag/service/azure/hostcluster/tenant" ) type HostCluster struct { diff --git a/flag/service/azure/template/template.go b/flag/service/azure/template/template.go index 518ddd5e4b..8694dc5c33 100644 --- a/flag/service/azure/template/template.go +++ b/flag/service/azure/template/template.go @@ -1,7 +1,7 @@ package template import ( - "github.com/giantswarm/azure-operator/v6/flag/service/azure/template/uri" + "github.com/giantswarm/azure-operator/v7/flag/service/azure/template/uri" ) type Template struct { diff --git a/flag/service/cluster/cluster.go b/flag/service/cluster/cluster.go index d7b3559ae2..7a819bbe39 100644 --- a/flag/service/cluster/cluster.go +++ b/flag/service/cluster/cluster.go @@ -1,10 +1,10 @@ package cluster import ( - "github.com/giantswarm/azure-operator/v6/flag/service/cluster/calico" - "github.com/giantswarm/azure-operator/v6/flag/service/cluster/docker" - "github.com/giantswarm/azure-operator/v6/flag/service/cluster/etcd" - "github.com/giantswarm/azure-operator/v6/flag/service/cluster/kubernetes" + "github.com/giantswarm/azure-operator/v7/flag/service/cluster/calico" + "github.com/giantswarm/azure-operator/v7/flag/service/cluster/docker" + "github.com/giantswarm/azure-operator/v7/flag/service/cluster/etcd" + "github.com/giantswarm/azure-operator/v7/flag/service/cluster/kubernetes" ) type Cluster struct { diff --git a/flag/service/cluster/docker/docker.go b/flag/service/cluster/docker/docker.go index 670c2274cf..c6eb749299 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/azure-operator/v6/flag/service/cluster/docker/daemon" + "github.com/giantswarm/azure-operator/v7/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 4f0e8d3ad3..c668c66ca1 100644 --- a/flag/service/cluster/kubernetes/kubernetes.go +++ b/flag/service/cluster/kubernetes/kubernetes.go @@ -1,10 +1,10 @@ package kubernetes import ( - "github.com/giantswarm/azure-operator/v6/flag/service/cluster/kubernetes/api" - "github.com/giantswarm/azure-operator/v6/flag/service/cluster/kubernetes/ingress" - "github.com/giantswarm/azure-operator/v6/flag/service/cluster/kubernetes/kubelet" - "github.com/giantswarm/azure-operator/v6/flag/service/cluster/kubernetes/ssh" + "github.com/giantswarm/azure-operator/v7/flag/service/cluster/kubernetes/api" + "github.com/giantswarm/azure-operator/v7/flag/service/cluster/kubernetes/ingress" + "github.com/giantswarm/azure-operator/v7/flag/service/cluster/kubernetes/kubelet" + "github.com/giantswarm/azure-operator/v7/flag/service/cluster/kubernetes/ssh" ) type Kubernetes struct { diff --git a/flag/service/installation/guest/guest.go b/flag/service/installation/guest/guest.go index d1c381b82a..4bc2ed73d8 100644 --- a/flag/service/installation/guest/guest.go +++ b/flag/service/installation/guest/guest.go @@ -1,7 +1,7 @@ package guest import ( - "github.com/giantswarm/azure-operator/v6/flag/service/installation/guest/ipam" + "github.com/giantswarm/azure-operator/v7/flag/service/installation/guest/ipam" ) type Guest struct { diff --git a/flag/service/installation/guest/ipam/ipam.go b/flag/service/installation/guest/ipam/ipam.go index be1e5a22a6..d7ff0ed09c 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/azure-operator/v6/flag/service/installation/guest/ipam/network" +import "github.com/giantswarm/azure-operator/v7/flag/service/installation/guest/ipam/network" type IPAM struct { Network network.Network diff --git a/flag/service/installation/installation.go b/flag/service/installation/installation.go index 1114702a26..c55e005657 100644 --- a/flag/service/installation/installation.go +++ b/flag/service/installation/installation.go @@ -1,8 +1,8 @@ package installation import ( - "github.com/giantswarm/azure-operator/v6/flag/service/installation/guest" - "github.com/giantswarm/azure-operator/v6/flag/service/installation/tenant" + "github.com/giantswarm/azure-operator/v7/flag/service/installation/guest" + "github.com/giantswarm/azure-operator/v7/flag/service/installation/tenant" ) type Installation struct { diff --git a/flag/service/installation/tenant/kubernetes/api/api.go b/flag/service/installation/tenant/kubernetes/api/api.go index e155d5e306..5b5f9928ae 100644 --- a/flag/service/installation/tenant/kubernetes/api/api.go +++ b/flag/service/installation/tenant/kubernetes/api/api.go @@ -1,7 +1,7 @@ package api import ( - "github.com/giantswarm/azure-operator/v6/flag/service/installation/tenant/kubernetes/api/auth" + "github.com/giantswarm/azure-operator/v7/flag/service/installation/tenant/kubernetes/api/auth" ) type API struct { diff --git a/flag/service/installation/tenant/kubernetes/api/auth/auth.go b/flag/service/installation/tenant/kubernetes/api/auth/auth.go index a6768b9192..4383e0e4fc 100644 --- a/flag/service/installation/tenant/kubernetes/api/auth/auth.go +++ b/flag/service/installation/tenant/kubernetes/api/auth/auth.go @@ -1,7 +1,7 @@ package auth import ( - "github.com/giantswarm/azure-operator/v6/flag/service/installation/tenant/kubernetes/api/auth/provider" + "github.com/giantswarm/azure-operator/v7/flag/service/installation/tenant/kubernetes/api/auth/provider" ) type Auth struct { diff --git a/flag/service/installation/tenant/kubernetes/api/auth/provider/provider.go b/flag/service/installation/tenant/kubernetes/api/auth/provider/provider.go index 2c0ed5028e..b31ff2dbae 100644 --- a/flag/service/installation/tenant/kubernetes/api/auth/provider/provider.go +++ b/flag/service/installation/tenant/kubernetes/api/auth/provider/provider.go @@ -1,7 +1,7 @@ package provider import ( - "github.com/giantswarm/azure-operator/v6/flag/service/installation/tenant/kubernetes/api/auth/provider/oidc" + "github.com/giantswarm/azure-operator/v7/flag/service/installation/tenant/kubernetes/api/auth/provider/oidc" ) type Provider struct { diff --git a/flag/service/installation/tenant/kubernetes/kubernetes.go b/flag/service/installation/tenant/kubernetes/kubernetes.go index 3f2959b69e..fc788dc9a4 100644 --- a/flag/service/installation/tenant/kubernetes/kubernetes.go +++ b/flag/service/installation/tenant/kubernetes/kubernetes.go @@ -1,7 +1,7 @@ package kubernetes import ( - "github.com/giantswarm/azure-operator/v6/flag/service/installation/tenant/kubernetes/api" + "github.com/giantswarm/azure-operator/v7/flag/service/installation/tenant/kubernetes/api" ) type Kubernetes struct { diff --git a/flag/service/installation/tenant/tenant.go b/flag/service/installation/tenant/tenant.go index aefab56712..f2aa1221c3 100644 --- a/flag/service/installation/tenant/tenant.go +++ b/flag/service/installation/tenant/tenant.go @@ -1,7 +1,7 @@ package tenant import ( - "github.com/giantswarm/azure-operator/v6/flag/service/installation/tenant/kubernetes" + "github.com/giantswarm/azure-operator/v7/flag/service/installation/tenant/kubernetes" ) type Tenant struct { diff --git a/flag/service/service.go b/flag/service/service.go index 92d0d2ffae..8302c3904b 100644 --- a/flag/service/service.go +++ b/flag/service/service.go @@ -3,13 +3,13 @@ package service import ( "github.com/giantswarm/operatorkit/v7/pkg/flag/service/kubernetes" - "github.com/giantswarm/azure-operator/v6/flag/service/azure" - "github.com/giantswarm/azure-operator/v6/flag/service/cluster" - "github.com/giantswarm/azure-operator/v6/flag/service/debug" - "github.com/giantswarm/azure-operator/v6/flag/service/installation" - "github.com/giantswarm/azure-operator/v6/flag/service/registry" - "github.com/giantswarm/azure-operator/v6/flag/service/sentry" - "github.com/giantswarm/azure-operator/v6/flag/service/tenant" + "github.com/giantswarm/azure-operator/v7/flag/service/azure" + "github.com/giantswarm/azure-operator/v7/flag/service/cluster" + "github.com/giantswarm/azure-operator/v7/flag/service/debug" + "github.com/giantswarm/azure-operator/v7/flag/service/installation" + "github.com/giantswarm/azure-operator/v7/flag/service/registry" + "github.com/giantswarm/azure-operator/v7/flag/service/sentry" + "github.com/giantswarm/azure-operator/v7/flag/service/tenant" ) type Service struct { diff --git a/flag/service/tenant/tenant.go b/flag/service/tenant/tenant.go index 9f77b320c8..117a1be4ab 100644 --- a/flag/service/tenant/tenant.go +++ b/flag/service/tenant/tenant.go @@ -1,8 +1,8 @@ package tenant import ( - "github.com/giantswarm/azure-operator/v6/flag/service/tenant/ignition" - "github.com/giantswarm/azure-operator/v6/flag/service/tenant/ssh" + "github.com/giantswarm/azure-operator/v7/flag/service/tenant/ignition" + "github.com/giantswarm/azure-operator/v7/flag/service/tenant/ssh" ) type Tenant struct { diff --git a/go.mod b/go.mod index aaf7f0180b..a9f07e525d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/giantswarm/azure-operator/v6 +module github.com/giantswarm/azure-operator/v7 go 1.18 diff --git a/integration/test/crmapping/crmapping_test.go b/integration/test/crmapping/crmapping_test.go index ea34f11973..3c4b2905cf 100644 --- a/integration/test/crmapping/crmapping_test.go +++ b/integration/test/crmapping/crmapping_test.go @@ -26,9 +26,9 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" // nolint:staticcheck "sigs.k8s.io/yaml" - client2 "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/service/controller/azurecluster/handler/azureconfig" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/capzcrs" + client2 "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/service/controller/azurecluster/handler/azureconfig" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/capzcrs" ) var update = flag.Bool("update", false, "update .golden reference files") diff --git a/main.go b/main.go index 03c6da2242..95444b307a 100644 --- a/main.go +++ b/main.go @@ -13,10 +13,10 @@ import ( "github.com/giantswarm/versionbundle" "github.com/spf13/viper" - "github.com/giantswarm/azure-operator/v6/flag" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/server" - "github.com/giantswarm/azure-operator/v6/service" + "github.com/giantswarm/azure-operator/v7/flag" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/server" + "github.com/giantswarm/azure-operator/v7/service" ) var ( diff --git a/pkg/azureconditions/deploymentchecker.go b/pkg/azureconditions/deploymentchecker.go index eae3d237c1..932a0f7424 100644 --- a/pkg/azureconditions/deploymentchecker.go +++ b/pkg/azureconditions/deploymentchecker.go @@ -10,7 +10,7 @@ import ( capiconditions "sigs.k8s.io/cluster-api/util/conditions" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/pkg/checksum/checksum_test.go b/pkg/checksum/checksum_test.go index fccb59a4b4..b644776c02 100644 --- a/pkg/checksum/checksum_test.go +++ b/pkg/checksum/checksum_test.go @@ -9,9 +9,9 @@ import ( "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-05-01/resources" "github.com/Azure/go-autorest/autorest/to" - "github.com/giantswarm/azure-operator/v6/pkg/helpers/vmss" - "github.com/giantswarm/azure-operator/v6/service/controller/key" - "github.com/giantswarm/azure-operator/v6/service/controller/templates" + "github.com/giantswarm/azure-operator/v7/pkg/helpers/vmss" + "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/templates" ) func Test_getDeploymentTemplateChecksum(t *testing.T) { diff --git a/pkg/credential/credential.go b/pkg/credential/credential.go index e841988abc..16efb58ded 100644 --- a/pkg/credential/credential.go +++ b/pkg/credential/credential.go @@ -10,7 +10,7 @@ import ( v1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/label" ) const ( diff --git a/pkg/credential/credential_test.go b/pkg/credential/credential_test.go index 116e43d12b..a0164e5d51 100644 --- a/pkg/credential/credential_test.go +++ b/pkg/credential/credential_test.go @@ -12,9 +12,9 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/service/controller/key" - "github.com/giantswarm/azure-operator/v6/service/unittest" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/unittest" ) const ( diff --git a/pkg/handler/ipam/azure_config_checker.go b/pkg/handler/ipam/azure_config_checker.go index 3794a7450e..ee06d95d32 100644 --- a/pkg/handler/ipam/azure_config_checker.go +++ b/pkg/handler/ipam/azure_config_checker.go @@ -9,7 +9,7 @@ import ( "github.com/giantswarm/micrologger" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) type AzureConfigCheckerConfig struct { diff --git a/pkg/handler/ipam/azure_config_persister.go b/pkg/handler/ipam/azure_config_persister.go index c58a99b72c..d5da209dfc 100644 --- a/pkg/handler/ipam/azure_config_persister.go +++ b/pkg/handler/ipam/azure_config_persister.go @@ -9,7 +9,7 @@ import ( "github.com/giantswarm/micrologger" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/network" + "github.com/giantswarm/azure-operator/v7/service/network" ) type AzureConfigPersisterConfig struct { diff --git a/pkg/handler/ipam/azure_machinepool_network_range_getter.go b/pkg/handler/ipam/azure_machinepool_network_range_getter.go index 919cdc7695..28c6612361 100644 --- a/pkg/handler/ipam/azure_machinepool_network_range_getter.go +++ b/pkg/handler/ipam/azure_machinepool_network_range_getter.go @@ -9,8 +9,8 @@ import ( "github.com/giantswarm/micrologger" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/helpers" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/helpers" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) var nodePoolIPMask = net.CIDRMask(24, 32) diff --git a/pkg/handler/ipam/azure_machinepool_subnet_checker.go b/pkg/handler/ipam/azure_machinepool_subnet_checker.go index 1c4db6d5f7..43ca191556 100644 --- a/pkg/handler/ipam/azure_machinepool_subnet_checker.go +++ b/pkg/handler/ipam/azure_machinepool_subnet_checker.go @@ -10,7 +10,7 @@ import ( capzexp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/helpers" + "github.com/giantswarm/azure-operator/v7/pkg/helpers" ) type AzureMachinePoolSubnetCheckerConfig struct { diff --git a/pkg/handler/ipam/azure_machinepool_subnet_collector.go b/pkg/handler/ipam/azure_machinepool_subnet_collector.go index 3d4778d0dd..b1c0291485 100644 --- a/pkg/handler/ipam/azure_machinepool_subnet_collector.go +++ b/pkg/handler/ipam/azure_machinepool_subnet_collector.go @@ -13,9 +13,9 @@ import ( capz "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" ctrl "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/pkg/helpers" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/pkg/helpers" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) type AzureMachinePoolSubnetCollectorConfig struct { diff --git a/pkg/handler/ipam/azure_machinepool_subnet_persister.go b/pkg/handler/ipam/azure_machinepool_subnet_persister.go index 1fbdb341a1..dacf12e910 100644 --- a/pkg/handler/ipam/azure_machinepool_subnet_persister.go +++ b/pkg/handler/ipam/azure_machinepool_subnet_persister.go @@ -10,7 +10,7 @@ import ( capzexp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/helpers" + "github.com/giantswarm/azure-operator/v7/pkg/helpers" ) type AzureMachinePoolSubnetPersisterConfig struct { diff --git a/pkg/handler/ipam/azure_machinepool_subnet_releaser.go b/pkg/handler/ipam/azure_machinepool_subnet_releaser.go index f235a0b758..25bb47e918 100644 --- a/pkg/handler/ipam/azure_machinepool_subnet_releaser.go +++ b/pkg/handler/ipam/azure_machinepool_subnet_releaser.go @@ -10,7 +10,7 @@ import ( capzexp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/helpers" + "github.com/giantswarm/azure-operator/v7/pkg/helpers" ) type AzureMachinePoolSubnetReleaserConfig struct { diff --git a/pkg/handler/ipam/create.go b/pkg/handler/ipam/create.go index a1f16e1a80..03013dcf15 100644 --- a/pkg/handler/ipam/create.go +++ b/pkg/handler/ipam/create.go @@ -9,7 +9,7 @@ import ( "github.com/giantswarm/microerror" "k8s.io/apimachinery/pkg/api/meta" - "github.com/giantswarm/azure-operator/v6/pkg/locker" + "github.com/giantswarm/azure-operator/v7/pkg/locker" ) // EnsureCreated allocates tenant cluster network segments. It gathers existing diff --git a/pkg/handler/ipam/create_test.go b/pkg/handler/ipam/create_test.go index bca4919cd2..e01b78ff03 100644 --- a/pkg/handler/ipam/create_test.go +++ b/pkg/handler/ipam/create_test.go @@ -9,7 +9,7 @@ import ( "github.com/giantswarm/micrologger/microloggertest" capzexp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" - "github.com/giantswarm/azure-operator/v6/pkg/locker" + "github.com/giantswarm/azure-operator/v7/pkg/locker" ) func Test_SubnetAllocator(t *testing.T) { diff --git a/pkg/handler/ipam/delete.go b/pkg/handler/ipam/delete.go index f5e3d0fe88..784468de11 100644 --- a/pkg/handler/ipam/delete.go +++ b/pkg/handler/ipam/delete.go @@ -7,7 +7,7 @@ import ( "github.com/giantswarm/microerror" "k8s.io/apimachinery/pkg/api/meta" - "github.com/giantswarm/azure-operator/v6/pkg/locker" + "github.com/giantswarm/azure-operator/v7/pkg/locker" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/pkg/handler/ipam/resource.go b/pkg/handler/ipam/resource.go index d459624c4f..3ccf519c86 100644 --- a/pkg/handler/ipam/resource.go +++ b/pkg/handler/ipam/resource.go @@ -4,7 +4,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/azure-operator/v6/pkg/locker" + "github.com/giantswarm/azure-operator/v7/pkg/locker" ) const ( diff --git a/pkg/handler/ipam/virtualnetwork_collector.go b/pkg/handler/ipam/virtualnetwork_collector.go index 7c365f12ae..a965156581 100644 --- a/pkg/handler/ipam/virtualnetwork_collector.go +++ b/pkg/handler/ipam/virtualnetwork_collector.go @@ -16,10 +16,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" client2 "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/pkg/credential" - "github.com/giantswarm/azure-operator/v6/service/collector" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/pkg/credential" + "github.com/giantswarm/azure-operator/v7/service/collector" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) type VirtualNetworkCollectorConfig struct { diff --git a/pkg/handler/nodes/draining.go b/pkg/handler/nodes/draining.go index 80464f52e0..17fce49717 100644 --- a/pkg/handler/nodes/draining.go +++ b/pkg/handler/nodes/draining.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/azure-operator/v6/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/label" ) func (r *Resource) CreateDrainerConfig(ctx context.Context, clusterID, clusterAPIEndpoint string, nodeName string) error { diff --git a/pkg/handler/nodes/instances.go b/pkg/handler/nodes/instances.go index 91cdc2dc4d..37b875ab57 100644 --- a/pkg/handler/nodes/instances.go +++ b/pkg/handler/nodes/instances.go @@ -8,7 +8,7 @@ import ( "github.com/giantswarm/microerror" capzexp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) GetVMSSInstances(ctx context.Context, azureMachinePool capzexp.AzureMachinePool) ([]compute.VirtualMachineScaleSetVM, error) { diff --git a/pkg/handler/nodes/resource.go b/pkg/handler/nodes/resource.go index 41c5c04114..6d219e3fa2 100644 --- a/pkg/handler/nodes/resource.go +++ b/pkg/handler/nodes/resource.go @@ -8,12 +8,12 @@ import ( v1 "k8s.io/api/core/v1" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v6/service/controller/debugger" - "github.com/giantswarm/azure-operator/v6/service/controller/encrypter" - "github.com/giantswarm/azure-operator/v6/service/controller/key" - "github.com/giantswarm/azure-operator/v6/service/controller/setting" + "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v7/service/controller/debugger" + "github.com/giantswarm/azure-operator/v7/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/setting" ) type Config struct { diff --git a/pkg/handler/nodes/upgrade.go b/pkg/handler/nodes/upgrade.go index 1975daa0a2..c1f19500ab 100644 --- a/pkg/handler/nodes/upgrade.go +++ b/pkg/handler/nodes/upgrade.go @@ -8,7 +8,7 @@ import ( corev1 "k8s.io/api/core/v1" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) // AnyOutOfDate iterates over all nodes in tenant cluster and finds diff --git a/pkg/handler/release/create.go b/pkg/handler/release/create.go index 51a35e0048..9fd4d59104 100644 --- a/pkg/handler/release/create.go +++ b/pkg/handler/release/create.go @@ -11,8 +11,8 @@ import ( "k8s.io/apimachinery/pkg/api/meta" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/pkg/handler/release/create_test.go b/pkg/handler/release/create_test.go index 35a04af004..2cca995494 100644 --- a/pkg/handler/release/create_test.go +++ b/pkg/handler/release/create_test.go @@ -11,9 +11,9 @@ import ( releasev1alpha1 "github.com/giantswarm/release-operator/v3/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/service/controller/controllercontext" - "github.com/giantswarm/azure-operator/v6/service/unittest" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v7/service/unittest" ) func Test_Resource_Puts_Release_In_Context_When_Release_Has_Leading_V(t *testing.T) { diff --git a/pkg/helpers/azuremachine.go b/pkg/helpers/azuremachine.go index d88eb9ec22..c4ca2ec817 100644 --- a/pkg/helpers/azuremachine.go +++ b/pkg/helpers/azuremachine.go @@ -10,7 +10,7 @@ import ( "sigs.k8s.io/cluster-api/util" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func InitAzureMachineAnnotations(ctx context.Context, ctrlClient client.Client, logger micrologger.Logger, azureMachine *capz.AzureMachine) error { diff --git a/pkg/helpers/vmss/templates.go b/pkg/helpers/vmss/templates.go index feb861700b..ce701fb33b 100644 --- a/pkg/helpers/vmss/templates.go +++ b/pkg/helpers/vmss/templates.go @@ -6,8 +6,8 @@ import ( providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/service/controller/key" - "github.com/giantswarm/azure-operator/v6/service/controller/templates" + "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/templates" ) func RenderCloudConfig(blobURL string, encryptionKey string, initialVector string, instanceRole string) (string, error) { diff --git a/pkg/locker/kubelock_locker.go b/pkg/locker/kubelock_locker.go index d970e9334a..0919b2ecb0 100644 --- a/pkg/locker/kubelock_locker.go +++ b/pkg/locker/kubelock_locker.go @@ -11,7 +11,7 @@ import ( "k8s.io/client-go/dynamic" "k8s.io/client-go/rest" - "github.com/giantswarm/azure-operator/v6/pkg/project" + "github.com/giantswarm/azure-operator/v7/pkg/project" ) const ( diff --git a/pkg/project/project.go b/pkg/project/project.go index 7889caca3a..9586e6cc67 100644 --- a/pkg/project/project.go +++ b/pkg/project/project.go @@ -5,7 +5,7 @@ var ( gitSHA = "n/a" name string = "azure-operator" source string = "https://github.com/giantswarm/azure-operator" - version = "6.0.4-dev" + version = "7.0.0" ) func Description() string { diff --git a/pkg/tenantcluster/cached.go b/pkg/tenantcluster/cached.go index 9a0b672eef..02a09f947e 100644 --- a/pkg/tenantcluster/cached.go +++ b/pkg/tenantcluster/cached.go @@ -12,7 +12,7 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/pkg/tenantcluster/factory.go b/pkg/tenantcluster/factory.go index eca723565c..3c521f5d69 100644 --- a/pkg/tenantcluster/factory.go +++ b/pkg/tenantcluster/factory.go @@ -14,8 +14,8 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) type tenantClientFactory struct { diff --git a/server/endpoint/endpoint.go b/server/endpoint/endpoint.go index 2ee828de8f..e680713060 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/azure-operator/v6/service" + "github.com/giantswarm/azure-operator/v7/service" ) type Config struct { diff --git a/server/server.go b/server/server.go index 002761a95a..86ec72922a 100644 --- a/server/server.go +++ b/server/server.go @@ -12,8 +12,8 @@ import ( "github.com/giantswarm/micrologger" "github.com/spf13/viper" - "github.com/giantswarm/azure-operator/v6/server/endpoint" - "github.com/giantswarm/azure-operator/v6/service" + "github.com/giantswarm/azure-operator/v7/server/endpoint" + "github.com/giantswarm/azure-operator/v7/service" ) type Config struct { diff --git a/service/controller/azurecluster/controller.go b/service/controller/azurecluster/controller.go index 85cbc2d5f3..340645898e 100644 --- a/service/controller/azurecluster/controller.go +++ b/service/controller/azurecluster/controller.go @@ -17,22 +17,22 @@ import ( capz "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/flag" - "github.com/giantswarm/azure-operator/v6/pkg/credential" - "github.com/giantswarm/azure-operator/v6/pkg/handler/release" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/service/collector" - "github.com/giantswarm/azure-operator/v6/service/controller/azurecluster/handler/azureclusterconditions" - "github.com/giantswarm/azure-operator/v6/service/controller/azurecluster/handler/azureclusterconfig" - "github.com/giantswarm/azure-operator/v6/service/controller/azurecluster/handler/azureclusteridentity" - "github.com/giantswarm/azure-operator/v6/service/controller/azurecluster/handler/azureclusterupgrade" - "github.com/giantswarm/azure-operator/v6/service/controller/azurecluster/handler/azureconfig" - "github.com/giantswarm/azure-operator/v6/service/controller/azurecluster/handler/subnet" - "github.com/giantswarm/azure-operator/v6/service/controller/controllercontext" - "github.com/giantswarm/azure-operator/v6/service/controller/debugger" - "github.com/giantswarm/azure-operator/v6/service/controller/setting" + "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/flag" + "github.com/giantswarm/azure-operator/v7/pkg/credential" + "github.com/giantswarm/azure-operator/v7/pkg/handler/release" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/service/collector" + "github.com/giantswarm/azure-operator/v7/service/controller/azurecluster/handler/azureclusterconditions" + "github.com/giantswarm/azure-operator/v7/service/controller/azurecluster/handler/azureclusterconfig" + "github.com/giantswarm/azure-operator/v7/service/controller/azurecluster/handler/azureclusteridentity" + "github.com/giantswarm/azure-operator/v7/service/controller/azurecluster/handler/azureclusterupgrade" + "github.com/giantswarm/azure-operator/v7/service/controller/azurecluster/handler/azureconfig" + "github.com/giantswarm/azure-operator/v7/service/controller/azurecluster/handler/subnet" + "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v7/service/controller/debugger" + "github.com/giantswarm/azure-operator/v7/service/controller/setting" ) type ControllerConfig struct { diff --git a/service/controller/azurecluster/handler/azureclusterconditions/conditionvnetpeeringready.go b/service/controller/azurecluster/handler/azureclusterconditions/conditionvnetpeeringready.go index f5c247e2a5..14a9465408 100644 --- a/service/controller/azurecluster/handler/azureclusterconditions/conditionvnetpeeringready.go +++ b/service/controller/azurecluster/handler/azureclusterconditions/conditionvnetpeeringready.go @@ -9,7 +9,7 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" capiconditions "sigs.k8s.io/cluster-api/util/conditions" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azurecluster/handler/azureclusterconditions/create.go b/service/controller/azurecluster/handler/azureclusterconditions/create.go index a4c1c9d790..48990db8aa 100644 --- a/service/controller/azurecluster/handler/azureclusterconditions/create.go +++ b/service/controller/azurecluster/handler/azureclusterconditions/create.go @@ -7,7 +7,7 @@ import ( "github.com/giantswarm/microerror" apierrors "k8s.io/apimachinery/pkg/api/errors" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, cr interface{}) error { diff --git a/service/controller/azurecluster/handler/azureclusterconditions/resource.go b/service/controller/azurecluster/handler/azureclusterconditions/resource.go index cf7cc907fe..6b76ca9ba1 100644 --- a/service/controller/azurecluster/handler/azureclusterconditions/resource.go +++ b/service/controller/azurecluster/handler/azureclusterconditions/resource.go @@ -6,7 +6,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" - azureclient "github.com/giantswarm/azure-operator/v6/client" + azureclient "github.com/giantswarm/azure-operator/v7/client" ) const ( diff --git a/service/controller/azurecluster/handler/azureclusterconfig/create.go b/service/controller/azurecluster/handler/azureclusterconfig/create.go index 974b1ca0e7..d3cea43d25 100644 --- a/service/controller/azurecluster/handler/azureclusterconfig/create.go +++ b/service/controller/azurecluster/handler/azureclusterconfig/create.go @@ -10,8 +10,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/azurecluster/handler/azureclusterconfig/delete.go b/service/controller/azurecluster/handler/azureclusterconfig/delete.go index 5e9da068fa..4445c1fb44 100644 --- a/service/controller/azurecluster/handler/azureclusterconfig/delete.go +++ b/service/controller/azurecluster/handler/azureclusterconfig/delete.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/azurecluster/handler/azureclusteridentity/create.go b/service/controller/azurecluster/handler/azureclusteridentity/create.go index 24715c8905..a4893053d8 100644 --- a/service/controller/azurecluster/handler/azureclusteridentity/create.go +++ b/service/controller/azurecluster/handler/azureclusteridentity/create.go @@ -12,8 +12,8 @@ import ( capz "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azurecluster/handler/azureclusteridentity/resource.go b/service/controller/azurecluster/handler/azureclusteridentity/resource.go index 5f015a61dc..810a9d1fef 100644 --- a/service/controller/azurecluster/handler/azureclusteridentity/resource.go +++ b/service/controller/azurecluster/handler/azureclusteridentity/resource.go @@ -5,7 +5,7 @@ import ( "github.com/giantswarm/micrologger" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/client" + "github.com/giantswarm/azure-operator/v7/client" ) const ( diff --git a/service/controller/azurecluster/handler/azureclusterupgrade/resource.go b/service/controller/azurecluster/handler/azureclusterupgrade/resource.go index e11851662e..35d9558596 100644 --- a/service/controller/azurecluster/handler/azureclusterupgrade/resource.go +++ b/service/controller/azurecluster/handler/azureclusterupgrade/resource.go @@ -12,8 +12,8 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/helpers" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/helpers" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azurecluster/handler/azureconfig/create.go b/service/controller/azurecluster/handler/azureconfig/create.go index 5fbffe8120..9e05b778f2 100644 --- a/service/controller/azurecluster/handler/azureconfig/create.go +++ b/service/controller/azurecluster/handler/azureconfig/create.go @@ -18,10 +18,10 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - localannotation "github.com/giantswarm/azure-operator/v6/pkg/annotation" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/service/controller/key" - "github.com/giantswarm/azure-operator/v6/service/network" + localannotation "github.com/giantswarm/azure-operator/v7/pkg/annotation" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/network" ) const ( diff --git a/service/controller/azurecluster/handler/azureconfig/delete.go b/service/controller/azurecluster/handler/azureconfig/delete.go index dbd73d82fd..8898c73dba 100644 --- a/service/controller/azurecluster/handler/azureconfig/delete.go +++ b/service/controller/azurecluster/handler/azureconfig/delete.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/azurecluster/handler/azureconfig/equality.go b/service/controller/azurecluster/handler/azureconfig/equality.go index 565b2707b6..86081ba8d8 100644 --- a/service/controller/azurecluster/handler/azureconfig/equality.go +++ b/service/controller/azurecluster/handler/azureconfig/equality.go @@ -3,7 +3,7 @@ package azureconfig import ( providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" - "github.com/giantswarm/azure-operator/v6/pkg/annotation" + "github.com/giantswarm/azure-operator/v7/pkg/annotation" ) func azureConfigsEqual(cr1, cr2 providerv1alpha1.AzureConfig) bool { diff --git a/service/controller/azurecluster/handler/azureconfig/resource.go b/service/controller/azurecluster/handler/azureconfig/resource.go index 4773daccd9..e86ad4e04e 100644 --- a/service/controller/azurecluster/handler/azureconfig/resource.go +++ b/service/controller/azurecluster/handler/azureconfig/resource.go @@ -5,7 +5,7 @@ import ( "github.com/giantswarm/micrologger" "sigs.k8s.io/controller-runtime/pkg/client" - v5client "github.com/giantswarm/azure-operator/v6/client" + v5client "github.com/giantswarm/azure-operator/v7/client" ) const ( diff --git a/service/controller/azurecluster/handler/subnet/resource.go b/service/controller/azurecluster/handler/subnet/resource.go index 0587880021..5803a29dce 100644 --- a/service/controller/azurecluster/handler/subnet/resource.go +++ b/service/controller/azurecluster/handler/subnet/resource.go @@ -17,10 +17,10 @@ import ( capz "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/client" - subnet "github.com/giantswarm/azure-operator/v6/service/controller/azurecluster/handler/subnet/template" - "github.com/giantswarm/azure-operator/v6/service/controller/debugger" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/client" + subnet "github.com/giantswarm/azure-operator/v7/service/controller/azurecluster/handler/subnet/template" + "github.com/giantswarm/azure-operator/v7/service/controller/debugger" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/controller.go b/service/controller/azureconfig/controller.go index d026920470..963a0c4173 100644 --- a/service/controller/azureconfig/controller.go +++ b/service/controller/azureconfig/controller.go @@ -19,38 +19,38 @@ import ( "k8s.io/apimachinery/pkg/labels" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/pkg/credential" - "github.com/giantswarm/azure-operator/v6/pkg/employees" - "github.com/giantswarm/azure-operator/v6/pkg/handler/ipam" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes" - "github.com/giantswarm/azure-operator/v6/pkg/handler/release" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/pkg/locker" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/service/collector" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/azureconfigfinalizer" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/blobobject" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/capzcrs" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/clusterid" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/containerurl" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/deployment" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/dnsrecord" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/encryptionkey" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/endpoints" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/masters" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/namespace" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/resourcegroup" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/service" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/storageclassmigrator" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/vnetpeering" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/workermigration" - "github.com/giantswarm/azure-operator/v6/service/controller/cloudconfig" - "github.com/giantswarm/azure-operator/v6/service/controller/controllercontext" - "github.com/giantswarm/azure-operator/v6/service/controller/debugger" - "github.com/giantswarm/azure-operator/v6/service/controller/internal/vmsku" - "github.com/giantswarm/azure-operator/v6/service/controller/key" - "github.com/giantswarm/azure-operator/v6/service/controller/setting" + "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/pkg/credential" + "github.com/giantswarm/azure-operator/v7/pkg/employees" + "github.com/giantswarm/azure-operator/v7/pkg/handler/ipam" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes" + "github.com/giantswarm/azure-operator/v7/pkg/handler/release" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/locker" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/service/collector" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/azureconfigfinalizer" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/blobobject" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/capzcrs" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/clusterid" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/containerurl" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/deployment" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/dnsrecord" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/encryptionkey" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/endpoints" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/masters" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/namespace" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/resourcegroup" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/service" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/storageclassmigrator" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/vnetpeering" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/workermigration" + "github.com/giantswarm/azure-operator/v7/service/controller/cloudconfig" + "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v7/service/controller/debugger" + "github.com/giantswarm/azure-operator/v7/service/controller/internal/vmsku" + "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/setting" ) type ControllerConfig struct { diff --git a/service/controller/azureconfig/handler/azureconfigfinalizer/resource.go b/service/controller/azureconfig/handler/azureconfigfinalizer/resource.go index 2af6b4be0f..95d61132ec 100644 --- a/service/controller/azureconfig/handler/azureconfigfinalizer/resource.go +++ b/service/controller/azureconfig/handler/azureconfigfinalizer/resource.go @@ -8,7 +8,7 @@ import ( "github.com/giantswarm/micrologger" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/handler/blobobject/create.go b/service/controller/azureconfig/handler/blobobject/create.go index ee884c58db..2c51b0e4ab 100644 --- a/service/controller/azureconfig/handler/blobobject/create.go +++ b/service/controller/azureconfig/handler/blobobject/create.go @@ -5,8 +5,8 @@ import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/service/controller/blobclient" - "github.com/giantswarm/azure-operator/v6/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v7/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" ) func (r *Resource) ApplyCreateChange(ctx context.Context, obj, createChange interface{}) error { diff --git a/service/controller/azureconfig/handler/blobobject/current.go b/service/controller/azureconfig/handler/blobobject/current.go index bee0dfda24..665ac08b1e 100644 --- a/service/controller/azureconfig/handler/blobobject/current.go +++ b/service/controller/azureconfig/handler/blobobject/current.go @@ -6,9 +6,9 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext" - "github.com/giantswarm/azure-operator/v6/service/controller/blobclient" - "github.com/giantswarm/azure-operator/v6/service/controller/controllercontext" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) GetCurrentState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/azureconfig/handler/blobobject/desired.go b/service/controller/azureconfig/handler/blobobject/desired.go index 2d83eb9d1f..6ebd48af0a 100644 --- a/service/controller/azureconfig/handler/blobobject/desired.go +++ b/service/controller/azureconfig/handler/blobobject/desired.go @@ -14,9 +14,9 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/cloudconfig" - "github.com/giantswarm/azure-operator/v6/service/controller/controllercontext" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/cloudconfig" + "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) GetDesiredState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/azureconfig/handler/blobobject/mock.go b/service/controller/azureconfig/handler/blobobject/mock.go index 5b426894a3..f0c8522ec9 100644 --- a/service/controller/azureconfig/handler/blobobject/mock.go +++ b/service/controller/azureconfig/handler/blobobject/mock.go @@ -3,8 +3,8 @@ package blobobject import ( "context" - "github.com/giantswarm/azure-operator/v6/service/controller/cloudconfig" - "github.com/giantswarm/azure-operator/v6/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v7/service/controller/cloudconfig" + "github.com/giantswarm/azure-operator/v7/service/controller/encrypter" ) type CloudConfigMock struct { diff --git a/service/controller/azureconfig/handler/blobobject/resource.go b/service/controller/azureconfig/handler/blobobject/resource.go index 1dda7911d5..ab383fb8df 100644 --- a/service/controller/azureconfig/handler/blobobject/resource.go +++ b/service/controller/azureconfig/handler/blobobject/resource.go @@ -11,9 +11,9 @@ import ( "k8s.io/client-go/kubernetes" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/employees" - "github.com/giantswarm/azure-operator/v6/service/controller/encrypter" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/employees" + "github.com/giantswarm/azure-operator/v7/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/handler/blobobject/update.go b/service/controller/azureconfig/handler/blobobject/update.go index 583a0c3f96..5efc877491 100644 --- a/service/controller/azureconfig/handler/blobobject/update.go +++ b/service/controller/azureconfig/handler/blobobject/update.go @@ -6,8 +6,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/resource/crud" - "github.com/giantswarm/azure-operator/v6/service/controller/blobclient" - "github.com/giantswarm/azure-operator/v6/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v7/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" ) func (r *Resource) ApplyUpdateChange(ctx context.Context, obj, updateChange interface{}) error { diff --git a/service/controller/azureconfig/handler/blobobject/update_test.go b/service/controller/azureconfig/handler/blobobject/update_test.go index b21354b4e0..b12c8ec721 100644 --- a/service/controller/azureconfig/handler/blobobject/update_test.go +++ b/service/controller/azureconfig/handler/blobobject/update_test.go @@ -11,8 +11,8 @@ import ( "github.com/giantswarm/micrologger/microloggertest" "k8s.io/client-go/kubernetes/fake" - "github.com/giantswarm/azure-operator/v6/service/controller/controllercontext" - "github.com/giantswarm/azure-operator/v6/service/unittest" + "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v7/service/unittest" ) const ( diff --git a/service/controller/azureconfig/handler/capzcrs/create.go b/service/controller/azureconfig/handler/capzcrs/create.go index 7ee6aef3c1..b3cf1da192 100644 --- a/service/controller/azureconfig/handler/capzcrs/create.go +++ b/service/controller/azureconfig/handler/capzcrs/create.go @@ -20,8 +20,8 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - azopannotation "github.com/giantswarm/azure-operator/v6/pkg/annotation" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + azopannotation "github.com/giantswarm/azure-operator/v7/pkg/annotation" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) type crmapping struct { diff --git a/service/controller/azureconfig/handler/capzcrs/create_test.go b/service/controller/azureconfig/handler/capzcrs/create_test.go index 7a38e5dfc9..4d370a7b49 100644 --- a/service/controller/azureconfig/handler/capzcrs/create_test.go +++ b/service/controller/azureconfig/handler/capzcrs/create_test.go @@ -29,7 +29,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" // nolint:staticcheck "sigs.k8s.io/yaml" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) var update = flag.Bool("update", false, "update .golden reference files") diff --git a/service/controller/azureconfig/handler/clusterid/resource.go b/service/controller/azureconfig/handler/clusterid/resource.go index da0ef4e092..f000ef7a1c 100644 --- a/service/controller/azureconfig/handler/clusterid/resource.go +++ b/service/controller/azureconfig/handler/clusterid/resource.go @@ -9,8 +9,8 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/handler/containerurl/create.go b/service/controller/azureconfig/handler/containerurl/create.go index 8e43807ff4..da00dc12db 100644 --- a/service/controller/azureconfig/handler/containerurl/create.go +++ b/service/controller/azureconfig/handler/containerurl/create.go @@ -7,7 +7,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/azureconfig/handler/containerurl/resource.go b/service/controller/azureconfig/handler/containerurl/resource.go index f20449bc86..b839e2539d 100644 --- a/service/controller/azureconfig/handler/containerurl/resource.go +++ b/service/controller/azureconfig/handler/containerurl/resource.go @@ -10,7 +10,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/azure-operator/v6/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" ) const ( diff --git a/service/controller/azureconfig/handler/deployment/deployment.go b/service/controller/azureconfig/handler/deployment/deployment.go index e9ec18fe81..9035d1f222 100644 --- a/service/controller/azureconfig/handler/deployment/deployment.go +++ b/service/controller/azureconfig/handler/deployment/deployment.go @@ -9,9 +9,9 @@ import ( providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/deployment/template" - "github.com/giantswarm/azure-operator/v6/service/controller/key" - "github.com/giantswarm/azure-operator/v6/service/network" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/deployment/template" + "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/network" ) func (r Resource) newDeployment(ctx context.Context, customObject providerv1alpha1.AzureConfig, overwrites map[string]interface{}) (azureresource.Deployment, error) { diff --git a/service/controller/azureconfig/handler/deployment/natgw.go b/service/controller/azureconfig/handler/deployment/natgw.go index 6f37b37bf4..92c9e65b36 100644 --- a/service/controller/azureconfig/handler/deployment/natgw.go +++ b/service/controller/azureconfig/handler/deployment/natgw.go @@ -9,7 +9,7 @@ import ( providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) // This function ensures that the Master subnet has a nat gateway attached as expected. diff --git a/service/controller/azureconfig/handler/deployment/resource.go b/service/controller/azureconfig/handler/deployment/resource.go index 48fbb4e114..d24d886898 100644 --- a/service/controller/azureconfig/handler/deployment/resource.go +++ b/service/controller/azureconfig/handler/deployment/resource.go @@ -13,11 +13,11 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/service/controller/controllercontext" - "github.com/giantswarm/azure-operator/v6/service/controller/debugger" - "github.com/giantswarm/azure-operator/v6/service/controller/key" - "github.com/giantswarm/azure-operator/v6/service/controller/setting" + "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v7/service/controller/debugger" + "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/setting" ) const ( diff --git a/service/controller/azureconfig/handler/deployment/serviceendpoints.go b/service/controller/azureconfig/handler/deployment/serviceendpoints.go index bbb1e70054..df9f9aa575 100644 --- a/service/controller/azureconfig/handler/deployment/serviceendpoints.go +++ b/service/controller/azureconfig/handler/deployment/serviceendpoints.go @@ -10,7 +10,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/handler/dnsrecord/create.go b/service/controller/azureconfig/handler/dnsrecord/create.go index 30ade75b9a..0cf57e6626 100644 --- a/service/controller/azureconfig/handler/dnsrecord/create.go +++ b/service/controller/azureconfig/handler/dnsrecord/create.go @@ -6,7 +6,7 @@ import ( providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) // ApplyCreateChange is never called. We do not like it. It is not idempotent. diff --git a/service/controller/azureconfig/handler/dnsrecord/current.go b/service/controller/azureconfig/handler/dnsrecord/current.go index 81252c4ac1..2170c7dfd9 100644 --- a/service/controller/azureconfig/handler/dnsrecord/current.go +++ b/service/controller/azureconfig/handler/dnsrecord/current.go @@ -7,8 +7,8 @@ import ( providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) GetCurrentState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/azureconfig/handler/dnsrecord/delete.go b/service/controller/azureconfig/handler/dnsrecord/delete.go index ab9744c0f3..f4fb5e0501 100644 --- a/service/controller/azureconfig/handler/dnsrecord/delete.go +++ b/service/controller/azureconfig/handler/dnsrecord/delete.go @@ -8,7 +8,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/resource/crud" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) // ApplyDeleteChange deletes the resource group via the Azure API. diff --git a/service/controller/azureconfig/handler/dnsrecord/desired.go b/service/controller/azureconfig/handler/dnsrecord/desired.go index d97788312e..68a2a04e89 100644 --- a/service/controller/azureconfig/handler/dnsrecord/desired.go +++ b/service/controller/azureconfig/handler/dnsrecord/desired.go @@ -6,9 +6,9 @@ import ( providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" - "github.com/giantswarm/azure-operator/v6/client" + "github.com/giantswarm/azure-operator/v7/client" ) // GetDesiredState returns the desired resource group for this cluster. diff --git a/service/controller/azureconfig/handler/dnsrecord/resource.go b/service/controller/azureconfig/handler/dnsrecord/resource.go index ca20346abf..c2972c163e 100644 --- a/service/controller/azureconfig/handler/dnsrecord/resource.go +++ b/service/controller/azureconfig/handler/dnsrecord/resource.go @@ -7,7 +7,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/azure-operator/v6/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" ) const ( diff --git a/service/controller/azureconfig/handler/dnsrecord/types.go b/service/controller/azureconfig/handler/dnsrecord/types.go index e24e1e2c7c..6c272ffcff 100644 --- a/service/controller/azureconfig/handler/dnsrecord/types.go +++ b/service/controller/azureconfig/handler/dnsrecord/types.go @@ -5,7 +5,7 @@ import ( providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) type nsRecord struct { diff --git a/service/controller/azureconfig/handler/encryptionkey/create.go b/service/controller/azureconfig/handler/encryptionkey/create.go index c8e26ef22a..bcd9bd7d99 100644 --- a/service/controller/azureconfig/handler/encryptionkey/create.go +++ b/service/controller/azureconfig/handler/encryptionkey/create.go @@ -11,7 +11,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/azureconfig/handler/encryptionkey/delete.go b/service/controller/azureconfig/handler/encryptionkey/delete.go index 8079bd609e..7067e3fab2 100644 --- a/service/controller/azureconfig/handler/encryptionkey/delete.go +++ b/service/controller/azureconfig/handler/encryptionkey/delete.go @@ -7,7 +7,7 @@ import ( "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/azureconfig/handler/endpoints/create.go b/service/controller/azureconfig/handler/endpoints/create.go index 33130eacf9..bd380a0711 100644 --- a/service/controller/azureconfig/handler/endpoints/create.go +++ b/service/controller/azureconfig/handler/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/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) ApplyCreateChange(ctx context.Context, obj, createChange interface{}) error { diff --git a/service/controller/azureconfig/handler/endpoints/current.go b/service/controller/azureconfig/handler/endpoints/current.go index 15f0cedced..cc8fcd95f8 100644 --- a/service/controller/azureconfig/handler/endpoints/current.go +++ b/service/controller/azureconfig/handler/endpoints/current.go @@ -9,7 +9,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/handler/endpoints/delete.go b/service/controller/azureconfig/handler/endpoints/delete.go index a50b849099..4c2274dfb0 100644 --- a/service/controller/azureconfig/handler/endpoints/delete.go +++ b/service/controller/azureconfig/handler/endpoints/delete.go @@ -9,7 +9,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) ApplyDeleteChange(ctx context.Context, obj, deleteChange interface{}) error { diff --git a/service/controller/azureconfig/handler/endpoints/desired.go b/service/controller/azureconfig/handler/endpoints/desired.go index 8922977099..7a2d97b5d1 100644 --- a/service/controller/azureconfig/handler/endpoints/desired.go +++ b/service/controller/azureconfig/handler/endpoints/desired.go @@ -7,8 +7,8 @@ import ( v1 "k8s.io/api/core/v1" apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) GetDesiredState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/azureconfig/handler/endpoints/nic.go b/service/controller/azureconfig/handler/endpoints/nic.go index 90c5d4fda4..c152a6ff4c 100644 --- a/service/controller/azureconfig/handler/endpoints/nic.go +++ b/service/controller/azureconfig/handler/endpoints/nic.go @@ -6,7 +6,7 @@ import ( "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-11-01/network" "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" ) func (r *Resource) getMasterNICPrivateIPs(ctx context.Context, resourceGroupName, virtualMachineScaleSetName string) ([]string, error) { diff --git a/service/controller/azureconfig/handler/endpoints/update.go b/service/controller/azureconfig/handler/endpoints/update.go index 8d4381f415..1a482e7597 100644 --- a/service/controller/azureconfig/handler/endpoints/update.go +++ b/service/controller/azureconfig/handler/endpoints/update.go @@ -9,7 +9,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) ApplyUpdateChange(ctx context.Context, obj, updateChange interface{}) error { diff --git a/service/controller/azureconfig/handler/masters/create.go b/service/controller/azureconfig/handler/masters/create.go index 9187b0b0a9..9f1edee0ee 100644 --- a/service/controller/azureconfig/handler/masters/create.go +++ b/service/controller/azureconfig/handler/masters/create.go @@ -5,8 +5,8 @@ import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) // createStateMachine configures and returns state machine that is driven by diff --git a/service/controller/azureconfig/handler/masters/create_cluster_upgrade_requirement_check.go b/service/controller/azureconfig/handler/masters/create_cluster_upgrade_requirement_check.go index b6fa5b7f45..c64bc388f5 100644 --- a/service/controller/azureconfig/handler/masters/create_cluster_upgrade_requirement_check.go +++ b/service/controller/azureconfig/handler/masters/create_cluster_upgrade_requirement_check.go @@ -13,9 +13,9 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) clusterUpgradeRequirementCheckTransition(ctx context.Context, obj interface{}, currentState state.State) (state.State, error) { diff --git a/service/controller/azureconfig/handler/masters/create_deployment_completed.go b/service/controller/azureconfig/handler/masters/create_deployment_completed.go index e223bb7514..c856bd55d2 100644 --- a/service/controller/azureconfig/handler/masters/create_deployment_completed.go +++ b/service/controller/azureconfig/handler/masters/create_deployment_completed.go @@ -10,11 +10,11 @@ import ( releasev1alpha1 "github.com/giantswarm/release-operator/v3/api/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/checksum" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v6/service/controller/blobclient" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/checksum" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v7/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) deploymentCompletedTransition(ctx context.Context, obj interface{}, currentState state.State) (state.State, error) { diff --git a/service/controller/azureconfig/handler/masters/create_deployment_initialized.go b/service/controller/azureconfig/handler/masters/create_deployment_initialized.go index 7efde0ee8b..d21bfd824d 100644 --- a/service/controller/azureconfig/handler/masters/create_deployment_initialized.go +++ b/service/controller/azureconfig/handler/masters/create_deployment_initialized.go @@ -5,8 +5,8 @@ import ( "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) deploymentInitializedTransition(ctx context.Context, obj interface{}, currentState state.State) (state.State, error) { diff --git a/service/controller/azureconfig/handler/masters/create_deployment_uninitialized.go b/service/controller/azureconfig/handler/masters/create_deployment_uninitialized.go index a411b865c1..e194bdbe36 100644 --- a/service/controller/azureconfig/handler/masters/create_deployment_uninitialized.go +++ b/service/controller/azureconfig/handler/masters/create_deployment_uninitialized.go @@ -7,11 +7,11 @@ import ( "github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext" "github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext" - "github.com/giantswarm/azure-operator/v6/pkg/checksum" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v6/service/controller/blobclient" - "github.com/giantswarm/azure-operator/v6/service/controller/controllercontext" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/checksum" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v7/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) deploymentUninitializedTransition(ctx context.Context, obj interface{}, currentState state.State) (state.State, error) { diff --git a/service/controller/azureconfig/handler/masters/create_empty.go b/service/controller/azureconfig/handler/masters/create_empty.go index b015234ee7..c999366588 100644 --- a/service/controller/azureconfig/handler/masters/create_empty.go +++ b/service/controller/azureconfig/handler/masters/create_empty.go @@ -3,7 +3,7 @@ package masters import ( "context" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" ) func (r *Resource) emptyStateTransition(ctx context.Context, obj interface{}, currentState state.State) (state.State, error) { diff --git a/service/controller/azureconfig/handler/masters/create_master_instances_upgrading.go b/service/controller/azureconfig/handler/masters/create_master_instances_upgrading.go index 84b00ce17f..d477722de9 100644 --- a/service/controller/azureconfig/handler/masters/create_master_instances_upgrading.go +++ b/service/controller/azureconfig/handler/masters/create_master_instances_upgrading.go @@ -6,9 +6,9 @@ import ( "github.com/giantswarm/errors/tenant" "github.com/giantswarm/tenantcluster/v6/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v6/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/label" - "github.com/giantswarm/azure-operator/v6/pkg/project" + "github.com/giantswarm/azure-operator/v7/pkg/project" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute" "github.com/Azure/go-autorest/autorest/to" @@ -17,9 +17,9 @@ import ( corev1 "k8s.io/api/core/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) masterInstancesUpgradingTransition(ctx context.Context, obj interface{}, currentState state.State) (state.State, error) { diff --git a/service/controller/azureconfig/handler/masters/create_provisioning_successful.go b/service/controller/azureconfig/handler/masters/create_provisioning_successful.go index 9766357e79..0282d056f5 100644 --- a/service/controller/azureconfig/handler/masters/create_provisioning_successful.go +++ b/service/controller/azureconfig/handler/masters/create_provisioning_successful.go @@ -3,7 +3,7 @@ package masters import ( "context" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" ) func (r *Resource) provisioningSuccessfulTransition(ctx context.Context, obj interface{}, currentState state.State) (state.State, error) { diff --git a/service/controller/azureconfig/handler/masters/delete.go b/service/controller/azureconfig/handler/masters/delete.go index adcc6c71ea..3af5b1cdb2 100644 --- a/service/controller/azureconfig/handler/masters/delete.go +++ b/service/controller/azureconfig/handler/masters/delete.go @@ -10,7 +10,7 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/azureconfig/handler/masters/deployment.go b/service/controller/azureconfig/handler/masters/deployment.go index ac5dea4e62..8d5ad881c4 100644 --- a/service/controller/azureconfig/handler/masters/deployment.go +++ b/service/controller/azureconfig/handler/masters/deployment.go @@ -11,13 +11,13 @@ import ( "github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext" apierrors "k8s.io/apimachinery/pkg/api/errors" - "github.com/giantswarm/azure-operator/v6/pkg/helpers/vmss" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/masters/template" - "github.com/giantswarm/azure-operator/v6/service/controller/blobclient" - "github.com/giantswarm/azure-operator/v6/service/controller/controllercontext" - "github.com/giantswarm/azure-operator/v6/service/controller/internal/vmsku" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/helpers/vmss" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/masters/template" + "github.com/giantswarm/azure-operator/v7/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v7/service/controller/internal/vmsku" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r Resource) newDeployment(ctx context.Context, obj providerv1alpha1.AzureConfig, overwrites map[string]interface{}, location string) (azureresource.Deployment, error) { diff --git a/service/controller/azureconfig/handler/masters/instances.go b/service/controller/azureconfig/handler/masters/instances.go index 030283e772..5236875665 100644 --- a/service/controller/azureconfig/handler/masters/instances.go +++ b/service/controller/azureconfig/handler/masters/instances.go @@ -7,7 +7,7 @@ import ( providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) allInstances(ctx context.Context, customObject providerv1alpha1.AzureConfig, deploymentNameFunc func(customObject providerv1alpha1.AzureConfig) string) ([]compute.VirtualMachineScaleSetVM, error) { diff --git a/service/controller/azureconfig/handler/masters/resource.go b/service/controller/azureconfig/handler/masters/resource.go index 1f5b89e1ae..7415307151 100644 --- a/service/controller/azureconfig/handler/masters/resource.go +++ b/service/controller/azureconfig/handler/masters/resource.go @@ -10,9 +10,9 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes" - "github.com/giantswarm/azure-operator/v6/service/controller/internal/vmsku" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes" + "github.com/giantswarm/azure-operator/v7/service/controller/internal/vmsku" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/handler/namespace/current.go b/service/controller/azureconfig/handler/namespace/current.go index 11ea72828c..a5294e7dea 100644 --- a/service/controller/azureconfig/handler/namespace/current.go +++ b/service/controller/azureconfig/handler/namespace/current.go @@ -10,7 +10,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) GetCurrentState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/azureconfig/handler/namespace/desired.go b/service/controller/azureconfig/handler/namespace/desired.go index 19bf0a6a5c..95b2898b19 100644 --- a/service/controller/azureconfig/handler/namespace/desired.go +++ b/service/controller/azureconfig/handler/namespace/desired.go @@ -7,7 +7,7 @@ import ( corev1 "k8s.io/api/core/v1" apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) GetDesiredState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/azureconfig/handler/namespace/desired_test.go b/service/controller/azureconfig/handler/namespace/desired_test.go index 4bd80648c0..6fdef7877d 100644 --- a/service/controller/azureconfig/handler/namespace/desired_test.go +++ b/service/controller/azureconfig/handler/namespace/desired_test.go @@ -12,8 +12,8 @@ import ( "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" "github.com/giantswarm/micrologger/microloggertest" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func Test_Resource_Namespace_GetDesiredState(t *testing.T) { diff --git a/service/controller/azureconfig/handler/resourcegroup/resource.go b/service/controller/azureconfig/handler/resourcegroup/resource.go index ab7d4fa7db..b737c201c6 100644 --- a/service/controller/azureconfig/handler/resourcegroup/resource.go +++ b/service/controller/azureconfig/handler/resourcegroup/resource.go @@ -17,11 +17,11 @@ import ( "sigs.k8s.io/cluster-api/util/conditions" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/helpers" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/service/controller/controllercontext" - "github.com/giantswarm/azure-operator/v6/service/controller/key" - "github.com/giantswarm/azure-operator/v6/service/controller/setting" + "github.com/giantswarm/azure-operator/v7/pkg/helpers" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/setting" ) const ( diff --git a/service/controller/azureconfig/handler/service/create.go b/service/controller/azureconfig/handler/service/create.go index 1af1eb374a..72556d4006 100644 --- a/service/controller/azureconfig/handler/service/create.go +++ b/service/controller/azureconfig/handler/service/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/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) ApplyCreateChange(ctx context.Context, obj, createChange interface{}) error { diff --git a/service/controller/azureconfig/handler/service/current.go b/service/controller/azureconfig/handler/service/current.go index 5bda8b51da..54654a1df4 100644 --- a/service/controller/azureconfig/handler/service/current.go +++ b/service/controller/azureconfig/handler/service/current.go @@ -8,7 +8,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) GetCurrentState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/azureconfig/handler/service/delete.go b/service/controller/azureconfig/handler/service/delete.go index d68e8e3106..487666d84d 100644 --- a/service/controller/azureconfig/handler/service/delete.go +++ b/service/controller/azureconfig/handler/service/delete.go @@ -9,7 +9,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) ApplyDeleteChange(ctx context.Context, obj, deleteChange interface{}) error { diff --git a/service/controller/azureconfig/handler/service/desired.go b/service/controller/azureconfig/handler/service/desired.go index 8584a76c31..870caafbc1 100644 --- a/service/controller/azureconfig/handler/service/desired.go +++ b/service/controller/azureconfig/handler/service/desired.go @@ -8,7 +8,7 @@ import ( apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) GetDesiredState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/azureconfig/handler/service/desired_test.go b/service/controller/azureconfig/handler/service/desired_test.go index 88caa96471..1804209f7c 100644 --- a/service/controller/azureconfig/handler/service/desired_test.go +++ b/service/controller/azureconfig/handler/service/desired_test.go @@ -12,7 +12,7 @@ import ( "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" "github.com/giantswarm/micrologger/microloggertest" - "github.com/giantswarm/azure-operator/v6/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/label" ) func Test_Resource_Service_GetDesiredState(t *testing.T) { diff --git a/service/controller/azureconfig/handler/service/resource_test.go b/service/controller/azureconfig/handler/service/resource_test.go index 6592ddb175..a712b63af7 100644 --- a/service/controller/azureconfig/handler/service/resource_test.go +++ b/service/controller/azureconfig/handler/service/resource_test.go @@ -8,7 +8,7 @@ import ( apismetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func Test_toService(t *testing.T) { diff --git a/service/controller/azureconfig/handler/storageclassmigrator/resource.go b/service/controller/azureconfig/handler/storageclassmigrator/resource.go index d8e48434fc..004cfb4403 100644 --- a/service/controller/azureconfig/handler/storageclassmigrator/resource.go +++ b/service/controller/azureconfig/handler/storageclassmigrator/resource.go @@ -17,8 +17,8 @@ import ( ctrl "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" - "github.com/giantswarm/azure-operator/v6/service/controller/key" - "github.com/giantswarm/azure-operator/v6/service/controller/templates/ignition" + "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/templates/ignition" ) const ( diff --git a/service/controller/azureconfig/handler/vnetpeering/create.go b/service/controller/azureconfig/handler/vnetpeering/create.go index b7ef5485bf..48f225dd08 100644 --- a/service/controller/azureconfig/handler/vnetpeering/create.go +++ b/service/controller/azureconfig/handler/vnetpeering/create.go @@ -9,7 +9,7 @@ import ( "github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext" "github.com/giantswarm/to" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/handler/vnetpeering/delete.go b/service/controller/azureconfig/handler/vnetpeering/delete.go index 173df713c7..eb3a8454f8 100644 --- a/service/controller/azureconfig/handler/vnetpeering/delete.go +++ b/service/controller/azureconfig/handler/vnetpeering/delete.go @@ -6,7 +6,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/azureconfig/handler/vnetpeering/resource.go b/service/controller/azureconfig/handler/vnetpeering/resource.go index 59033cf4ad..ee8fe88760 100644 --- a/service/controller/azureconfig/handler/vnetpeering/resource.go +++ b/service/controller/azureconfig/handler/vnetpeering/resource.go @@ -4,7 +4,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/azure-operator/v6/client" + "github.com/giantswarm/azure-operator/v7/client" ) const ( diff --git a/service/controller/azureconfig/handler/workermigration/create.go b/service/controller/azureconfig/handler/workermigration/create.go index 0575fd116d..9bb713d196 100644 --- a/service/controller/azureconfig/handler/workermigration/create.go +++ b/service/controller/azureconfig/handler/workermigration/create.go @@ -24,8 +24,8 @@ import ( capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/workermigration/internal/azure" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/workermigration/internal/azure" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/handler/workermigration/create_test.go b/service/controller/azureconfig/handler/workermigration/create_test.go index a720bb903a..ebcccc3913 100644 --- a/service/controller/azureconfig/handler/workermigration/create_test.go +++ b/service/controller/azureconfig/handler/workermigration/create_test.go @@ -28,11 +28,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/fake" // nolint:staticcheck "sigs.k8s.io/yaml" - azureclient "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/pkg/mock/mock_tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/workermigration/internal/azure" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/workermigration/internal/mock_azure" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + azureclient "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/pkg/mock/mock_tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/workermigration/internal/azure" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/workermigration/internal/mock_azure" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) //go:generate mockgen -destination internal/mock_azure/api.go -source internal/azure/spec.go API diff --git a/service/controller/azureconfig/handler/workermigration/internal/azure/api.go b/service/controller/azureconfig/handler/workermigration/internal/azure/api.go index de75102272..54428afc9a 100644 --- a/service/controller/azureconfig/handler/workermigration/internal/azure/api.go +++ b/service/controller/azureconfig/handler/workermigration/internal/azure/api.go @@ -8,7 +8,7 @@ import ( providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/client" + "github.com/giantswarm/azure-operator/v7/client" ) type api struct { diff --git a/service/controller/azureconfig/handler/workermigration/internal/mock_azure/api.go b/service/controller/azureconfig/handler/workermigration/internal/mock_azure/api.go index df85009836..69980ad648 100644 --- a/service/controller/azureconfig/handler/workermigration/internal/mock_azure/api.go +++ b/service/controller/azureconfig/handler/workermigration/internal/mock_azure/api.go @@ -11,7 +11,7 @@ import ( network "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-11-01/network" gomock "github.com/golang/mock/gomock" - azure "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/workermigration/internal/azure" + azure "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/workermigration/internal/azure" ) // MockAPI is a mock of API interface diff --git a/service/controller/azureconfig/handler/workermigration/resource.go b/service/controller/azureconfig/handler/workermigration/resource.go index d9c63d057e..dadab15a18 100644 --- a/service/controller/azureconfig/handler/workermigration/resource.go +++ b/service/controller/azureconfig/handler/workermigration/resource.go @@ -8,9 +8,9 @@ import ( "github.com/giantswarm/micrologger" "sigs.k8s.io/controller-runtime/pkg/client" - azureclient "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/workermigration/internal/azure" + azureclient "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/workermigration/internal/azure" ) const ( diff --git a/service/controller/azureconfig/handler/workermigration/security_groups.go b/service/controller/azureconfig/handler/workermigration/security_groups.go index 7050ab5edf..eac387a64d 100644 --- a/service/controller/azureconfig/handler/workermigration/security_groups.go +++ b/service/controller/azureconfig/handler/workermigration/security_groups.go @@ -9,8 +9,8 @@ import ( providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1" "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig/handler/workermigration/internal/azure" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/workermigration/internal/azure" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) // Security group rules that need destination CIDR update from built-in worker subnet to VNET CIDR. diff --git a/service/controller/azuremachine/controller.go b/service/controller/azuremachine/controller.go index faa3e84424..1295edd4ee 100644 --- a/service/controller/azuremachine/controller.go +++ b/service/controller/azuremachine/controller.go @@ -13,13 +13,13 @@ import ( capz "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/pkg/credential" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/service/collector" - "github.com/giantswarm/azure-operator/v6/service/controller/azuremachine/handler/azuremachineconditions" - "github.com/giantswarm/azure-operator/v6/service/controller/azuremachine/handler/azuremachinemetadata" + "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/pkg/credential" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/service/collector" + "github.com/giantswarm/azure-operator/v7/service/controller/azuremachine/handler/azuremachineconditions" + "github.com/giantswarm/azure-operator/v7/service/controller/azuremachine/handler/azuremachinemetadata" ) type ControllerConfig struct { diff --git a/service/controller/azuremachine/handler/azuremachineconditions/conditionsubnetready.go b/service/controller/azuremachine/handler/azuremachineconditions/conditionsubnetready.go index 3354fd1251..081cce1497 100644 --- a/service/controller/azuremachine/handler/azuremachineconditions/conditionsubnetready.go +++ b/service/controller/azuremachine/handler/azuremachineconditions/conditionsubnetready.go @@ -10,8 +10,8 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" capiconditions "sigs.k8s.io/cluster-api/util/conditions" - "github.com/giantswarm/azure-operator/v6/pkg/helpers" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/helpers" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azuremachine/handler/azuremachineconditions/conditionvmssready.go b/service/controller/azuremachine/handler/azuremachineconditions/conditionvmssready.go index 35aa95600b..800601e182 100644 --- a/service/controller/azuremachine/handler/azuremachineconditions/conditionvmssready.go +++ b/service/controller/azuremachine/handler/azuremachineconditions/conditionvmssready.go @@ -10,7 +10,7 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" capiconditions "sigs.k8s.io/cluster-api/util/conditions" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azuremachine/handler/azuremachineconditions/create.go b/service/controller/azuremachine/handler/azuremachineconditions/create.go index 2d027a05b1..803437ace7 100644 --- a/service/controller/azuremachine/handler/azuremachineconditions/create.go +++ b/service/controller/azuremachine/handler/azuremachineconditions/create.go @@ -6,7 +6,7 @@ import ( "github.com/giantswarm/microerror" apierrors "k8s.io/apimachinery/pkg/api/errors" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, cr interface{}) error { diff --git a/service/controller/azuremachine/handler/azuremachineconditions/resource.go b/service/controller/azuremachine/handler/azuremachineconditions/resource.go index 65ed51c8a4..de8cfbb1c1 100644 --- a/service/controller/azuremachine/handler/azuremachineconditions/resource.go +++ b/service/controller/azuremachine/handler/azuremachineconditions/resource.go @@ -13,8 +13,8 @@ import ( capiconditions "sigs.k8s.io/cluster-api/util/conditions" "sigs.k8s.io/controller-runtime/pkg/client" - azureclient "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/pkg/azureconditions" + azureclient "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/pkg/azureconditions" ) const ( diff --git a/service/controller/azuremachine/handler/azuremachinemetadata/create.go b/service/controller/azuremachine/handler/azuremachinemetadata/create.go index 31d9e220e6..3117e711a4 100644 --- a/service/controller/azuremachine/handler/azuremachinemetadata/create.go +++ b/service/controller/azuremachine/handler/azuremachinemetadata/create.go @@ -7,8 +7,8 @@ import ( "github.com/giantswarm/microerror" "k8s.io/apimachinery/pkg/api/errors" - "github.com/giantswarm/azure-operator/v6/pkg/helpers" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/helpers" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, cr interface{}) error { diff --git a/service/controller/azuremachinepool/controller.go b/service/controller/azuremachinepool/controller.go index 45cd4ebb4d..2ce7e64ac0 100644 --- a/service/controller/azuremachinepool/controller.go +++ b/service/controller/azuremachinepool/controller.go @@ -16,24 +16,24 @@ import ( capzexp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/pkg/credential" - "github.com/giantswarm/azure-operator/v6/pkg/employees" - "github.com/giantswarm/azure-operator/v6/pkg/handler/ipam" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/pkg/locker" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/collector" - "github.com/giantswarm/azure-operator/v6/service/controller/azuremachinepool/handler/azuremachinepoolconditions" - "github.com/giantswarm/azure-operator/v6/service/controller/azuremachinepool/handler/cloudconfigblob" - "github.com/giantswarm/azure-operator/v6/service/controller/azuremachinepool/handler/migration" - "github.com/giantswarm/azure-operator/v6/service/controller/azuremachinepool/handler/nodepool" - "github.com/giantswarm/azure-operator/v6/service/controller/azuremachinepool/handler/spark" - "github.com/giantswarm/azure-operator/v6/service/controller/debugger" - "github.com/giantswarm/azure-operator/v6/service/controller/internal/vmsku" - "github.com/giantswarm/azure-operator/v6/service/controller/setting" + "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/pkg/credential" + "github.com/giantswarm/azure-operator/v7/pkg/employees" + "github.com/giantswarm/azure-operator/v7/pkg/handler/ipam" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/locker" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/collector" + "github.com/giantswarm/azure-operator/v7/service/controller/azuremachinepool/handler/azuremachinepoolconditions" + "github.com/giantswarm/azure-operator/v7/service/controller/azuremachinepool/handler/cloudconfigblob" + "github.com/giantswarm/azure-operator/v7/service/controller/azuremachinepool/handler/migration" + "github.com/giantswarm/azure-operator/v7/service/controller/azuremachinepool/handler/nodepool" + "github.com/giantswarm/azure-operator/v7/service/controller/azuremachinepool/handler/spark" + "github.com/giantswarm/azure-operator/v7/service/controller/debugger" + "github.com/giantswarm/azure-operator/v7/service/controller/internal/vmsku" + "github.com/giantswarm/azure-operator/v7/service/controller/setting" ) type ControllerConfig struct { diff --git a/service/controller/azuremachinepool/handler/azuremachinepoolconditions/conditionsubnetready.go b/service/controller/azuremachinepool/handler/azuremachinepoolconditions/conditionsubnetready.go index 3a1621b0b1..6c579310ba 100644 --- a/service/controller/azuremachinepool/handler/azuremachinepoolconditions/conditionsubnetready.go +++ b/service/controller/azuremachinepool/handler/azuremachinepoolconditions/conditionsubnetready.go @@ -10,8 +10,8 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" capiconditions "sigs.k8s.io/cluster-api/util/conditions" - "github.com/giantswarm/azure-operator/v6/pkg/helpers" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/helpers" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azuremachinepool/handler/azuremachinepoolconditions/conditionvmssready.go b/service/controller/azuremachinepool/handler/azuremachinepoolconditions/conditionvmssready.go index b5ee94aace..2ceb7ed276 100644 --- a/service/controller/azuremachinepool/handler/azuremachinepoolconditions/conditionvmssready.go +++ b/service/controller/azuremachinepool/handler/azuremachinepoolconditions/conditionvmssready.go @@ -10,7 +10,7 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" capiconditions "sigs.k8s.io/cluster-api/util/conditions" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azuremachinepool/handler/azuremachinepoolconditions/create.go b/service/controller/azuremachinepool/handler/azuremachinepoolconditions/create.go index 2506021996..387a8e929f 100644 --- a/service/controller/azuremachinepool/handler/azuremachinepoolconditions/create.go +++ b/service/controller/azuremachinepool/handler/azuremachinepoolconditions/create.go @@ -6,7 +6,7 @@ import ( "github.com/giantswarm/microerror" apierrors "k8s.io/apimachinery/pkg/api/errors" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, cr interface{}) error { diff --git a/service/controller/azuremachinepool/handler/azuremachinepoolconditions/resource.go b/service/controller/azuremachinepool/handler/azuremachinepoolconditions/resource.go index 9ce71b0dec..3850881b57 100644 --- a/service/controller/azuremachinepool/handler/azuremachinepoolconditions/resource.go +++ b/service/controller/azuremachinepool/handler/azuremachinepoolconditions/resource.go @@ -5,8 +5,8 @@ import ( "github.com/giantswarm/micrologger" "sigs.k8s.io/controller-runtime/pkg/client" - azureclient "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/pkg/azureconditions" + azureclient "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/pkg/azureconditions" ) const ( diff --git a/service/controller/azuremachinepool/handler/cloudconfigblob/create.go b/service/controller/azuremachinepool/handler/cloudconfigblob/create.go index 9fe4568765..654ff75a2c 100644 --- a/service/controller/azuremachinepool/handler/cloudconfigblob/create.go +++ b/service/controller/azuremachinepool/handler/cloudconfigblob/create.go @@ -16,8 +16,8 @@ import ( capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/blobclient" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) // EnsureCreated will make sure that a blob is saved in the Storage Account containing the cloud config for the node pool. diff --git a/service/controller/azuremachinepool/handler/cloudconfigblob/delete.go b/service/controller/azuremachinepool/handler/cloudconfigblob/delete.go index c05d2d8bc6..b07f23d714 100644 --- a/service/controller/azuremachinepool/handler/cloudconfigblob/delete.go +++ b/service/controller/azuremachinepool/handler/cloudconfigblob/delete.go @@ -6,8 +6,8 @@ import ( "github.com/Azure/azure-storage-blob-go/azblob" "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/service/controller/blobclient" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) // EnsureDeleted will delete the blob in the Storage Account containing the cloud config for the node pool. diff --git a/service/controller/azuremachinepool/handler/cloudconfigblob/resource.go b/service/controller/azuremachinepool/handler/cloudconfigblob/resource.go index 4ad7334a65..6293ff5a15 100644 --- a/service/controller/azuremachinepool/handler/cloudconfigblob/resource.go +++ b/service/controller/azuremachinepool/handler/cloudconfigblob/resource.go @@ -9,7 +9,7 @@ import ( capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/client" + "github.com/giantswarm/azure-operator/v7/client" ) const ( diff --git a/service/controller/azuremachinepool/handler/migration/azuremachinepool_test.go b/service/controller/azuremachinepool/handler/migration/azuremachinepool_test.go index dcdc201a22..5767ac4851 100644 --- a/service/controller/azuremachinepool/handler/migration/azuremachinepool_test.go +++ b/service/controller/azuremachinepool/handler/migration/azuremachinepool_test.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/types" capzexp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" - "github.com/giantswarm/azure-operator/v6/service/unittest" + "github.com/giantswarm/azure-operator/v7/service/unittest" ) func TestEnsureCreatedAzureMachinePoolIsCorrect(t *testing.T) { diff --git a/service/controller/azuremachinepool/handler/migration/resource.go b/service/controller/azuremachinepool/handler/migration/resource.go index 17b37b288f..597aed4450 100644 --- a/service/controller/azuremachinepool/handler/migration/resource.go +++ b/service/controller/azuremachinepool/handler/migration/resource.go @@ -14,8 +14,8 @@ import ( capzexp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/machinepoolmigration" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/machinepoolmigration" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azuremachinepool/handler/nodepool/cluster_autoscaler.go b/service/controller/azuremachinepool/handler/nodepool/cluster_autoscaler.go index 5c4ca58edd..f5aad10046 100644 --- a/service/controller/azuremachinepool/handler/nodepool/cluster_autoscaler.go +++ b/service/controller/azuremachinepool/handler/nodepool/cluster_autoscaler.go @@ -10,7 +10,7 @@ import ( "github.com/giantswarm/microerror" capzexp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/azuremachinepool/handler/nodepool/cordon_old_workers.go b/service/controller/azuremachinepool/handler/nodepool/cordon_old_workers.go index 3dfce41aec..b9d8bdcbd1 100644 --- a/service/controller/azuremachinepool/handler/nodepool/cordon_old_workers.go +++ b/service/controller/azuremachinepool/handler/nodepool/cordon_old_workers.go @@ -7,11 +7,11 @@ import ( "github.com/giantswarm/microerror" "sigs.k8s.io/cluster-api/util" - "github.com/giantswarm/azure-operator/v6/pkg/drainer" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/drainer" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/controller/key" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" ) func (r *Resource) cordonOldWorkerInstances(ctx context.Context, obj interface{}, currentState state.State) (state.State, error) { diff --git a/service/controller/azuremachinepool/handler/nodepool/create.go b/service/controller/azuremachinepool/handler/nodepool/create.go index f8c896e74e..9c00131940 100644 --- a/service/controller/azuremachinepool/handler/nodepool/create.go +++ b/service/controller/azuremachinepool/handler/nodepool/create.go @@ -11,10 +11,10 @@ import ( capzexp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" capiutil "sigs.k8s.io/cluster-api/util" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) // createStateMachine configures and returns state machine that is driven by diff --git a/service/controller/azuremachinepool/handler/nodepool/create_deployment_uninitialized.go b/service/controller/azuremachinepool/handler/nodepool/create_deployment_uninitialized.go index e362e5ece5..22e8259b8c 100644 --- a/service/controller/azuremachinepool/handler/nodepool/create_deployment_uninitialized.go +++ b/service/controller/azuremachinepool/handler/nodepool/create_deployment_uninitialized.go @@ -15,9 +15,9 @@ import ( "sigs.k8s.io/cluster-api/util" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v6/service/controller/azuremachinepool/handler/nodepool/template" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v7/service/controller/azuremachinepool/handler/nodepool/template" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) deploymentUninitializedTransition(ctx context.Context, obj interface{}, currentState state.State) (state.State, error) { diff --git a/service/controller/azuremachinepool/handler/nodepool/create_scale_workers.go b/service/controller/azuremachinepool/handler/nodepool/create_scale_workers.go index 1110cfcb07..66af40f94e 100644 --- a/service/controller/azuremachinepool/handler/nodepool/create_scale_workers.go +++ b/service/controller/azuremachinepool/handler/nodepool/create_scale_workers.go @@ -14,13 +14,13 @@ import ( "sigs.k8s.io/cluster-api/util" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/scalestrategy" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/controller/internal/vmsscheck" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/scalestrategy" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/controller/internal/vmsscheck" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) // The goal of scaleUpWorkerVMSSTransition is to double the desired number diff --git a/service/controller/azuremachinepool/handler/nodepool/create_terminate_old_workers.go b/service/controller/azuremachinepool/handler/nodepool/create_terminate_old_workers.go index de823ab251..0712607800 100644 --- a/service/controller/azuremachinepool/handler/nodepool/create_terminate_old_workers.go +++ b/service/controller/azuremachinepool/handler/nodepool/create_terminate_old_workers.go @@ -8,8 +8,8 @@ import ( "github.com/giantswarm/microerror" "sigs.k8s.io/cluster-api/util" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) terminateOldWorkersTransition(ctx context.Context, obj interface{}, currentState state.State) (state.State, error) { diff --git a/service/controller/azuremachinepool/handler/nodepool/create_wait_for_nodes_to_become_ready.go b/service/controller/azuremachinepool/handler/nodepool/create_wait_for_nodes_to_become_ready.go index e88c04a6a7..9a756895e9 100644 --- a/service/controller/azuremachinepool/handler/nodepool/create_wait_for_nodes_to_become_ready.go +++ b/service/controller/azuremachinepool/handler/nodepool/create_wait_for_nodes_to_become_ready.go @@ -10,9 +10,9 @@ import ( "sigs.k8s.io/cluster-api/util" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) waitForWorkersToBecomeReadyTransition(ctx context.Context, obj interface{}, currentState state.State) (state.State, error) { diff --git a/service/controller/azuremachinepool/handler/nodepool/delete.go b/service/controller/azuremachinepool/handler/nodepool/delete.go index 11e324acff..b1c9676144 100644 --- a/service/controller/azuremachinepool/handler/nodepool/delete.go +++ b/service/controller/azuremachinepool/handler/nodepool/delete.go @@ -12,8 +12,8 @@ import ( "sigs.k8s.io/cluster-api/util" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) // EnsureDeleted is a noop since the deletion of deployments is redirected to diff --git a/service/controller/azuremachinepool/handler/nodepool/deployment.go b/service/controller/azuremachinepool/handler/nodepool/deployment.go index 737d4daaa5..fd4685f3e9 100644 --- a/service/controller/azuremachinepool/handler/nodepool/deployment.go +++ b/service/controller/azuremachinepool/handler/nodepool/deployment.go @@ -20,15 +20,15 @@ import ( capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/azuremachinepool/handler/nodepool/template" - - "github.com/giantswarm/azure-operator/v6/pkg/helpers/vmss" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/service/controller/blobclient" - "github.com/giantswarm/azure-operator/v6/service/controller/encrypter" - "github.com/giantswarm/azure-operator/v6/service/controller/internal/vmsku" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/azuremachinepool/handler/nodepool/template" + + "github.com/giantswarm/azure-operator/v7/pkg/helpers/vmss" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v7/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v7/service/controller/internal/vmsku" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r Resource) getDesiredDeployment(ctx context.Context, storageAccountsClient *storage.AccountsClient, release *releasev1alpha1.Release, machinePool *capiexp.MachinePool, azureMachinePool *capzexp.AzureMachinePool, azureCluster *capz.AzureCluster, vmss compute.VirtualMachineScaleSet) (azureresource.Deployment, error) { diff --git a/service/controller/azuremachinepool/handler/nodepool/drain_old_workers.go b/service/controller/azuremachinepool/handler/nodepool/drain_old_workers.go index 2a7ca305e0..2f490ea585 100644 --- a/service/controller/azuremachinepool/handler/nodepool/drain_old_workers.go +++ b/service/controller/azuremachinepool/handler/nodepool/drain_old_workers.go @@ -8,11 +8,11 @@ import ( "github.com/giantswarm/microerror" "sigs.k8s.io/cluster-api/util" - "github.com/giantswarm/azure-operator/v6/pkg/drainer" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/drainer" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/controller/key" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" ) func (r *Resource) drainOldWorkerInstances(ctx context.Context, obj interface{}, currentState state.State) (state.State, error) { diff --git a/service/controller/azuremachinepool/handler/nodepool/resource.go b/service/controller/azuremachinepool/handler/nodepool/resource.go index 3386522c51..7140459558 100644 --- a/service/controller/azuremachinepool/handler/nodepool/resource.go +++ b/service/controller/azuremachinepool/handler/nodepool/resource.go @@ -4,10 +4,10 @@ import ( "github.com/Azure/go-autorest/autorest/azure/auth" "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/pkg/credential" - "github.com/giantswarm/azure-operator/v6/pkg/handler/nodes" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/controller/internal/vmsku" + "github.com/giantswarm/azure-operator/v7/pkg/credential" + "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/controller/internal/vmsku" ) const ( diff --git a/service/controller/azuremachinepool/handler/nodepool/status.go b/service/controller/azuremachinepool/handler/nodepool/status.go index 7ece0b8b0b..0f6ba310da 100644 --- a/service/controller/azuremachinepool/handler/nodepool/status.go +++ b/service/controller/azuremachinepool/handler/nodepool/status.go @@ -7,7 +7,7 @@ import ( capzexp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/annotation" + "github.com/giantswarm/azure-operator/v7/pkg/annotation" ) const ( diff --git a/service/controller/azuremachinepool/handler/spark/create.go b/service/controller/azuremachinepool/handler/spark/create.go index 809c47bedd..46e82a9dee 100644 --- a/service/controller/azuremachinepool/handler/spark/create.go +++ b/service/controller/azuremachinepool/handler/spark/create.go @@ -31,11 +31,11 @@ import ( capiutil "sigs.k8s.io/cluster-api/util" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/service/controller/cloudconfig" - "github.com/giantswarm/azure-operator/v6/service/controller/encrypter" - "github.com/giantswarm/azure-operator/v6/service/controller/key" - "github.com/giantswarm/azure-operator/v6/service/network" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/service/controller/cloudconfig" + "github.com/giantswarm/azure-operator/v7/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/network" ) const ( diff --git a/service/controller/azuremachinepool/handler/spark/delete.go b/service/controller/azuremachinepool/handler/spark/delete.go index 7953bcf642..73e6c6fdc2 100644 --- a/service/controller/azuremachinepool/handler/spark/delete.go +++ b/service/controller/azuremachinepool/handler/spark/delete.go @@ -10,7 +10,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) // EnsureDeleted will delete the `Spark` CR that was created for this specific node pool, and the `Secret` referenced by it. diff --git a/service/controller/azuremachinepool/handler/spark/delete_test.go b/service/controller/azuremachinepool/handler/spark/delete_test.go index 4043502168..520902b0cc 100644 --- a/service/controller/azuremachinepool/handler/spark/delete_test.go +++ b/service/controller/azuremachinepool/handler/spark/delete_test.go @@ -12,7 +12,7 @@ import ( capzexp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/unittest" + "github.com/giantswarm/azure-operator/v7/service/unittest" ) func TestSparkCRIsDeletedWhenDeletingNodePool(t *testing.T) { diff --git a/service/controller/azuremachinepool/handler/spark/resource.go b/service/controller/azuremachinepool/handler/spark/resource.go index e61161f423..8c01ea5486 100644 --- a/service/controller/azuremachinepool/handler/spark/resource.go +++ b/service/controller/azuremachinepool/handler/spark/resource.go @@ -5,12 +5,12 @@ import ( "github.com/giantswarm/certs/v4/pkg/certs" - v5client "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/pkg/credential" - "github.com/giantswarm/azure-operator/v6/pkg/employees" - "github.com/giantswarm/azure-operator/v6/service/controller/encrypter" - "github.com/giantswarm/azure-operator/v6/service/controller/key" - "github.com/giantswarm/azure-operator/v6/service/controller/setting" + v5client "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/pkg/credential" + "github.com/giantswarm/azure-operator/v7/pkg/employees" + "github.com/giantswarm/azure-operator/v7/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/setting" "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" diff --git a/service/controller/cloudconfig/base_extension.go b/service/controller/cloudconfig/base_extension.go index b9ae5a5bf0..cd1b110807 100644 --- a/service/controller/cloudconfig/base_extension.go +++ b/service/controller/cloudconfig/base_extension.go @@ -6,9 +6,9 @@ import ( "github.com/giantswarm/certs/v4/pkg/certs" capzexp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" - "github.com/giantswarm/azure-operator/v6/service/controller/encrypter" - "github.com/giantswarm/azure-operator/v6/service/controller/key" - "github.com/giantswarm/azure-operator/v6/service/controller/setting" + "github.com/giantswarm/azure-operator/v7/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/setting" ) type baseExtension struct { diff --git a/service/controller/cloudconfig/cloud_config.go b/service/controller/cloudconfig/cloud_config.go index 4379ba6964..676d6dde99 100644 --- a/service/controller/cloudconfig/cloud_config.go +++ b/service/controller/cloudconfig/cloud_config.go @@ -7,7 +7,7 @@ import ( "github.com/giantswarm/micrologger" ctrl "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/setting" + "github.com/giantswarm/azure-operator/v7/service/controller/setting" ) const ( diff --git a/service/controller/cloudconfig/interface.go b/service/controller/cloudconfig/interface.go index 5bf72fd123..6d41363876 100644 --- a/service/controller/cloudconfig/interface.go +++ b/service/controller/cloudconfig/interface.go @@ -3,7 +3,7 @@ package cloudconfig import ( "context" - "github.com/giantswarm/azure-operator/v6/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v7/service/controller/encrypter" ) type Interface interface { diff --git a/service/controller/cloudconfig/master_template.go b/service/controller/cloudconfig/master_template.go index d973b1623c..1e222da390 100644 --- a/service/controller/cloudconfig/master_template.go +++ b/service/controller/cloudconfig/master_template.go @@ -9,9 +9,9 @@ import ( k8scloudconfig "github.com/giantswarm/k8scloudconfig/v15/pkg/template" "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/service/controller/encrypter" - "github.com/giantswarm/azure-operator/v6/service/controller/key" - "github.com/giantswarm/azure-operator/v6/service/controller/templates/ignition" + "github.com/giantswarm/azure-operator/v7/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/templates/ignition" ) const ( diff --git a/service/controller/cloudconfig/worker_template.go b/service/controller/cloudconfig/worker_template.go index 9a8e676c89..d2e236a395 100644 --- a/service/controller/cloudconfig/worker_template.go +++ b/service/controller/cloudconfig/worker_template.go @@ -9,10 +9,10 @@ import ( "github.com/giantswarm/k8smetadata/pkg/annotation" "github.com/giantswarm/microerror" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/service/controller/encrypter" - "github.com/giantswarm/azure-operator/v6/service/controller/key" - "github.com/giantswarm/azure-operator/v6/service/controller/templates/ignition" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/templates/ignition" ) // NewWorkerCloudConfig generates a new worker cloudconfig and returns it as a diff --git a/service/controller/cluster/controller.go b/service/controller/cluster/controller.go index c1bd385d6b..e18659f0c2 100644 --- a/service/controller/cluster/controller.go +++ b/service/controller/cluster/controller.go @@ -18,14 +18,14 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/controller/cluster/handler/clusterdependents" - "github.com/giantswarm/azure-operator/v6/service/controller/cluster/handler/clusterownerreference" - "github.com/giantswarm/azure-operator/v6/service/controller/cluster/handler/clusterreleaseversion" - "github.com/giantswarm/azure-operator/v6/service/controller/cluster/handler/clusterupgrade" - "github.com/giantswarm/azure-operator/v6/service/controller/setting" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/controller/cluster/handler/clusterdependents" + "github.com/giantswarm/azure-operator/v7/service/controller/cluster/handler/clusterownerreference" + "github.com/giantswarm/azure-operator/v7/service/controller/cluster/handler/clusterreleaseversion" + "github.com/giantswarm/azure-operator/v7/service/controller/cluster/handler/clusterupgrade" + "github.com/giantswarm/azure-operator/v7/service/controller/setting" ) type ControllerConfig struct { diff --git a/service/controller/cluster/handler/clusterdependents/resource.go b/service/controller/cluster/handler/clusterdependents/resource.go index f190dd0dc8..cd33dbd843 100644 --- a/service/controller/cluster/handler/clusterdependents/resource.go +++ b/service/controller/cluster/handler/clusterdependents/resource.go @@ -13,7 +13,7 @@ import ( capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/cluster/handler/clusterownerreference/controlplane.go b/service/controller/cluster/handler/clusterownerreference/controlplane.go index a0ef7dd46c..359c1b2f97 100644 --- a/service/controller/cluster/handler/clusterownerreference/controlplane.go +++ b/service/controller/cluster/handler/clusterownerreference/controlplane.go @@ -12,7 +12,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) ensureControlPlane(ctx context.Context, cluster *capi.Cluster) error { diff --git a/service/controller/cluster/handler/clusterownerreference/resource.go b/service/controller/cluster/handler/clusterownerreference/resource.go index dfd50522e4..8298c4c8f3 100644 --- a/service/controller/cluster/handler/clusterownerreference/resource.go +++ b/service/controller/cluster/handler/clusterownerreference/resource.go @@ -15,7 +15,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/cluster/handler/clusterownerreference/resource_test.go b/service/controller/cluster/handler/clusterownerreference/resource_test.go index 012fa257e9..d96b504ce7 100644 --- a/service/controller/cluster/handler/clusterownerreference/resource_test.go +++ b/service/controller/cluster/handler/clusterownerreference/resource_test.go @@ -13,8 +13,8 @@ import ( capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/service/unittest" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/service/unittest" ) const ( diff --git a/service/controller/cluster/handler/clusterreleaseversion/checkupgradeprogress.go b/service/controller/cluster/handler/clusterreleaseversion/checkupgradeprogress.go index ff4145e28a..35f5d52536 100644 --- a/service/controller/cluster/handler/clusterreleaseversion/checkupgradeprogress.go +++ b/service/controller/cluster/handler/clusterreleaseversion/checkupgradeprogress.go @@ -11,8 +11,8 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/helpers" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/helpers" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) isUpgradeCompleted(ctx context.Context, cluster *capi.Cluster) (bool, error) { diff --git a/service/controller/cluster/handler/clusterreleaseversion/create.go b/service/controller/cluster/handler/clusterreleaseversion/create.go index 7196f4dd6e..8334036752 100644 --- a/service/controller/cluster/handler/clusterreleaseversion/create.go +++ b/service/controller/cluster/handler/clusterreleaseversion/create.go @@ -7,8 +7,8 @@ import ( "github.com/giantswarm/conditions/pkg/conditions" "github.com/giantswarm/microerror" - azopannotation "github.com/giantswarm/azure-operator/v6/pkg/annotation" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + azopannotation "github.com/giantswarm/azure-operator/v7/pkg/annotation" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, cr interface{}) error { diff --git a/service/controller/cluster/handler/clusterupgrade/create.go b/service/controller/cluster/handler/clusterupgrade/create.go index ad64c561de..d502d3b5ec 100644 --- a/service/controller/cluster/handler/clusterupgrade/create.go +++ b/service/controller/cluster/handler/clusterupgrade/create.go @@ -14,10 +14,10 @@ import ( capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/helpers" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/helpers" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/cluster/handler/clusterupgrade/resource.go b/service/controller/cluster/handler/clusterupgrade/resource.go index e57981629f..b40c060247 100644 --- a/service/controller/cluster/handler/clusterupgrade/resource.go +++ b/service/controller/cluster/handler/clusterupgrade/resource.go @@ -5,7 +5,7 @@ import ( "github.com/giantswarm/micrologger" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" ) const ( diff --git a/service/controller/controllercontext/context.go b/service/controller/controllercontext/context.go index dcaf67a411..c2c770d726 100644 --- a/service/controller/controllercontext/context.go +++ b/service/controller/controllercontext/context.go @@ -7,8 +7,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/release-operator/v3/api/v1alpha1" - "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/service/controller/cloudconfig" + "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/service/controller/cloudconfig" ) type contextKey string diff --git a/service/controller/debugger/debugger.go b/service/controller/debugger/debugger.go index 4a462be3cd..cebf8b037c 100644 --- a/service/controller/debugger/debugger.go +++ b/service/controller/debugger/debugger.go @@ -8,7 +8,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) type Config struct { diff --git a/service/controller/internal/vmsku/vmsku.go b/service/controller/internal/vmsku/vmsku.go index 384a7cbb55..e927ce48be 100644 --- a/service/controller/internal/vmsku/vmsku.go +++ b/service/controller/internal/vmsku/vmsku.go @@ -10,7 +10,7 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/azure-operator/v6/client" + "github.com/giantswarm/azure-operator/v7/client" ) const ( diff --git a/service/controller/key/common.go b/service/controller/key/common.go index d4b547a3d8..1c1fee5c49 100644 --- a/service/controller/key/common.go +++ b/service/controller/key/common.go @@ -9,8 +9,8 @@ import ( releasev1alpha1 "github.com/giantswarm/release-operator/v3/api/v1alpha1" capi "sigs.k8s.io/cluster-api/api/v1beta1" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/pkg/normalize" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/normalize" ) const ( diff --git a/service/controller/key/key.go b/service/controller/key/key.go index 62cc95e57e..ff394078aa 100644 --- a/service/controller/key/key.go +++ b/service/controller/key/key.go @@ -21,10 +21,10 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" - "github.com/giantswarm/azure-operator/v6/pkg/annotation" - "github.com/giantswarm/azure-operator/v6/pkg/employees" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/service/controller/templates/ignition" + "github.com/giantswarm/azure-operator/v7/pkg/annotation" + "github.com/giantswarm/azure-operator/v7/pkg/employees" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/service/controller/templates/ignition" ) const ( diff --git a/service/controller/key/key_test.go b/service/controller/key/key_test.go index dc547e2490..75bccdcfd5 100644 --- a/service/controller/key/key_test.go +++ b/service/controller/key/key_test.go @@ -10,7 +10,7 @@ import ( v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/azure-operator/v6/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/label" ) func Test_ClusterID(t *testing.T) { diff --git a/service/controller/machinepool/controller.go b/service/controller/machinepool/controller.go index fa96c849db..0fc66ff195 100644 --- a/service/controller/machinepool/controller.go +++ b/service/controller/machinepool/controller.go @@ -18,14 +18,14 @@ import ( capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/controller/machinepool/handler/machinepooldependents" - "github.com/giantswarm/azure-operator/v6/service/controller/machinepool/handler/machinepoolownerreference" - "github.com/giantswarm/azure-operator/v6/service/controller/machinepool/handler/machinepoolupgrade" - "github.com/giantswarm/azure-operator/v6/service/controller/machinepool/handler/migration" - "github.com/giantswarm/azure-operator/v6/service/controller/machinepool/handler/nodestatus" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/controller/machinepool/handler/machinepooldependents" + "github.com/giantswarm/azure-operator/v7/service/controller/machinepool/handler/machinepoolownerreference" + "github.com/giantswarm/azure-operator/v7/service/controller/machinepool/handler/machinepoolupgrade" + "github.com/giantswarm/azure-operator/v7/service/controller/machinepool/handler/migration" + "github.com/giantswarm/azure-operator/v7/service/controller/machinepool/handler/nodestatus" ) type ControllerConfig struct { diff --git a/service/controller/machinepool/handler/machinepooldependents/resource.go b/service/controller/machinepool/handler/machinepooldependents/resource.go index df8114ea62..5eb7eeae8c 100644 --- a/service/controller/machinepool/handler/machinepooldependents/resource.go +++ b/service/controller/machinepool/handler/machinepooldependents/resource.go @@ -11,7 +11,7 @@ import ( capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/machinepool/handler/machinepoolownerreference/resource.go b/service/controller/machinepool/handler/machinepoolownerreference/resource.go index d637931fdf..76516ee459 100644 --- a/service/controller/machinepool/handler/machinepoolownerreference/resource.go +++ b/service/controller/machinepool/handler/machinepoolownerreference/resource.go @@ -15,7 +15,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/machinepool/handler/machinepoolownerreference/resource_test.go b/service/controller/machinepool/handler/machinepoolownerreference/resource_test.go index 8e85055edf..1e74e785c1 100644 --- a/service/controller/machinepool/handler/machinepoolownerreference/resource_test.go +++ b/service/controller/machinepool/handler/machinepoolownerreference/resource_test.go @@ -13,7 +13,7 @@ import ( capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/unittest" + "github.com/giantswarm/azure-operator/v7/service/unittest" ) func TestThatMachinePoolAndAzureMachinePoolAreLabeledWithClusterId(t *testing.T) { diff --git a/service/controller/machinepool/handler/machinepoolupgrade/lastdeployedreleaseversion.go b/service/controller/machinepool/handler/machinepoolupgrade/lastdeployedreleaseversion.go index 4758ccb3a9..f92301f4ac 100644 --- a/service/controller/machinepool/handler/machinepoolupgrade/lastdeployedreleaseversion.go +++ b/service/controller/machinepool/handler/machinepoolupgrade/lastdeployedreleaseversion.go @@ -14,8 +14,8 @@ import ( "sigs.k8s.io/cluster-api/util" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) func (r *Resource) ensureLastDeployedReleaseVersion(ctx context.Context, machinePool *capiexp.MachinePool) error { diff --git a/service/controller/machinepool/handler/machinepoolupgrade/resource.go b/service/controller/machinepool/handler/machinepoolupgrade/resource.go index 7c87aae969..ebeadaeee8 100644 --- a/service/controller/machinepool/handler/machinepoolupgrade/resource.go +++ b/service/controller/machinepool/handler/machinepoolupgrade/resource.go @@ -11,8 +11,8 @@ import ( capzexp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/machinepool/handler/migration/machinepool_test.go b/service/controller/machinepool/handler/migration/machinepool_test.go index cd7723adb3..30c70535f7 100644 --- a/service/controller/machinepool/handler/migration/machinepool_test.go +++ b/service/controller/machinepool/handler/migration/machinepool_test.go @@ -11,7 +11,7 @@ import ( "k8s.io/apimachinery/pkg/types" capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" - "github.com/giantswarm/azure-operator/v6/service/unittest" + "github.com/giantswarm/azure-operator/v7/service/unittest" ) func TestEnsureCreatedMachinePoolIsCorrect(t *testing.T) { diff --git a/service/controller/machinepool/handler/migration/resource.go b/service/controller/machinepool/handler/migration/resource.go index 78d8e4c98d..680f4e90f7 100644 --- a/service/controller/machinepool/handler/migration/resource.go +++ b/service/controller/machinepool/handler/migration/resource.go @@ -14,8 +14,8 @@ import ( capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/machinepoolmigration" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/machinepoolmigration" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/machinepool/handler/nodestatus/create.go b/service/controller/machinepool/handler/nodestatus/create.go index 42bcdc3794..e8fc87c2c8 100644 --- a/service/controller/machinepool/handler/nodestatus/create.go +++ b/service/controller/machinepool/handler/nodestatus/create.go @@ -13,8 +13,8 @@ import ( "sigs.k8s.io/cluster-api/util" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) type getNodeReferencesResult struct { diff --git a/service/controller/machinepool/handler/nodestatus/create_test.go b/service/controller/machinepool/handler/nodestatus/create_test.go index 3d38a4cb8d..69c5a55d77 100644 --- a/service/controller/machinepool/handler/nodestatus/create_test.go +++ b/service/controller/machinepool/handler/nodestatus/create_test.go @@ -15,8 +15,8 @@ import ( capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/mock/mock_tenantcluster" - "github.com/giantswarm/azure-operator/v6/service/unittest" + "github.com/giantswarm/azure-operator/v7/pkg/mock/mock_tenantcluster" + "github.com/giantswarm/azure-operator/v7/service/unittest" ) func Test_NodeStatusIsSaved(t *testing.T) { diff --git a/service/controller/machinepool/handler/nodestatus/resource.go b/service/controller/machinepool/handler/nodestatus/resource.go index 6a368818c9..805e66ed01 100644 --- a/service/controller/machinepool/handler/nodestatus/resource.go +++ b/service/controller/machinepool/handler/nodestatus/resource.go @@ -5,7 +5,7 @@ import ( "github.com/giantswarm/micrologger" ctrlclient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" ) const ( diff --git a/service/controller/machinepoolexp/controller.go b/service/controller/machinepoolexp/controller.go index 4f2fdacd69..86d102cab2 100644 --- a/service/controller/machinepoolexp/controller.go +++ b/service/controller/machinepoolexp/controller.go @@ -14,9 +14,9 @@ import ( "k8s.io/apimachinery/pkg/labels" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/service/controller/machinepoolexp/handler/migration" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/service/controller/machinepoolexp/handler/migration" ) type ControllerConfig struct { diff --git a/service/controller/machinepoolexp/handler/migration/azuremachinepool.go b/service/controller/machinepoolexp/handler/migration/azuremachinepool.go index 249753911f..b181aca712 100644 --- a/service/controller/machinepoolexp/handler/migration/azuremachinepool.go +++ b/service/controller/machinepoolexp/handler/migration/azuremachinepool.go @@ -11,7 +11,7 @@ import ( capzexp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" "sigs.k8s.io/cluster-api/exp/api/v1beta1" - "github.com/giantswarm/azure-operator/v6/pkg/machinepoolmigration" + "github.com/giantswarm/azure-operator/v7/pkg/machinepoolmigration" ) func (r *Resource) newAzureMachinePoolExists(ctx context.Context, namespacedName types.NamespacedName) (bool, error) { diff --git a/service/controller/machinepoolexp/handler/migration/machinepool.go b/service/controller/machinepoolexp/handler/migration/machinepool.go index c08e98250e..fe69bdcc2c 100644 --- a/service/controller/machinepoolexp/handler/migration/machinepool.go +++ b/service/controller/machinepoolexp/handler/migration/machinepool.go @@ -10,7 +10,7 @@ import ( capiexpv1alpha3 "sigs.k8s.io/cluster-api/exp/api/v1alpha3" capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" - "github.com/giantswarm/azure-operator/v6/pkg/machinepoolmigration" + "github.com/giantswarm/azure-operator/v7/pkg/machinepoolmigration" ) const ( diff --git a/service/controller/machinepoolexp/handler/migration/resource.go b/service/controller/machinepoolexp/handler/migration/resource.go index 14c505466b..0283fbb749 100644 --- a/service/controller/machinepoolexp/handler/migration/resource.go +++ b/service/controller/machinepoolexp/handler/migration/resource.go @@ -8,7 +8,7 @@ import ( "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/templates/templates_test.go b/service/controller/templates/templates_test.go index 0bb4500d18..4ee7358596 100644 --- a/service/controller/templates/templates_test.go +++ b/service/controller/templates/templates_test.go @@ -3,7 +3,7 @@ package templates_test import ( "testing" - "github.com/giantswarm/azure-operator/v6/service/controller/templates" + "github.com/giantswarm/azure-operator/v7/service/controller/templates" ) func TestRender(t *testing.T) { diff --git a/service/controller/unhealthynode/controller.go b/service/controller/unhealthynode/controller.go index d82ab539f9..504a382fde 100644 --- a/service/controller/unhealthynode/controller.go +++ b/service/controller/unhealthynode/controller.go @@ -17,12 +17,12 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/pkg/credential" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/service/collector" - "github.com/giantswarm/azure-operator/v6/service/controller/unhealthynode/handler/terminateunhealthynode" + "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/pkg/credential" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/service/collector" + "github.com/giantswarm/azure-operator/v7/service/controller/unhealthynode/handler/terminateunhealthynode" ) type ControllerConfig struct { diff --git a/service/controller/unhealthynode/handler/terminateunhealthynode/create.go b/service/controller/unhealthynode/handler/terminateunhealthynode/create.go index 8194cb6db6..aa0241ee47 100644 --- a/service/controller/unhealthynode/handler/terminateunhealthynode/create.go +++ b/service/controller/unhealthynode/handler/terminateunhealthynode/create.go @@ -18,7 +18,7 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/service/controller/key" + "github.com/giantswarm/azure-operator/v7/service/controller/key" ) const ( diff --git a/service/controller/unhealthynode/handler/terminateunhealthynode/resource.go b/service/controller/unhealthynode/handler/terminateunhealthynode/resource.go index 1f74f38033..9cf1b5eaff 100644 --- a/service/controller/unhealthynode/handler/terminateunhealthynode/resource.go +++ b/service/controller/unhealthynode/handler/terminateunhealthynode/resource.go @@ -6,7 +6,7 @@ import ( "github.com/giantswarm/tenantcluster/v6/pkg/tenantcluster" "sigs.k8s.io/controller-runtime/pkg/client" - azureclient "github.com/giantswarm/azure-operator/v6/client" + azureclient "github.com/giantswarm/azure-operator/v7/client" ) const ( diff --git a/service/service.go b/service/service.go index a326bdf19e..9b0cfdee32 100644 --- a/service/service.go +++ b/service/service.go @@ -29,23 +29,23 @@ import ( capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" ctrl "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/azure-operator/v6/client" - "github.com/giantswarm/azure-operator/v6/flag" - "github.com/giantswarm/azure-operator/v6/pkg/credential" - "github.com/giantswarm/azure-operator/v6/pkg/employees" - "github.com/giantswarm/azure-operator/v6/pkg/label" - "github.com/giantswarm/azure-operator/v6/pkg/locker" - "github.com/giantswarm/azure-operator/v6/pkg/project" - "github.com/giantswarm/azure-operator/v6/service/collector" - "github.com/giantswarm/azure-operator/v6/service/controller/azurecluster" - "github.com/giantswarm/azure-operator/v6/service/controller/azureconfig" - "github.com/giantswarm/azure-operator/v6/service/controller/azuremachine" - "github.com/giantswarm/azure-operator/v6/service/controller/azuremachinepool" - "github.com/giantswarm/azure-operator/v6/service/controller/cluster" - "github.com/giantswarm/azure-operator/v6/service/controller/machinepool" - "github.com/giantswarm/azure-operator/v6/service/controller/machinepoolexp" - "github.com/giantswarm/azure-operator/v6/service/controller/setting" - "github.com/giantswarm/azure-operator/v6/service/controller/unhealthynode" + "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v7/flag" + "github.com/giantswarm/azure-operator/v7/pkg/credential" + "github.com/giantswarm/azure-operator/v7/pkg/employees" + "github.com/giantswarm/azure-operator/v7/pkg/label" + "github.com/giantswarm/azure-operator/v7/pkg/locker" + "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v7/service/collector" + "github.com/giantswarm/azure-operator/v7/service/controller/azurecluster" + "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig" + "github.com/giantswarm/azure-operator/v7/service/controller/azuremachine" + "github.com/giantswarm/azure-operator/v7/service/controller/azuremachinepool" + "github.com/giantswarm/azure-operator/v7/service/controller/cluster" + "github.com/giantswarm/azure-operator/v7/service/controller/machinepool" + "github.com/giantswarm/azure-operator/v7/service/controller/machinepoolexp" + "github.com/giantswarm/azure-operator/v7/service/controller/setting" + "github.com/giantswarm/azure-operator/v7/service/controller/unhealthynode" ) // Config represents the configuration used to create a new service.