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

Update giantswarm modules (major) #1725

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update giantswarm modules (major) #1725

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

Filter by extension

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

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

"github.com/giantswarm/azure-operator/v8/flag/service/azure"
"github.com/giantswarm/azure-operator/v8/flag/service/cluster"
Expand Down
26 changes: 13 additions & 13 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ require (
github.com/Azure/go-autorest/autorest/to v0.4.0
github.com/coreos/go-semver v0.3.0
github.com/giantswarm/apiextensions/v6 v6.0.0
github.com/giantswarm/badnodedetector v1.0.1
github.com/giantswarm/badnodedetector/v3 v3.0.0
github.com/giantswarm/certs/v4 v4.0.0
github.com/giantswarm/conditions v0.5.0
github.com/giantswarm/conditions-handler v0.3.0
Expand All @@ -20,18 +20,18 @@ require (
github.com/giantswarm/k8sclient/v7 v7.0.1
github.com/giantswarm/k8scloudconfig/v17 v17.2.0
github.com/giantswarm/k8smetadata v0.19.0
github.com/giantswarm/kubelock/v2 v2.0.0
github.com/giantswarm/kubelock/v4 v4.0.0
github.com/giantswarm/microendpoint v1.0.0
github.com/giantswarm/microerror v0.4.0
github.com/giantswarm/microerror v0.4.1
github.com/giantswarm/microkit v1.0.0
github.com/giantswarm/micrologger v1.0.0
github.com/giantswarm/operatorkit/v7 v7.0.1
github.com/giantswarm/operatorkit/v8 v8.0.0
github.com/giantswarm/release-operator/v4 v4.0.0
github.com/giantswarm/tenantcluster/v6 v6.0.0
github.com/giantswarm/to v0.4.0
github.com/giantswarm/versionbundle v1.0.0
github.com/golang/mock v1.6.0
github.com/google/go-cmp v0.5.9
github.com/google/go-cmp v0.6.0
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/prometheus/client_golang v1.14.0
github.com/spf13/viper v1.16.0
Expand Down Expand Up @@ -71,8 +71,8 @@ require (
github.com/giantswarm/microstorage v0.2.0 // indirect
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-kit/log v0.2.1 // indirect
github.com/go-logfmt/logfmt v0.5.1 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
Expand Down Expand Up @@ -117,14 +117,14 @@ require (
go.opentelemetry.io/otel/trace v1.3.0 // indirect
golang.org/x/crypto v0.9.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.1.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/resty.v1 v1.12.0 // indirect
Expand All @@ -147,7 +147,7 @@ replace (
github.com/coreos/etcd v3.3.13+incompatible => github.com/coreos/etcd v3.3.27+incompatible
github.com/dgrijalva/jwt-go => github.com/dgrijalva/jwt-go/v4 v4.0.0-preview1
github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible
github.com/giantswarm/micrologger => github.com/giantswarm/micrologger v0.6.0
github.com/giantswarm/micrologger => github.com/giantswarm/micrologger v1.1.1
github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0
github.com/go-ldap/ldap/v3 => github.com/go-ldap/ldap/v3 v3.4.4
github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
Expand Down
176 changes: 24 additions & 152 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion integration/test/crmapping/crmapping_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger/microloggertest"
"github.com/giantswarm/operatorkit/v7/pkg/resource"
"github.com/giantswarm/operatorkit/v8/pkg/resource"
"github.com/google/go-cmp/cmp"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta"
Expand Down
2 changes: 1 addition & 1 deletion pkg/locker/kubelock_locker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"time"

"github.com/giantswarm/kubelock/v2"
"github.com/giantswarm/kubelock/v4"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
8 changes: 4 additions & 4 deletions service/controller/azurecluster/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"github.com/giantswarm/k8sclient/v7/pkg/k8sclient"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"github.com/giantswarm/operatorkit/v7/pkg/controller"
"github.com/giantswarm/operatorkit/v7/pkg/resource"
"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/metricsresource"
"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/retryresource"
"github.com/giantswarm/operatorkit/v8/pkg/controller"
"github.com/giantswarm/operatorkit/v8/pkg/resource"
"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/metricsresource"
"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/retryresource"
"github.com/spf13/viper"
"k8s.io/apimachinery/pkg/labels"
capz "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/azurecluster/handler/azureclusterconfig/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

corev1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/core/v1alpha1"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/azurecluster/handler/azureconfig/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/giantswarm/apiextensions/v6/pkg/annotation"
providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/reconciliationcanceledcontext"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/azurecluster/handler/azureconfig/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/azurecluster/handler/subnet/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/Azure/go-autorest/autorest/to"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/reconciliationcanceledcontext"
apierrors "k8s.io/apimachinery/pkg/api/errors"
capz "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1"
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
10 changes: 5 additions & 5 deletions service/controller/azureconfig/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"github.com/giantswarm/k8sclient/v7/pkg/k8sclient"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"github.com/giantswarm/operatorkit/v7/pkg/controller"
"github.com/giantswarm/operatorkit/v7/pkg/resource"
"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/metricsresource"
"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/retryresource"
"github.com/giantswarm/operatorkit/v8/pkg/controller"
"github.com/giantswarm/operatorkit/v8/pkg/resource"
"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/metricsresource"
"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/retryresource"
"github.com/giantswarm/tenantcluster/v6/pkg/tenantcluster"
"k8s.io/apimachinery/pkg/labels"
ctrlClient "sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/azureconfig/handler/blobobject/current.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

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

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

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

// ApplyDeleteChange not in use as blobobject deleted
Expand Down
2 changes: 1 addition & 1 deletion service/controller/azureconfig/handler/blobobject/desired.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/giantswarm/certs/v4/pkg/certs"
k8scloudconfig "github.com/giantswarm/k8scloudconfig/v17/pkg/template"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/resourcecanceledcontext"
"golang.org/x/sync/errgroup"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/azureconfig/handler/blobobject/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

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

"github.com/giantswarm/azure-operator/v8/service/controller/blobclient"
"github.com/giantswarm/azure-operator/v8/service/controller/controllercontext"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/azureconfig/handler/capzcrs/create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger/microloggertest"
"github.com/giantswarm/operatorkit/v7/pkg/resource"
"github.com/giantswarm/operatorkit/v8/pkg/resource"
"github.com/google/go-cmp/cmp"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/azureconfig/handler/clusterid/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/reconciliationcanceledcontext"
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"

Expand Down
2 changes: 1 addition & 1 deletion service/controller/azureconfig/handler/containerurl/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/Azure/azure-sdk-for-go/services/storage/mgmt/2019-04-01/storage"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/resourcecanceledcontext"

"github.com/giantswarm/azure-operator/v8/service/controller/key"
)
Expand Down
2 changes: 1 addition & 1 deletion service/controller/azureconfig/handler/deployment/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/reconciliationcanceledcontext"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
ctrlClient "sigs.k8s.io/controller-runtime/pkg/client"

Expand Down
2 changes: 1 addition & 1 deletion service/controller/azureconfig/handler/deployment/serviceendpoints.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/Azure/go-autorest/autorest/to"
providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/reconciliationcanceledcontext"

"github.com/giantswarm/azure-operator/v8/service/controller/key"
)
Expand Down
2 changes: 1 addition & 1 deletion service/controller/azureconfig/handler/dnsrecord/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2018-05-01/dns"
providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"

"github.com/giantswarm/azure-operator/v8/service/controller/key"
)
Expand Down
2 changes: 1 addition & 1 deletion service/controller/azureconfig/handler/dnsrecord/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"github.com/Azure/azure-sdk-for-go/services/dns/mgmt/2018-05-01/dns"
"github.com/Azure/go-autorest/autorest/to"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
)

func (r *Resource) ApplyUpdateChange(ctx context.Context, obj, change interface{}) error {
Expand Down
2 changes: 1 addition & 1 deletion service/controller/azureconfig/handler/endpoints/current.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

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

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

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

Expand Down
4 changes: 2 additions & 2 deletions service/controller/azureconfig/handler/masters/create_deployment_uninitialized.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"

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

"github.com/giantswarm/azure-operator/v8/pkg/checksum"
"github.com/giantswarm/azure-operator/v8/pkg/handler/nodes/state"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/azureconfig/handler/masters/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/Azure/azure-storage-blob-go/azblob"
providerv1alpha1 "github.com/giantswarm/apiextensions/v6/pkg/apis/provider/v1alpha1"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/resourcecanceledcontext"
apierrors "k8s.io/apimachinery/pkg/api/errors"

"github.com/giantswarm/azure-operator/v8/pkg/helpers/vmss"
Expand Down
4 changes: 2 additions & 2 deletions service/controller/azureconfig/handler/namespace/current.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"

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

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

func (r *Resource) ApplyDeleteChange(ctx context.Context, obj, deleteChange interface{}) error {
Expand Down
2 changes: 1 addition & 1 deletion service/controller/azureconfig/handler/namespace/update.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

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

func (r *Resource) ApplyUpdateChange(ctx context.Context, obj, updateChange interface{}) error {
Expand Down
4 changes: 2 additions & 2 deletions service/controller/azureconfig/handler/resourcegroup/resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
azureconditions "github.com/giantswarm/apiextensions/v6/pkg/conditions/azure"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/reconciliationcanceledcontext"
capi "sigs.k8s.io/cluster-api/api/v1beta1"
"sigs.k8s.io/cluster-api/util/conditions"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
2 changes: 1 addition & 1 deletion service/controller/azureconfig/handler/service/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

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

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

Expand Down
2 changes: 1 addition & 1 deletion service/controller/azureconfig/handler/vnetpeering/create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-11-01/network"
"github.com/giantswarm/microerror"
"github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext"
"github.com/giantswarm/operatorkit/v8/pkg/controller/context/reconciliationcanceledcontext"
"github.com/giantswarm/to"

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

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

"github.com/giantswarm/azure-operator/v8/service/controller/key"
)
Expand Down
4 changes: 2 additions & 2 deletions service/controller/azuremachine/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/giantswarm/k8sclient/v7/pkg/k8sclient"
"github.com/giantswarm/microerror"
"github.com/giantswarm/micrologger"
"github.com/giantswarm/operatorkit/v7/pkg/controller"
"github.com/giantswarm/operatorkit/v7/pkg/resource"
"github.com/giantswarm/operatorkit/v8/pkg/controller"
"github.com/giantswarm/operatorkit/v8/pkg/resource"
"k8s.io/apimachinery/pkg/labels"
capz "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1"
ctrlClient "sigs.k8s.io/controller-runtime/pkg/client"
Expand Down