diff --git a/CHANGELOG.md b/CHANGELOG.md index 64ce44eed..8ebd7d7d3 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] +## [8.0.0] - 2023-05-16 + ### Added - Add new control-plane label to detect master nodes. @@ -655,7 +657,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 -[Unreleased]: https://github.com/giantswarm/azure-operator/compare/v7.2.0...HEAD +[Unreleased]: https://github.com/giantswarm/azure-operator/compare/v8.0.0...HEAD +[8.0.0]: https://github.com/giantswarm/azure-operator/compare/v7.2.0...v8.0.0 [7.2.0]: https://github.com/giantswarm/azure-operator/compare/v7.1.0...v7.2.0 [7.1.0]: https://github.com/giantswarm/azure-operator/compare/v7.0.0...v7.1.0 [7.0.0]: https://github.com/giantswarm/azure-operator/compare/v6.0.3...v7.0.0 diff --git a/client/azure_client_set.go b/client/azure_client_set.go index 0711e3024..332d562eb 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/v7/client/senddecorator" - "github.com/giantswarm/azure-operator/v7/pkg/backpressure" - "github.com/giantswarm/azure-operator/v7/service/collector" + "github.com/giantswarm/azure-operator/v8/client/senddecorator" + "github.com/giantswarm/azure-operator/v8/pkg/backpressure" + "github.com/giantswarm/azure-operator/v8/service/collector" ) const ( diff --git a/client/factory.go b/client/factory.go index 90d022bb5..30d0956b0 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/v7/pkg/credential" - "github.com/giantswarm/azure-operator/v7/service/collector" + "github.com/giantswarm/azure-operator/v8/pkg/credential" + "github.com/giantswarm/azure-operator/v8/service/collector" ) const ( diff --git a/client/organization_factory.go b/client/organization_factory.go index 634f5c053..2cb750e08 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/v7/pkg/label" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/client/senddecorator/metrics.go b/client/senddecorator/metrics.go index 9c17d487d..05a3b552a 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/v7/service/collector" + "github.com/giantswarm/azure-operator/v8/service/collector" ) const metricsNamespace = "azure_operator_azure_api" diff --git a/client/senddecorator/ratelimit_circuitbreaker.go b/client/senddecorator/ratelimit_circuitbreaker.go index 3083ed84e..e5d81e732 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/v7/pkg/backpressure" - "github.com/giantswarm/azure-operator/v7/pkg/httputil" + "github.com/giantswarm/azure-operator/v8/pkg/backpressure" + "github.com/giantswarm/azure-operator/v8/pkg/httputil" ) const ( diff --git a/flag/flag.go b/flag/flag.go index 59674e422..c10961636 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/v7/flag/service" + "github.com/giantswarm/azure-operator/v8/flag/service" ) type Flag struct { diff --git a/flag/service/azure/azure.go b/flag/service/azure/azure.go index e60e6704d..18b57683a 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/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" + "github.com/giantswarm/azure-operator/v8/flag/service/azure/hostcluster" + "github.com/giantswarm/azure-operator/v8/flag/service/azure/msi" + "github.com/giantswarm/azure-operator/v8/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 e482a1feb..06f6cd959 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/v7/flag/service/azure/hostcluster/tenant" + "github.com/giantswarm/azure-operator/v8/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 8694dc5c3..ffa0c7782 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/v7/flag/service/azure/template/uri" + "github.com/giantswarm/azure-operator/v8/flag/service/azure/template/uri" ) type Template struct { diff --git a/flag/service/cluster/cluster.go b/flag/service/cluster/cluster.go index 7a819bbe3..baf04520a 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/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" + "github.com/giantswarm/azure-operator/v8/flag/service/cluster/calico" + "github.com/giantswarm/azure-operator/v8/flag/service/cluster/docker" + "github.com/giantswarm/azure-operator/v8/flag/service/cluster/etcd" + "github.com/giantswarm/azure-operator/v8/flag/service/cluster/kubernetes" ) type Cluster struct { diff --git a/flag/service/cluster/docker/docker.go b/flag/service/cluster/docker/docker.go index c6eb74929..e1a0e670a 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/v7/flag/service/cluster/docker/daemon" + "github.com/giantswarm/azure-operator/v8/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 c668c66ca..1b416e98f 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/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" + "github.com/giantswarm/azure-operator/v8/flag/service/cluster/kubernetes/api" + "github.com/giantswarm/azure-operator/v8/flag/service/cluster/kubernetes/ingress" + "github.com/giantswarm/azure-operator/v8/flag/service/cluster/kubernetes/kubelet" + "github.com/giantswarm/azure-operator/v8/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 4bc2ed73d..ef3e8343e 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/v7/flag/service/installation/guest/ipam" + "github.com/giantswarm/azure-operator/v8/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 d7ff0ed09..2821fedde 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/v7/flag/service/installation/guest/ipam/network" +import "github.com/giantswarm/azure-operator/v8/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 c55e00565..fe2f0b894 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/v7/flag/service/installation/guest" - "github.com/giantswarm/azure-operator/v7/flag/service/installation/tenant" + "github.com/giantswarm/azure-operator/v8/flag/service/installation/guest" + "github.com/giantswarm/azure-operator/v8/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 5b5f9928a..9844ebf16 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/v7/flag/service/installation/tenant/kubernetes/api/auth" + "github.com/giantswarm/azure-operator/v8/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 4383e0e4f..0418eef76 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/v7/flag/service/installation/tenant/kubernetes/api/auth/provider" + "github.com/giantswarm/azure-operator/v8/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 b31ff2dba..ab3a01eb2 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/v7/flag/service/installation/tenant/kubernetes/api/auth/provider/oidc" + "github.com/giantswarm/azure-operator/v8/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 fc788dc9a..5ca91511b 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/v7/flag/service/installation/tenant/kubernetes/api" + "github.com/giantswarm/azure-operator/v8/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 f2aa1221c..63d850249 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/v7/flag/service/installation/tenant/kubernetes" + "github.com/giantswarm/azure-operator/v8/flag/service/installation/tenant/kubernetes" ) type Tenant struct { diff --git a/flag/service/service.go b/flag/service/service.go index 8302c3904..e31214fcd 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/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" + "github.com/giantswarm/azure-operator/v8/flag/service/azure" + "github.com/giantswarm/azure-operator/v8/flag/service/cluster" + "github.com/giantswarm/azure-operator/v8/flag/service/debug" + "github.com/giantswarm/azure-operator/v8/flag/service/installation" + "github.com/giantswarm/azure-operator/v8/flag/service/registry" + "github.com/giantswarm/azure-operator/v8/flag/service/sentry" + "github.com/giantswarm/azure-operator/v8/flag/service/tenant" ) type Service struct { diff --git a/flag/service/tenant/tenant.go b/flag/service/tenant/tenant.go index 117a1be4a..ffe394666 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/v7/flag/service/tenant/ignition" - "github.com/giantswarm/azure-operator/v7/flag/service/tenant/ssh" + "github.com/giantswarm/azure-operator/v8/flag/service/tenant/ignition" + "github.com/giantswarm/azure-operator/v8/flag/service/tenant/ssh" ) type Tenant struct { diff --git a/go.mod b/go.mod index 1db0cb425..dd20509e2 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/giantswarm/azure-operator/v7 +module github.com/giantswarm/azure-operator/v8 go 1.18 diff --git a/integration/test/crmapping/crmapping_test.go b/integration/test/crmapping/crmapping_test.go index 3c4b2905c..7593b2a43 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/v7/client" - "github.com/giantswarm/azure-operator/v7/service/controller/azurecluster/handler/azureconfig" - "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/capzcrs" + client2 "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/service/controller/azurecluster/handler/azureconfig" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/capzcrs" ) var update = flag.Bool("update", false, "update .golden reference files") diff --git a/main.go b/main.go index 95444b307..6f7533552 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/v7/flag" - "github.com/giantswarm/azure-operator/v7/pkg/project" - "github.com/giantswarm/azure-operator/v7/server" - "github.com/giantswarm/azure-operator/v7/service" + "github.com/giantswarm/azure-operator/v8/flag" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/server" + "github.com/giantswarm/azure-operator/v8/service" ) var ( diff --git a/pkg/azureconditions/deploymentchecker.go b/pkg/azureconditions/deploymentchecker.go index 932a0f742..af0a9e83b 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/pkg/checksum/checksum_test.go b/pkg/checksum/checksum_test.go index b644776c0..206f0e483 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/v7/pkg/helpers/vmss" - "github.com/giantswarm/azure-operator/v7/service/controller/key" - "github.com/giantswarm/azure-operator/v7/service/controller/templates" + "github.com/giantswarm/azure-operator/v8/pkg/helpers/vmss" + "github.com/giantswarm/azure-operator/v8/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/templates" ) func Test_getDeploymentTemplateChecksum(t *testing.T) { diff --git a/pkg/credential/credential.go b/pkg/credential/credential.go index 16efb58de..98e730944 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/v7/pkg/label" + "github.com/giantswarm/azure-operator/v8/pkg/label" ) const ( diff --git a/pkg/credential/credential_test.go b/pkg/credential/credential_test.go index a0164e5d5..0c9020f48 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/v7/pkg/label" - "github.com/giantswarm/azure-operator/v7/service/controller/key" - "github.com/giantswarm/azure-operator/v7/service/unittest" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/unittest" ) const ( diff --git a/pkg/handler/ipam/azure_config_checker.go b/pkg/handler/ipam/azure_config_checker.go index ee06d95d3..201720b1b 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 d5da209df..8abae4438 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/v7/service/network" + "github.com/giantswarm/azure-operator/v8/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 28c661236..b9d84e0cd 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/v7/pkg/helpers" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/helpers" + "github.com/giantswarm/azure-operator/v8/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 43ca19155..9062d3204 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/v7/pkg/helpers" + "github.com/giantswarm/azure-operator/v8/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 b1c029148..f7c0beeb5 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/v7/client" - "github.com/giantswarm/azure-operator/v7/pkg/helpers" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/pkg/helpers" + "github.com/giantswarm/azure-operator/v8/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 dacf12e91..03575f27c 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/v7/pkg/helpers" + "github.com/giantswarm/azure-operator/v8/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 25bb47e91..633613da4 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/v7/pkg/helpers" + "github.com/giantswarm/azure-operator/v8/pkg/helpers" ) type AzureMachinePoolSubnetReleaserConfig struct { diff --git a/pkg/handler/ipam/create.go b/pkg/handler/ipam/create.go index 03013dcf1..4217f759e 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/v7/pkg/locker" + "github.com/giantswarm/azure-operator/v8/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 e01b78ff0..7bea09d75 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/v7/pkg/locker" + "github.com/giantswarm/azure-operator/v8/pkg/locker" ) func Test_SubnetAllocator(t *testing.T) { diff --git a/pkg/handler/ipam/delete.go b/pkg/handler/ipam/delete.go index 784468de1..71a69d227 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/v7/pkg/locker" + "github.com/giantswarm/azure-operator/v8/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 3ccf519c8..2bef2a299 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/v7/pkg/locker" + "github.com/giantswarm/azure-operator/v8/pkg/locker" ) const ( diff --git a/pkg/handler/ipam/virtualnetwork_collector.go b/pkg/handler/ipam/virtualnetwork_collector.go index a96515658..07ba64937 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/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" + "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/pkg/credential" + "github.com/giantswarm/azure-operator/v8/service/collector" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) type VirtualNetworkCollectorConfig struct { diff --git a/pkg/handler/nodes/draining.go b/pkg/handler/nodes/draining.go index 17fce4971..21ec5aa09 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/v7/pkg/label" + "github.com/giantswarm/azure-operator/v8/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 37b875ab5..86df7424a 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 6d219e3fa..30feecbe1 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/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" + "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v8/service/controller/debugger" + "github.com/giantswarm/azure-operator/v8/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v8/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/setting" ) type Config struct { diff --git a/pkg/handler/nodes/upgrade.go b/pkg/handler/nodes/upgrade.go index 0dd783146..d917e1324 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 23cdf8cfd..7cf9e9e0d 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/v7/pkg/label" - "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/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 6baa33a0c..0fa509f1c 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/v4/api/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "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" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v8/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 c4ca2ec81..df4417fb9 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 ce701fb33..06baa9d2d 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/v7/service/controller/key" - "github.com/giantswarm/azure-operator/v7/service/controller/templates" + "github.com/giantswarm/azure-operator/v8/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 0919b2ecb..cca4e090b 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/v7/pkg/project" + "github.com/giantswarm/azure-operator/v8/pkg/project" ) const ( diff --git a/pkg/project/project.go b/pkg/project/project.go index fe3d2167e..367a6b3f7 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 = "7.2.1-dev" + version = "8.0.0" ) func Description() string { diff --git a/pkg/tenantcluster/cached.go b/pkg/tenantcluster/cached.go index 02a09f947..d7482887d 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/pkg/tenantcluster/factory.go b/pkg/tenantcluster/factory.go index 3c521f5d6..7074f08a0 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/v7/pkg/project" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) type tenantClientFactory struct { diff --git a/server/endpoint/endpoint.go b/server/endpoint/endpoint.go index e68071306..6ed68cee8 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/v7/service" + "github.com/giantswarm/azure-operator/v8/service" ) type Config struct { diff --git a/server/server.go b/server/server.go index 86ec72922..6eb120409 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/v7/server/endpoint" - "github.com/giantswarm/azure-operator/v7/service" + "github.com/giantswarm/azure-operator/v8/server/endpoint" + "github.com/giantswarm/azure-operator/v8/service" ) type Config struct { diff --git a/service/controller/azurecluster/controller.go b/service/controller/azurecluster/controller.go index 340645898..57af05ffa 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/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" + "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/flag" + "github.com/giantswarm/azure-operator/v8/pkg/credential" + "github.com/giantswarm/azure-operator/v8/pkg/handler/release" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/service/collector" + "github.com/giantswarm/azure-operator/v8/service/controller/azurecluster/handler/azureclusterconditions" + "github.com/giantswarm/azure-operator/v8/service/controller/azurecluster/handler/azureclusterconfig" + "github.com/giantswarm/azure-operator/v8/service/controller/azurecluster/handler/azureclusteridentity" + "github.com/giantswarm/azure-operator/v8/service/controller/azurecluster/handler/azureclusterupgrade" + "github.com/giantswarm/azure-operator/v8/service/controller/azurecluster/handler/azureconfig" + "github.com/giantswarm/azure-operator/v8/service/controller/azurecluster/handler/subnet" + "github.com/giantswarm/azure-operator/v8/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v8/service/controller/debugger" + "github.com/giantswarm/azure-operator/v8/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 14a946540..e9d9a67e3 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/azurecluster/handler/azureclusterconditions/create.go b/service/controller/azurecluster/handler/azureclusterconditions/create.go index 48990db8a..c8b1f247f 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 6b76ca9ba..1c8a7289c 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/v7/client" + azureclient "github.com/giantswarm/azure-operator/v8/client" ) const ( diff --git a/service/controller/azurecluster/handler/azureclusterconfig/create.go b/service/controller/azurecluster/handler/azureclusterconfig/create.go index d3cea43d2..c2aae86a3 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/v7/pkg/label" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/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 4445c1fb4..a8d7b759a 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 a4893053d..a9935ebb0 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/v7/pkg/project" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/azurecluster/handler/azureclusteridentity/resource.go b/service/controller/azurecluster/handler/azureclusteridentity/resource.go index 810a9d1fe..9fd78086a 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/v7/client" + "github.com/giantswarm/azure-operator/v8/client" ) const ( diff --git a/service/controller/azurecluster/handler/azureclusterupgrade/resource.go b/service/controller/azurecluster/handler/azureclusterupgrade/resource.go index 35d955859..c53b71d3f 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/v7/pkg/helpers" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/helpers" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/azurecluster/handler/azureconfig/create.go b/service/controller/azurecluster/handler/azureconfig/create.go index 9e05b778f..79d253492 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/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" + localannotation "github.com/giantswarm/azure-operator/v8/pkg/annotation" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/network" ) const ( diff --git a/service/controller/azurecluster/handler/azureconfig/delete.go b/service/controller/azurecluster/handler/azureconfig/delete.go index 8898c73db..d9aff4e5f 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 86081ba8d..b579f33e0 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/v7/pkg/annotation" + "github.com/giantswarm/azure-operator/v8/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 e86ad4e04..6708ba9eb 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/v7/client" + v5client "github.com/giantswarm/azure-operator/v8/client" ) const ( diff --git a/service/controller/azurecluster/handler/subnet/resource.go b/service/controller/azurecluster/handler/subnet/resource.go index 5803a29dc..6eaa8be73 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/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" + "github.com/giantswarm/azure-operator/v8/client" + subnet "github.com/giantswarm/azure-operator/v8/service/controller/azurecluster/handler/subnet/template" + "github.com/giantswarm/azure-operator/v8/service/controller/debugger" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/controller.go b/service/controller/azureconfig/controller.go index 963a0c417..330a20b9c 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/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" + "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/pkg/credential" + "github.com/giantswarm/azure-operator/v8/pkg/employees" + "github.com/giantswarm/azure-operator/v8/pkg/handler/ipam" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes" + "github.com/giantswarm/azure-operator/v8/pkg/handler/release" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/pkg/locker" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/service/collector" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/azureconfigfinalizer" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/blobobject" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/capzcrs" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/clusterid" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/containerurl" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/deployment" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/dnsrecord" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/encryptionkey" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/endpoints" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/masters" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/namespace" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/resourcegroup" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/service" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/storageclassmigrator" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/vnetpeering" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/workermigration" + "github.com/giantswarm/azure-operator/v8/service/controller/cloudconfig" + "github.com/giantswarm/azure-operator/v8/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v8/service/controller/debugger" + "github.com/giantswarm/azure-operator/v8/service/controller/internal/vmsku" + "github.com/giantswarm/azure-operator/v8/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 95d61132e..709fdd722 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/handler/blobobject/create.go b/service/controller/azureconfig/handler/blobobject/create.go index 2c51b0e4a..ecf7d1bbc 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/v7/service/controller/blobclient" - "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v8/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v8/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 665ac08b1..b739a38bd 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/v7/service/controller/blobclient" - "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v8/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v8/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 3f93fd77b..3b8196f3f 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/v7/service/controller/cloudconfig" - "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/cloudconfig" + "github.com/giantswarm/azure-operator/v8/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v8/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 f0c8522ec..d0b4bef32 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/v7/service/controller/cloudconfig" - "github.com/giantswarm/azure-operator/v7/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v8/service/controller/cloudconfig" + "github.com/giantswarm/azure-operator/v8/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 ab383fb8d..8c6f54458 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/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/v8/pkg/employees" + "github.com/giantswarm/azure-operator/v8/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/handler/blobobject/update.go b/service/controller/azureconfig/handler/blobobject/update.go index 5efc87749..c9e6f0558 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/v7/service/controller/blobclient" - "github.com/giantswarm/azure-operator/v7/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v8/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v8/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 b12c8ec72..41768f823 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/v7/service/controller/controllercontext" - "github.com/giantswarm/azure-operator/v7/service/unittest" + "github.com/giantswarm/azure-operator/v8/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v8/service/unittest" ) const ( diff --git a/service/controller/azureconfig/handler/capzcrs/create.go b/service/controller/azureconfig/handler/capzcrs/create.go index b3cf1da19..fdc6bb52f 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/v7/pkg/annotation" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + azopannotation "github.com/giantswarm/azure-operator/v8/pkg/annotation" + "github.com/giantswarm/azure-operator/v8/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 4d370a7b4..649aa1c2a 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 f000ef7a1..c402f81ee 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/v7/pkg/label" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/handler/containerurl/create.go b/service/controller/azureconfig/handler/containerurl/create.go index da00dc12d..c0e9904c3 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 b839e2539..b48c3f477 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/v7/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v8/service/controller/controllercontext" ) const ( diff --git a/service/controller/azureconfig/handler/deployment/deployment.go b/service/controller/azureconfig/handler/deployment/deployment.go index 9035d1f22..597321b4f 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/v7/service/controller/azureconfig/handler/deployment/template" - "github.com/giantswarm/azure-operator/v7/service/controller/key" - "github.com/giantswarm/azure-operator/v7/service/network" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/deployment/template" + "github.com/giantswarm/azure-operator/v8/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 92c9e65b3..45661058d 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 d24d88689..586b6cbcd 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/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" + "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v8/service/controller/debugger" + "github.com/giantswarm/azure-operator/v8/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/setting" ) const ( diff --git a/service/controller/azureconfig/handler/deployment/serviceendpoints.go b/service/controller/azureconfig/handler/deployment/serviceendpoints.go index df9f9aa57..20bb3ffb8 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/handler/dnsrecord/create.go b/service/controller/azureconfig/handler/dnsrecord/create.go index 0cf57e662..691ffa1d3 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 2170c7dfd..5895d541c 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/v7/client" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/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 f4fb5e050..d01a9aa07 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 68a2a04e8..094ec00f2 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/key" - "github.com/giantswarm/azure-operator/v7/client" + "github.com/giantswarm/azure-operator/v8/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 c2972c163..89d3fdb24 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/v7/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v8/service/controller/controllercontext" ) const ( diff --git a/service/controller/azureconfig/handler/dnsrecord/types.go b/service/controller/azureconfig/handler/dnsrecord/types.go index 6c272ffcf..e2fc186da 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 bcd9bd7d9..d01e25d83 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 7067e3fab..c1ed5b944 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 bd380a071..3eea25f11 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 cc8fcd95f..e7fde5a53 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/handler/endpoints/delete.go b/service/controller/azureconfig/handler/endpoints/delete.go index 4c2274dfb..84f646ae9 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 7a2d97b5d..96a9b41f2 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/v7/pkg/project" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/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 c152a6ff4..ad016715f 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/v7/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v8/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 1a482e759..38693fa1f 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 9f1edee0e..faf9023b0 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/v7/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v8/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 7df41fe2e..3e7bd23c2 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/v7/pkg/handler/nodes" - "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v8/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 ed2861750..a445df946 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/v4/api/v1alpha1" "sigs.k8s.io/controller-runtime/pkg/client" - "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" + "github.com/giantswarm/azure-operator/v8/pkg/checksum" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v8/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v8/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 d21bfd824..74964cc09 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/v7/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v8/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 e194bdbe3..253b500a1 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/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" + "github.com/giantswarm/azure-operator/v8/pkg/checksum" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v8/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v8/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v8/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 c99936658..e6214c60e 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/v7/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v8/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 0afead1e1..d2ef0c02a 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/v7/pkg/label" + "github.com/giantswarm/azure-operator/v8/pkg/label" - "github.com/giantswarm/azure-operator/v7/pkg/project" + "github.com/giantswarm/azure-operator/v8/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/v7/pkg/handler/nodes" - "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v8/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 0282d056f..ca8b4f089 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/v7/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v8/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 3af5b1cdb..e0664dcf5 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 8d5ad881c..47b2f20fa 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/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" + "github.com/giantswarm/azure-operator/v8/pkg/helpers/vmss" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/masters/template" + "github.com/giantswarm/azure-operator/v8/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v8/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v8/service/controller/internal/vmsku" + "github.com/giantswarm/azure-operator/v8/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 523687566..a0d0d14ff 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 741530715..9be94c861 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/v7/pkg/handler/nodes" - "github.com/giantswarm/azure-operator/v7/service/controller/internal/vmsku" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes" + "github.com/giantswarm/azure-operator/v8/service/controller/internal/vmsku" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/handler/namespace/current.go b/service/controller/azureconfig/handler/namespace/current.go index a5294e7de..80d67b0fe 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 95b2898b1..bef73e06c 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 6fdef7877..504cf29ac 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/v7/pkg/label" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/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 b737c201c..92565b62f 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/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" + "github.com/giantswarm/azure-operator/v8/pkg/helpers" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/service/controller/controllercontext" + "github.com/giantswarm/azure-operator/v8/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/setting" ) const ( diff --git a/service/controller/azureconfig/handler/service/create.go b/service/controller/azureconfig/handler/service/create.go index 72556d400..7e481911f 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 54654a1df..191efbbbb 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 487666d84..e53e09f6b 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 870caafbc..1b961db21 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 1804209f7..290884b1d 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/v7/pkg/label" + "github.com/giantswarm/azure-operator/v8/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 a712b63af..2d5363ff5 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 004cfb440..ddaa5065b 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/v7/service/controller/key" - "github.com/giantswarm/azure-operator/v7/service/controller/templates/ignition" + "github.com/giantswarm/azure-operator/v8/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/templates/ignition" ) const ( diff --git a/service/controller/azureconfig/handler/vnetpeering/create.go b/service/controller/azureconfig/handler/vnetpeering/create.go index 48f225dd0..7e3d91fbb 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/azureconfig/handler/vnetpeering/delete.go b/service/controller/azureconfig/handler/vnetpeering/delete.go index eb3a8454f..f7c75346a 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 ee8fe8876..f7981f53a 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/v7/client" + "github.com/giantswarm/azure-operator/v8/client" ) const ( diff --git a/service/controller/azureconfig/handler/workermigration/create.go b/service/controller/azureconfig/handler/workermigration/create.go index 9bb713d19..97c977ad6 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/v7/service/controller/azureconfig/handler/workermigration/internal/azure" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/workermigration/internal/azure" + "github.com/giantswarm/azure-operator/v8/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 ebcccc391..d7c0841bb 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/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" + azureclient "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/pkg/mock/mock_tenantcluster" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/workermigration/internal/azure" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/workermigration/internal/mock_azure" + "github.com/giantswarm/azure-operator/v8/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 54428afc9..7811b85e9 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/v7/client" + "github.com/giantswarm/azure-operator/v8/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 69980ad64..e74b550e9 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/v7/service/controller/azureconfig/handler/workermigration/internal/azure" + azure "github.com/giantswarm/azure-operator/v8/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 dadab15a1..a7c3d1fc8 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/v7/client" - "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v7/service/controller/azureconfig/handler/workermigration/internal/azure" + azureclient "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/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 eac387a64..9eb4a1305 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/v7/service/controller/azureconfig/handler/workermigration/internal/azure" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig/handler/workermigration/internal/azure" + "github.com/giantswarm/azure-operator/v8/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 1295edd4e..94e87e560 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/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" + "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/pkg/credential" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/service/collector" + "github.com/giantswarm/azure-operator/v8/service/controller/azuremachine/handler/azuremachineconditions" + "github.com/giantswarm/azure-operator/v8/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 081cce149..5e2046ae3 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/v7/pkg/helpers" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/helpers" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/azuremachine/handler/azuremachineconditions/conditionvmssready.go b/service/controller/azuremachine/handler/azuremachineconditions/conditionvmssready.go index 800601e18..a9f240adc 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/azuremachine/handler/azuremachineconditions/create.go b/service/controller/azuremachine/handler/azuremachineconditions/create.go index 803437ace..ab4d56cde 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 de8cfbb1c..01b328349 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/v7/client" - "github.com/giantswarm/azure-operator/v7/pkg/azureconditions" + azureclient "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/pkg/azureconditions" ) const ( diff --git a/service/controller/azuremachine/handler/azuremachinemetadata/create.go b/service/controller/azuremachine/handler/azuremachinemetadata/create.go index 3117e711a..6356ef0d8 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/v7/pkg/helpers" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/helpers" + "github.com/giantswarm/azure-operator/v8/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 ec153f23e..72fb32a1f 100644 --- a/service/controller/azuremachinepool/controller.go +++ b/service/controller/azuremachinepool/controller.go @@ -16,23 +16,23 @@ 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/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/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" + "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/pkg/credential" + "github.com/giantswarm/azure-operator/v8/pkg/employees" + "github.com/giantswarm/azure-operator/v8/pkg/handler/ipam" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/pkg/locker" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/service/collector" + "github.com/giantswarm/azure-operator/v8/service/controller/azuremachinepool/handler/azuremachinepoolconditions" + "github.com/giantswarm/azure-operator/v8/service/controller/azuremachinepool/handler/cloudconfigblob" + "github.com/giantswarm/azure-operator/v8/service/controller/azuremachinepool/handler/nodepool" + "github.com/giantswarm/azure-operator/v8/service/controller/azuremachinepool/handler/spark" + "github.com/giantswarm/azure-operator/v8/service/controller/debugger" + "github.com/giantswarm/azure-operator/v8/service/controller/internal/vmsku" + "github.com/giantswarm/azure-operator/v8/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 6c579310b..b8ea013c1 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/v7/pkg/helpers" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/helpers" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/azuremachinepool/handler/azuremachinepoolconditions/conditionvmssready.go b/service/controller/azuremachinepool/handler/azuremachinepoolconditions/conditionvmssready.go index 2ceb7ed27..95553c4be 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/azuremachinepool/handler/azuremachinepoolconditions/create.go b/service/controller/azuremachinepool/handler/azuremachinepoolconditions/create.go index 387a8e929..9bf4aeb03 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 3850881b5..6f1f780d9 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/v7/client" - "github.com/giantswarm/azure-operator/v7/pkg/azureconditions" + azureclient "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/pkg/azureconditions" ) const ( diff --git a/service/controller/azuremachinepool/handler/cloudconfigblob/create.go b/service/controller/azuremachinepool/handler/cloudconfigblob/create.go index 654ff75a2..9f7260871 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/v7/service/controller/blobclient" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v8/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 b07f23d71..677ba0a75 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/v7/service/controller/blobclient" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v8/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 6293ff5a1..a029fb817 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/v7/client" + "github.com/giantswarm/azure-operator/v8/client" ) const ( diff --git a/service/controller/azuremachinepool/handler/nodepool/cluster_autoscaler.go b/service/controller/azuremachinepool/handler/nodepool/cluster_autoscaler.go index f5aad1004..a0b326303 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 b9d8bdcbd..98eff95a2 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/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/v8/pkg/drainer" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/service/controller/key" - "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v8/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 9c0013194..f6bef7f5d 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/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" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/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 22e8259b8..c042bc339 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/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" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v8/service/controller/azuremachinepool/handler/nodepool/template" + "github.com/giantswarm/azure-operator/v8/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 66af40f94..e3fb920ed 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/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" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes/scalestrategy" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/service/controller/internal/vmsscheck" + "github.com/giantswarm/azure-operator/v8/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 071260780..1bf52179e 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/v7/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v8/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 9a756895e..b22851e3a 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/v7/pkg/handler/nodes/state" - "github.com/giantswarm/azure-operator/v7/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/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 b1c967614..c908f2e9d 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/v7/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/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 adfb372ed..d3d84539f 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/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" + "github.com/giantswarm/azure-operator/v8/service/controller/azuremachinepool/handler/nodepool/template" + + "github.com/giantswarm/azure-operator/v8/pkg/helpers/vmss" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/service/controller/blobclient" + "github.com/giantswarm/azure-operator/v8/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v8/service/controller/internal/vmsku" + "github.com/giantswarm/azure-operator/v8/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 2f490ea58..bb32135d1 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/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/v8/pkg/drainer" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/service/controller/key" - "github.com/giantswarm/azure-operator/v7/pkg/handler/nodes/state" + "github.com/giantswarm/azure-operator/v8/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 714045955..9105208a8 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/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" + "github.com/giantswarm/azure-operator/v8/pkg/credential" + "github.com/giantswarm/azure-operator/v8/pkg/handler/nodes" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/service/controller/internal/vmsku" ) const ( diff --git a/service/controller/azuremachinepool/handler/nodepool/status.go b/service/controller/azuremachinepool/handler/nodepool/status.go index 0f6ba310d..42e954217 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/v7/pkg/annotation" + "github.com/giantswarm/azure-operator/v8/pkg/annotation" ) const ( diff --git a/service/controller/azuremachinepool/handler/spark/create.go b/service/controller/azuremachinepool/handler/spark/create.go index c13990e69..3a6180b25 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/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" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/service/controller/cloudconfig" + "github.com/giantswarm/azure-operator/v8/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v8/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/network" ) const ( diff --git a/service/controller/azuremachinepool/handler/spark/delete.go b/service/controller/azuremachinepool/handler/spark/delete.go index 73e6c6fdc..828c22f48 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 520902b0c..82fc2a29a 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/v7/service/unittest" + "github.com/giantswarm/azure-operator/v8/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 8c01ea548..fff169ae0 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/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" + v5client "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/pkg/credential" + "github.com/giantswarm/azure-operator/v8/pkg/employees" + "github.com/giantswarm/azure-operator/v8/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v8/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 cd1b11080..a23087ead 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/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/azure-operator/v8/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v8/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/setting" ) type baseExtension struct { diff --git a/service/controller/cloudconfig/cloud_config.go b/service/controller/cloudconfig/cloud_config.go index 79e54302f..fa00ee0a2 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/v7/service/controller/setting" + "github.com/giantswarm/azure-operator/v8/service/controller/setting" ) const ( diff --git a/service/controller/cloudconfig/interface.go b/service/controller/cloudconfig/interface.go index 6d4136387..ee645e363 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/v7/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v8/service/controller/encrypter" ) type Interface interface { diff --git a/service/controller/cloudconfig/master_template.go b/service/controller/cloudconfig/master_template.go index d1b09805a..f0f6bcd15 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/v17/pkg/template" "github.com/giantswarm/microerror" - "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" + "github.com/giantswarm/azure-operator/v8/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v8/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/templates/ignition" ) const ( diff --git a/service/controller/cloudconfig/worker_template.go b/service/controller/cloudconfig/worker_template.go index 42a6490e9..115fc2f5e 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/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" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/service/controller/encrypter" + "github.com/giantswarm/azure-operator/v8/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 e18659f0c..72bf911b2 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/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" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/service/controller/cluster/handler/clusterdependents" + "github.com/giantswarm/azure-operator/v8/service/controller/cluster/handler/clusterownerreference" + "github.com/giantswarm/azure-operator/v8/service/controller/cluster/handler/clusterreleaseversion" + "github.com/giantswarm/azure-operator/v8/service/controller/cluster/handler/clusterupgrade" + "github.com/giantswarm/azure-operator/v8/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 cd33dbd84..36f886a1c 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/cluster/handler/clusterownerreference/controlplane.go b/service/controller/cluster/handler/clusterownerreference/controlplane.go index 359c1b2f9..d9cd4f610 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 8298c4c8f..1e0a219c2 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 d96b504ce..55a2f2e62 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/v7/pkg/label" - "github.com/giantswarm/azure-operator/v7/service/unittest" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/service/unittest" ) const ( diff --git a/service/controller/cluster/handler/clusterreleaseversion/checkupgradeprogress.go b/service/controller/cluster/handler/clusterreleaseversion/checkupgradeprogress.go index 35f5d5253..079ed58db 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/v7/pkg/helpers" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/helpers" + "github.com/giantswarm/azure-operator/v8/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 833403675..06c51a76e 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/v7/pkg/annotation" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + azopannotation "github.com/giantswarm/azure-operator/v8/pkg/annotation" + "github.com/giantswarm/azure-operator/v8/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 4543efd3b..d725165e4 100644 --- a/service/controller/cluster/handler/clusterupgrade/create.go +++ b/service/controller/cluster/handler/clusterupgrade/create.go @@ -13,10 +13,10 @@ import ( capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" "sigs.k8s.io/controller-runtime/pkg/client" - "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" + "github.com/giantswarm/azure-operator/v8/pkg/helpers" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/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 b40c06024..5eea1b9f1 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/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" ) const ( diff --git a/service/controller/controllercontext/context.go b/service/controller/controllercontext/context.go index 6eef1d73c..45be6bcb9 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/v4/api/v1alpha1" - "github.com/giantswarm/azure-operator/v7/client" - "github.com/giantswarm/azure-operator/v7/service/controller/cloudconfig" + "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/service/controller/cloudconfig" ) type contextKey string diff --git a/service/controller/debugger/debugger.go b/service/controller/debugger/debugger.go index cebf8b037..0e114f45a 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) type Config struct { diff --git a/service/controller/internal/vmsku/vmsku.go b/service/controller/internal/vmsku/vmsku.go index e927ce48b..0557d14ee 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/v7/client" + "github.com/giantswarm/azure-operator/v8/client" ) const ( diff --git a/service/controller/key/common.go b/service/controller/key/common.go index b901df8d9..48c88f035 100644 --- a/service/controller/key/common.go +++ b/service/controller/key/common.go @@ -9,8 +9,8 @@ import ( releasev1alpha1 "github.com/giantswarm/release-operator/v4/api/v1alpha1" capi "sigs.k8s.io/cluster-api/api/v1beta1" - "github.com/giantswarm/azure-operator/v7/pkg/label" - "github.com/giantswarm/azure-operator/v7/pkg/normalize" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/pkg/normalize" ) const ( diff --git a/service/controller/key/key.go b/service/controller/key/key.go index 5fce25a18..91066e53b 100644 --- a/service/controller/key/key.go +++ b/service/controller/key/key.go @@ -20,10 +20,10 @@ import ( capi "sigs.k8s.io/cluster-api/api/v1beta1" capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" - "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" + "github.com/giantswarm/azure-operator/v8/pkg/annotation" + "github.com/giantswarm/azure-operator/v8/pkg/employees" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/service/controller/templates/ignition" ) const ( diff --git a/service/controller/key/key_test.go b/service/controller/key/key_test.go index 75bccdcfd..c03a44373 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/v7/pkg/label" + "github.com/giantswarm/azure-operator/v8/pkg/label" ) func Test_ClusterID(t *testing.T) { diff --git a/service/controller/machinepool/controller.go b/service/controller/machinepool/controller.go index 6870b5a85..e7175db9c 100644 --- a/service/controller/machinepool/controller.go +++ b/service/controller/machinepool/controller.go @@ -18,13 +18,13 @@ import ( capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" ctrlClient "sigs.k8s.io/controller-runtime/pkg/client" - "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/nodestatus" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/service/controller/machinepool/handler/machinepooldependents" + "github.com/giantswarm/azure-operator/v8/service/controller/machinepool/handler/machinepoolownerreference" + "github.com/giantswarm/azure-operator/v8/service/controller/machinepool/handler/machinepoolupgrade" + "github.com/giantswarm/azure-operator/v8/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 5eb7eeae8..058b83918 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/machinepool/handler/machinepoolownerreference/resource.go b/service/controller/machinepool/handler/machinepoolownerreference/resource.go index 76516ee45..cbb2910e8 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/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 1e74e785c..3bb71d7d8 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/v7/service/unittest" + "github.com/giantswarm/azure-operator/v8/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 f92301f4a..63104e9cb 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/v7/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/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 ebeadaeee..2d81988ed 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/v7/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/machinepool/handler/nodestatus/create.go b/service/controller/machinepool/handler/nodestatus/create.go index e8fc87c2c..4f0f9f0cb 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/v7/pkg/tenantcluster" - "github.com/giantswarm/azure-operator/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/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 69c5a55d7..25346691d 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/v7/pkg/mock/mock_tenantcluster" - "github.com/giantswarm/azure-operator/v7/service/unittest" + "github.com/giantswarm/azure-operator/v8/pkg/mock/mock_tenantcluster" + "github.com/giantswarm/azure-operator/v8/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 805e66ed0..a7e5c5a1f 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/v7/pkg/tenantcluster" + "github.com/giantswarm/azure-operator/v8/pkg/tenantcluster" ) const ( diff --git a/service/controller/templates/templates_test.go b/service/controller/templates/templates_test.go index 4ee735859..d983ea64b 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/v7/service/controller/templates" + "github.com/giantswarm/azure-operator/v8/service/controller/templates" ) func TestRender(t *testing.T) { diff --git a/service/controller/unhealthynode/controller.go b/service/controller/unhealthynode/controller.go index 504a382fd..729ff504c 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/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" + "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/pkg/credential" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/service/collector" + "github.com/giantswarm/azure-operator/v8/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 aa0241ee4..987e0664a 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/v7/service/controller/key" + "github.com/giantswarm/azure-operator/v8/service/controller/key" ) const ( diff --git a/service/controller/unhealthynode/handler/terminateunhealthynode/resource.go b/service/controller/unhealthynode/handler/terminateunhealthynode/resource.go index 9cf1b5eaf..2a5390754 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/v7/client" + azureclient "github.com/giantswarm/azure-operator/v8/client" ) const ( diff --git a/service/service.go b/service/service.go index 0b3b4f1f1..95ff60edd 100644 --- a/service/service.go +++ b/service/service.go @@ -29,22 +29,22 @@ import ( capiexp "sigs.k8s.io/cluster-api/exp/api/v1beta1" ctrl "sigs.k8s.io/controller-runtime/pkg/client" - "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/setting" - "github.com/giantswarm/azure-operator/v7/service/controller/unhealthynode" + "github.com/giantswarm/azure-operator/v8/client" + "github.com/giantswarm/azure-operator/v8/flag" + "github.com/giantswarm/azure-operator/v8/pkg/credential" + "github.com/giantswarm/azure-operator/v8/pkg/employees" + "github.com/giantswarm/azure-operator/v8/pkg/label" + "github.com/giantswarm/azure-operator/v8/pkg/locker" + "github.com/giantswarm/azure-operator/v8/pkg/project" + "github.com/giantswarm/azure-operator/v8/service/collector" + "github.com/giantswarm/azure-operator/v8/service/controller/azurecluster" + "github.com/giantswarm/azure-operator/v8/service/controller/azureconfig" + "github.com/giantswarm/azure-operator/v8/service/controller/azuremachine" + "github.com/giantswarm/azure-operator/v8/service/controller/azuremachinepool" + "github.com/giantswarm/azure-operator/v8/service/controller/cluster" + "github.com/giantswarm/azure-operator/v8/service/controller/machinepool" + "github.com/giantswarm/azure-operator/v8/service/controller/setting" + "github.com/giantswarm/azure-operator/v8/service/controller/unhealthynode" ) // Config represents the configuration used to create a new service.