From a49945049c14994353f22ceec372496a2223de34 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Jan 2025 13:21:44 +0000 Subject: [PATCH] Update module github.com/giantswarm/operatorkit/v7 to v8 --- flag/service/kubernetes/kubernetes.go | 4 ++-- go.mod | 2 +- go.sum | 5 +++-- service/controller/app/app.go | 4 ++-- service/controller/app/resource/chart/current.go | 2 +- service/controller/app/resource/chart/delete.go | 2 +- service/controller/app/resource/chart/desired.go | 2 +- service/controller/app/resource/chart/update.go | 2 +- service/controller/app/resource/chartoperator/create.go | 2 +- service/controller/app/resource/configmap/create.go | 2 +- service/controller/app/resource/configmap/current.go | 2 +- service/controller/app/resource/configmap/delete.go | 2 +- service/controller/app/resource/configmap/desired.go | 2 +- service/controller/app/resource/configmap/update.go | 2 +- service/controller/app/resource/secret/create.go | 2 +- service/controller/app/resource/secret/current.go | 2 +- service/controller/app/resource/secret/delete.go | 2 +- service/controller/app/resource/secret/desired.go | 2 +- service/controller/app/resource/secret/update.go | 2 +- service/controller/app/resource/validation/create.go | 2 +- service/controller/app/resources.go | 8 ++++---- service/controller/catalog/catalog.go | 4 ++-- service/controller/catalog/resources.go | 6 +++--- 23 files changed, 33 insertions(+), 32 deletions(-) diff --git a/flag/service/kubernetes/kubernetes.go b/flag/service/kubernetes/kubernetes.go index 98a01ced4..601a7cb7c 100644 --- a/flag/service/kubernetes/kubernetes.go +++ b/flag/service/kubernetes/kubernetes.go @@ -1,8 +1,8 @@ package kubernetes import ( - "github.com/giantswarm/operatorkit/v7/pkg/flag/service/kubernetes/tls" - "github.com/giantswarm/operatorkit/v7/pkg/flag/service/kubernetes/watch" + "github.com/giantswarm/operatorkit/v8/pkg/flag/service/kubernetes/tls" + "github.com/giantswarm/operatorkit/v8/pkg/flag/service/kubernetes/watch" ) // Kubernetes is a data structure to hold Kubernetes specific command line diff --git a/go.mod b/go.mod index 0ba9f184e..38d8dcd97 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( github.com/giantswarm/microerror v0.4.1 github.com/giantswarm/microkit v1.0.2 github.com/giantswarm/micrologger v1.1.2 - github.com/giantswarm/operatorkit/v7 v7.2.0 + github.com/giantswarm/operatorkit/v8 v8.0.0 github.com/giantswarm/to v0.4.2 github.com/google/go-cmp v0.6.0 github.com/patrickmn/go-cache v2.1.0+incompatible diff --git a/go.sum b/go.sum index 221024fe8..81b7b5f52 100644 --- a/go.sum +++ b/go.sum @@ -163,8 +163,8 @@ github.com/giantswarm/microkit v1.0.2 h1:dBK8CZlHyLwiA7g+2gHk1KEm6slajMA8vRZ7ykk github.com/giantswarm/microkit v1.0.2/go.mod h1:TS2XCAvUXtzFXTvCeJK/V3bScTMkLj+ATDyQANZFgHM= github.com/giantswarm/micrologger v1.1.2 h1:dNmnGZgAT0rnZkpc2ivj1shJ3Stnnjsy7jIi84//Jqc= github.com/giantswarm/micrologger v1.1.2/go.mod h1:lJe2gBm3O3miycXjWOgDh6vVuaKCACsPjBcobc0dvPM= -github.com/giantswarm/operatorkit/v7 v7.2.0 h1:eoKInQ6Ka0NlQEEqjQbmbAFLW/eOjKHkH2+wBs/JuMU= -github.com/giantswarm/operatorkit/v7 v7.2.0/go.mod h1:rvHDLhFd5P2tVx1GbnUTUURWmRWmHI+91M2GPcBEraM= +github.com/giantswarm/operatorkit/v8 v8.0.0 h1:AM1Xxg8X6xQjhxh+Jn1Tiv2MkpG8Ro4gqEsytZBBU5M= +github.com/giantswarm/operatorkit/v8 v8.0.0/go.mod h1:dPrvvQj2UNBw6jLDYqvGhnDfJImwih8A+F3Oc1VS8XM= github.com/giantswarm/to v0.4.2 h1:s2jS708yNKiyVFqzS5yyJeoVyhvMX19fTZD8OymJY9U= github.com/giantswarm/to v0.4.2/go.mod h1:RTRtw+Dyk6YqoiNBOGLO981BqhibtVwogdaFIMO1y/A= github.com/giantswarm/versionbundle v1.1.0 h1:Fk0UWTMnA56voTh5P/LmLLPbAkEkFE5jKKpVzcMOL1A= @@ -388,6 +388,7 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM= +github.com/onsi/ginkgo v1.16.2 h1:HFB2fbVIlhIfCfOW81bZFbiC/RvnpXSdhbF2/DJr134= github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg= diff --git a/service/controller/app/app.go b/service/controller/app/app.go index 9d73dcb1f..49926710f 100644 --- a/service/controller/app/app.go +++ b/service/controller/app/app.go @@ -9,8 +9,8 @@ import ( "github.com/giantswarm/k8smetadata/pkg/annotation" "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" "github.com/spf13/afero" "k8s.io/apimachinery/pkg/labels" "sigs.k8s.io/controller-runtime/pkg/client" diff --git a/service/controller/app/resource/chart/current.go b/service/controller/app/resource/chart/current.go index 47bc30097..7d0d79f8b 100644 --- a/service/controller/app/resource/chart/current.go +++ b/service/controller/app/resource/chart/current.go @@ -7,7 +7,7 @@ import ( "github.com/giantswarm/app/v7/pkg/key" "github.com/giantswarm/errors/tenant" "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" "k8s.io/apimachinery/pkg/types" diff --git a/service/controller/app/resource/chart/delete.go b/service/controller/app/resource/chart/delete.go index e10caea64..559c03fa9 100644 --- a/service/controller/app/resource/chart/delete.go +++ b/service/controller/app/resource/chart/delete.go @@ -5,7 +5,7 @@ import ( "github.com/giantswarm/app/v7/pkg/key" "github.com/giantswarm/microerror" - "github.com/giantswarm/operatorkit/v7/pkg/resource/crud" + "github.com/giantswarm/operatorkit/v8/pkg/resource/crud" apierrors "k8s.io/apimachinery/pkg/api/errors" "github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext" diff --git a/service/controller/app/resource/chart/desired.go b/service/controller/app/resource/chart/desired.go index b8f460517..a11c24879 100644 --- a/service/controller/app/resource/chart/desired.go +++ b/service/controller/app/resource/chart/desired.go @@ -15,7 +15,7 @@ import ( "github.com/giantswarm/k8smetadata/pkg/annotation" "github.com/giantswarm/k8smetadata/pkg/label" "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" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/service/controller/app/resource/chart/update.go b/service/controller/app/resource/chart/update.go index 711b5919a..0b74f7e85 100644 --- a/service/controller/app/resource/chart/update.go +++ b/service/controller/app/resource/chart/update.go @@ -7,7 +7,7 @@ import ( "github.com/giantswarm/apiextensions-application/api/v1alpha1" "github.com/giantswarm/microerror" - "github.com/giantswarm/operatorkit/v7/pkg/resource/crud" + "github.com/giantswarm/operatorkit/v8/pkg/resource/crud" "github.com/google/go-cmp/cmp" "github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext" diff --git a/service/controller/app/resource/chartoperator/create.go b/service/controller/app/resource/chartoperator/create.go index fc3eed363..c73daa2ff 100644 --- a/service/controller/app/resource/chartoperator/create.go +++ b/service/controller/app/resource/chartoperator/create.go @@ -7,7 +7,7 @@ import ( "github.com/giantswarm/errors/tenant" "github.com/giantswarm/helmclient/v4/pkg/helmclient" "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" diff --git a/service/controller/app/resource/configmap/create.go b/service/controller/app/resource/configmap/create.go index 0a07f9c46..7f39e3120 100644 --- a/service/controller/app/resource/configmap/create.go +++ b/service/controller/app/resource/configmap/create.go @@ -5,7 +5,7 @@ import ( "github.com/giantswarm/errors/tenant" "github.com/giantswarm/microerror" - "github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext" + "github.com/giantswarm/operatorkit/v8/pkg/controller/context/resourcecanceledcontext" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/service/controller/app/resource/configmap/current.go b/service/controller/app/resource/configmap/current.go index d355a6cde..c1d479459 100644 --- a/service/controller/app/resource/configmap/current.go +++ b/service/controller/app/resource/configmap/current.go @@ -7,7 +7,7 @@ import ( "github.com/giantswarm/app/v7/pkg/key" "github.com/giantswarm/errors/tenant" "github.com/giantswarm/microerror" - "github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext" + "github.com/giantswarm/operatorkit/v8/pkg/controller/context/resourcecanceledcontext" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/service/controller/app/resource/configmap/delete.go b/service/controller/app/resource/configmap/delete.go index e2cd9e361..c6239ad26 100644 --- a/service/controller/app/resource/configmap/delete.go +++ b/service/controller/app/resource/configmap/delete.go @@ -4,7 +4,7 @@ import ( "context" "github.com/giantswarm/microerror" - "github.com/giantswarm/operatorkit/v7/pkg/resource/crud" + "github.com/giantswarm/operatorkit/v8/pkg/resource/crud" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/service/controller/app/resource/configmap/desired.go b/service/controller/app/resource/configmap/desired.go index 6242155b9..efb11b43c 100644 --- a/service/controller/app/resource/configmap/desired.go +++ b/service/controller/app/resource/configmap/desired.go @@ -9,7 +9,7 @@ import ( "github.com/giantswarm/k8smetadata/pkg/annotation" "github.com/giantswarm/k8smetadata/pkg/label" "github.com/giantswarm/microerror" - "github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext" + "github.com/giantswarm/operatorkit/v8/pkg/controller/context/resourcecanceledcontext" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" diff --git a/service/controller/app/resource/configmap/update.go b/service/controller/app/resource/configmap/update.go index 9c15745eb..c24f14f6b 100644 --- a/service/controller/app/resource/configmap/update.go +++ b/service/controller/app/resource/configmap/update.go @@ -4,7 +4,7 @@ import ( "context" "github.com/giantswarm/microerror" - "github.com/giantswarm/operatorkit/v7/pkg/resource/crud" + "github.com/giantswarm/operatorkit/v8/pkg/resource/crud" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/service/controller/app/resource/secret/create.go b/service/controller/app/resource/secret/create.go index 93415d8a0..c1fe3946d 100644 --- a/service/controller/app/resource/secret/create.go +++ b/service/controller/app/resource/secret/create.go @@ -5,7 +5,7 @@ import ( "github.com/giantswarm/errors/tenant" "github.com/giantswarm/microerror" - "github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext" + "github.com/giantswarm/operatorkit/v8/pkg/controller/context/resourcecanceledcontext" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/service/controller/app/resource/secret/current.go b/service/controller/app/resource/secret/current.go index 87d9c2209..8b641bf60 100644 --- a/service/controller/app/resource/secret/current.go +++ b/service/controller/app/resource/secret/current.go @@ -6,7 +6,7 @@ import ( "github.com/giantswarm/app/v7/pkg/key" "github.com/giantswarm/errors/tenant" "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" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/service/controller/app/resource/secret/delete.go b/service/controller/app/resource/secret/delete.go index 0f26fd794..2d6da1c32 100644 --- a/service/controller/app/resource/secret/delete.go +++ b/service/controller/app/resource/secret/delete.go @@ -4,7 +4,7 @@ import ( "context" "github.com/giantswarm/microerror" - "github.com/giantswarm/operatorkit/v7/pkg/resource/crud" + "github.com/giantswarm/operatorkit/v8/pkg/resource/crud" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/service/controller/app/resource/secret/desired.go b/service/controller/app/resource/secret/desired.go index 275344431..ebd194fc6 100644 --- a/service/controller/app/resource/secret/desired.go +++ b/service/controller/app/resource/secret/desired.go @@ -9,7 +9,7 @@ import ( "github.com/giantswarm/k8smetadata/pkg/annotation" "github.com/giantswarm/k8smetadata/pkg/label" "github.com/giantswarm/microerror" - "github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext" + "github.com/giantswarm/operatorkit/v8/pkg/controller/context/resourcecanceledcontext" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" diff --git a/service/controller/app/resource/secret/update.go b/service/controller/app/resource/secret/update.go index 91b4007e8..e968458b0 100644 --- a/service/controller/app/resource/secret/update.go +++ b/service/controller/app/resource/secret/update.go @@ -4,7 +4,7 @@ import ( "context" "github.com/giantswarm/microerror" - "github.com/giantswarm/operatorkit/v7/pkg/resource/crud" + "github.com/giantswarm/operatorkit/v8/pkg/resource/crud" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/service/controller/app/resource/validation/create.go b/service/controller/app/resource/validation/create.go index 159c86d6a..7a19a06f9 100644 --- a/service/controller/app/resource/validation/create.go +++ b/service/controller/app/resource/validation/create.go @@ -8,7 +8,7 @@ import ( "github.com/giantswarm/app/v7/pkg/key" "github.com/giantswarm/app/v7/pkg/validation" "github.com/giantswarm/microerror" - "github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext" + "github.com/giantswarm/operatorkit/v8/pkg/controller/context/reconciliationcanceledcontext" "k8s.io/apimachinery/pkg/types" "github.com/giantswarm/app-operator/v7/pkg/status" diff --git a/service/controller/app/resources.go b/service/controller/app/resources.go index 04e8d1e4f..3fa00ed99 100644 --- a/service/controller/app/resources.go +++ b/service/controller/app/resources.go @@ -8,10 +8,10 @@ import ( "github.com/giantswarm/k8sclient/v7/pkg/k8sclient" "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/operatorkit/v7/pkg/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/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/spf13/afero" "github.com/giantswarm/app-operator/v7/service/controller/app/resource/appfinalizermigration" diff --git a/service/controller/catalog/catalog.go b/service/controller/catalog/catalog.go index 89fe7d66d..5a7d37f4f 100644 --- a/service/controller/catalog/catalog.go +++ b/service/controller/catalog/catalog.go @@ -5,8 +5,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" "sigs.k8s.io/controller-runtime/pkg/client" "github.com/giantswarm/app-operator/v7/pkg/project" diff --git a/service/controller/catalog/resources.go b/service/controller/catalog/resources.go index c2c2100e6..1a32b907a 100644 --- a/service/controller/catalog/resources.go +++ b/service/controller/catalog/resources.go @@ -4,9 +4,9 @@ import ( "github.com/giantswarm/k8sclient/v7/pkg/k8sclient" "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "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/resource" + "github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/metricsresource" + "github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/retryresource" "github.com/giantswarm/app-operator/v7/service/controller/catalog/resource/appcatalogentry" "github.com/giantswarm/app-operator/v7/service/controller/catalog/resource/appcatalogsync"