Revert "Release v8.0.0 (#618)" (#619)

This reverts commit 78fa3e5.
giantswarm · Jul 20, 2022 · 2cd5ed8 · 2cd5ed8
1 parent 78fa3e5
commit 2cd5ed8
Show file tree

Hide file tree

Showing 33 changed files with 59 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,13 +9,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-
-## [8.0.0] - 2022-07-18
-
-### Changed
-
-- Change Reconcile errors total to include controller name. 
-
 ## [7.1.0] - 2022-07-18
 
 ### Changed
@@ -220,8 +213,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 
 
-[Unreleased]: https://github.com/giantswarm/operatorkit/compare/v8.0.0...HEAD
-[8.0.0]: https://github.com/giantswarm/operatorkit/compare/v7.1.0...v8.0.0
+[Unreleased]: https://github.com/giantswarm/operatorkit/compare/v7.1.0...HEAD
 [7.1.0]: https://github.com/giantswarm/operatorkit/compare/v7.0.1...v7.1.0
 [7.0.1]: https://github.com/giantswarm/operatorkit/compare/v7.0.0...v7.0.1
 [7.0.0]: https://github.com/giantswarm/operatorkit/compare/v6.1.0...v7.0.0

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/giantswarm/operatorkit/v8
+module github.com/giantswarm/operatorkit/v7
 
 go 1.17
 

diff --git a/integration/wrapper/configmap/wrapper.go b/integration/wrapper/configmap/wrapper.go
@@ -15,9 +15,9 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/giantswarm/operatorkit/v8/integration/env"
-	"github.com/giantswarm/operatorkit/v8/pkg/controller"
-	"github.com/giantswarm/operatorkit/v8/pkg/resource"
+	"github.com/giantswarm/operatorkit/v7/integration/env"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource"
 )
 
 type Config struct {

diff --git a/integration/wrapper/example/crud.go b/integration/wrapper/example/crud.go
@@ -9,7 +9,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	v1 "github.com/giantswarm/operatorkit/v8/api/v1"
+	v1 "github.com/giantswarm/operatorkit/v7/api/v1"
 )
 
 func (w Wrapper) CreateObject(ctx context.Context, namespace string, obj interface{}) (interface{}, error) {

diff --git a/integration/wrapper/example/wrapper.go b/integration/wrapper/example/wrapper.go
@@ -17,10 +17,10 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
-	v1 "github.com/giantswarm/operatorkit/v8/api/v1"
-	"github.com/giantswarm/operatorkit/v8/integration/env"
-	"github.com/giantswarm/operatorkit/v8/pkg/controller"
-	"github.com/giantswarm/operatorkit/v8/pkg/resource"
+	v1 "github.com/giantswarm/operatorkit/v7/api/v1"
+	"github.com/giantswarm/operatorkit/v7/integration/env"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource"
 )
 
 type Config struct {

diff --git a/integration/wrapper/spec.go b/integration/wrapper/spec.go
@@ -3,7 +3,7 @@ package wrapper
 import (
 	"context"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/controller"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller"
 )
 
 type Interface interface {

diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -31,15 +31,15 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/controller/collector"
-	"github.com/giantswarm/operatorkit/v8/pkg/controller/context/cachekeycontext"
-	"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"
-	"github.com/giantswarm/operatorkit/v8/pkg/controller/context/reconciliationcanceledcontext"
-	"github.com/giantswarm/operatorkit/v8/pkg/controller/context/resourcecanceledcontext"
-	"github.com/giantswarm/operatorkit/v8/pkg/controller/context/updateallowedcontext"
-	"github.com/giantswarm/operatorkit/v8/pkg/controller/internal/recorder"
-	"github.com/giantswarm/operatorkit/v8/pkg/controller/internal/sentry"
-	"github.com/giantswarm/operatorkit/v8/pkg/resource"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller/collector"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller/context/cachekeycontext"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller/context/updateallowedcontext"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller/internal/recorder"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller/internal/sentry"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource"
 )
 
 const (

diff --git a/pkg/controller/controller_test.go b/pkg/controller/controller_test.go
@@ -13,7 +13,7 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource"
 )
 
 func Test_Controller_Collector_Register(t *testing.T) {

diff --git a/pkg/controller/finalizer.go b/pkg/controller/finalizer.go
@@ -13,7 +13,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/controller/context/finalizerskeptcontext"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller/context/finalizerskeptcontext"
 )
 
 const (

diff --git a/pkg/controller/internal/name/name.go b/pkg/controller/internal/name/name.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/handler"
+	"github.com/giantswarm/operatorkit/v7/pkg/handler"
 )
 
 func Name(r handler.Interface) string {

diff --git a/pkg/controller/internal/name/name_test.go b/pkg/controller/internal/name/name_test.go
@@ -4,10 +4,10 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/controller/internal/test/handler/bar"
-	"github.com/giantswarm/operatorkit/v8/pkg/controller/internal/test/handler/foo"
-	"github.com/giantswarm/operatorkit/v8/pkg/controller/internal/test/handler/nopointer"
-	"github.com/giantswarm/operatorkit/v8/pkg/handler"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller/internal/test/handler/bar"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller/internal/test/handler/foo"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller/internal/test/handler/nopointer"
+	"github.com/giantswarm/operatorkit/v7/pkg/handler"
 )
 
 func Test_Handler_Name(t *testing.T) {

diff --git a/pkg/controller/internal/test/handler/bar/handler.go b/pkg/controller/internal/test/handler/bar/handler.go
@@ -3,7 +3,7 @@ package bar
 import (
 	"context"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/handler"
+	"github.com/giantswarm/operatorkit/v7/pkg/handler"
 )
 
 type Handler struct{}

diff --git a/pkg/controller/internal/test/handler/foo/handler.go b/pkg/controller/internal/test/handler/foo/handler.go
@@ -3,7 +3,7 @@ package foo
 import (
 	"context"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/handler"
+	"github.com/giantswarm/operatorkit/v7/pkg/handler"
 )
 
 type Handler struct{}

diff --git a/pkg/controller/internal/test/handler/nopointer/handler.go b/pkg/controller/internal/test/handler/nopointer/handler.go
@@ -3,7 +3,7 @@ package nopointer
 import (
 	"context"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/handler"
+	"github.com/giantswarm/operatorkit/v7/pkg/handler"
 )
 
 type Handler struct{}

diff --git a/pkg/flag/service/kubernetes/kubernetes.go b/pkg/flag/service/kubernetes/kubernetes.go
@@ -1,8 +1,8 @@
 package kubernetes
 
 import (
-	"github.com/giantswarm/operatorkit/v8/pkg/flag/service/kubernetes/tls"
-	"github.com/giantswarm/operatorkit/v8/pkg/flag/service/kubernetes/watch"
+	"github.com/giantswarm/operatorkit/v7/pkg/flag/service/kubernetes/tls"
+	"github.com/giantswarm/operatorkit/v7/pkg/flag/service/kubernetes/watch"
 )
 
 // Kubernetes is a data structure to hold Kubernetes specific command line

diff --git a/pkg/resource/crud/resource.go b/pkg/resource/crud/resource.go
@@ -7,8 +7,8 @@ import (
 	"github.com/giantswarm/micrologger"
 	"github.com/giantswarm/micrologger/loggermeta"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/controller/context/reconciliationcanceledcontext"
-	"github.com/giantswarm/operatorkit/v8/pkg/controller/context/resourcecanceledcontext"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller/context/reconciliationcanceledcontext"
+	"github.com/giantswarm/operatorkit/v7/pkg/controller/context/resourcecanceledcontext"
 )
 
 type ResourceConfig struct {

diff --git a/pkg/resource/crud/resource_test.go b/pkg/resource/crud/resource_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/giantswarm/micrologger/microloggertest"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource"
 )
 
 func Test_Resource_CRUD_Interface(t *testing.T) {

diff --git a/pkg/resource/k8s/configmapresource/patch.go b/pkg/resource/k8s/configmapresource/patch.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/giantswarm/microerror"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
 )
 
 func (r *Resource) NewDeletePatch(ctx context.Context, obj, currentState, desiredState interface{}) (*crud.Patch, error) {

diff --git a/pkg/resource/k8s/secretresource/patch.go b/pkg/resource/k8s/secretresource/patch.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/giantswarm/microerror"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
 )
 
 func (r *Resource) NewDeletePatch(ctx context.Context, obj, currentState, desiredState interface{}) (*crud.Patch, error) {

diff --git a/pkg/resource/wrapper/internal/crud.go b/pkg/resource/wrapper/internal/crud.go
@@ -1,8 +1,8 @@
 package internal
 
 import (
-	"github.com/giantswarm/operatorkit/v8/pkg/resource"
-	"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
 )
 
 func CRUD(r resource.Interface) (crud.Interface, bool) {

diff --git a/pkg/resource/wrapper/internal/crud_test.go b/pkg/resource/wrapper/internal/crud_test.go
@@ -3,7 +3,7 @@ package internal
 import (
 	"testing"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/internal/test"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/internal/test"
 )
 
 func Test_CRUD_success(t *testing.T) {

diff --git a/pkg/resource/wrapper/internal/test/nop_crud.go b/pkg/resource/wrapper/internal/test/nop_crud.go
@@ -3,7 +3,7 @@ package test
 import (
 	"context"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
 )
 
 type NopCRUD struct {

diff --git a/pkg/resource/wrapper/internal/test/nop_crud_resource.go b/pkg/resource/wrapper/internal/test/nop_crud_resource.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/giantswarm/micrologger/microloggertest"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource"
-	"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
 )
 
 func NewNopCRUDResource() resource.Interface {

diff --git a/pkg/resource/wrapper/metricsresource/basic_resource.go b/pkg/resource/wrapper/metricsresource/basic_resource.go
@@ -6,7 +6,7 @@ import (
 	"github.com/giantswarm/microerror"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource"
 )
 
 type basicResourceConfig struct {

diff --git a/pkg/resource/wrapper/metricsresource/crud_resource.go b/pkg/resource/wrapper/metricsresource/crud_resource.go
@@ -6,7 +6,7 @@ import (
 	"github.com/giantswarm/microerror"
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
 )
 
 type crudResourceConfig struct {

diff --git a/pkg/resource/wrapper/metricsresource/metrics_resource.go b/pkg/resource/wrapper/metricsresource/metrics_resource.go
@@ -4,9 +4,9 @@ import (
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger/microloggertest"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource"
-	"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
-	"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/internal"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/internal"
 )
 
 type Config struct {

diff --git a/pkg/resource/wrapper/metricsresource/metrics_resource_test.go b/pkg/resource/wrapper/metricsresource/metrics_resource_test.go
@@ -3,8 +3,8 @@ package metricsresource
 import (
 	"testing"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/internal"
-	"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/internal/test"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/internal"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/internal/test"
 )
 
 // Test_CRUD_success tests if wrapping CRUD resource allows extracting

diff --git a/pkg/resource/wrapper/metricsresource/wrap.go b/pkg/resource/wrapper/metricsresource/wrap.go
@@ -3,7 +3,7 @@ package metricsresource
 import (
 	"github.com/giantswarm/microerror"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource"
 )
 
 // WrapConfig is the configuration used to wrap resources with metrics resources.

diff --git a/pkg/resource/wrapper/retryresource/basic_resource.go b/pkg/resource/wrapper/retryresource/basic_resource.go
@@ -8,7 +8,7 @@ import (
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource"
 )
 
 type basicResourceConfig struct {

diff --git a/pkg/resource/wrapper/retryresource/crud_resource.go b/pkg/resource/wrapper/retryresource/crud_resource.go
@@ -8,7 +8,7 @@ import (
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
 )
 
 type crudResourceConfig struct {

diff --git a/pkg/resource/wrapper/retryresource/retry_resource.go b/pkg/resource/wrapper/retryresource/retry_resource.go
@@ -5,9 +5,9 @@ import (
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource"
-	"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
-	"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/internal"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource/crud"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/internal"
 )
 
 type Config struct {

diff --git a/pkg/resource/wrapper/retryresource/retry_resource_test.go b/pkg/resource/wrapper/retryresource/retry_resource_test.go
@@ -6,8 +6,8 @@ import (
 	"github.com/giantswarm/backoff"
 	"github.com/giantswarm/micrologger/microloggertest"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/internal"
-	"github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/internal/test"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/internal"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource/wrapper/internal/test"
 )
 
 // Test_CRUD_success tests if wrapping CRUD resource allows extracting

diff --git a/pkg/resource/wrapper/retryresource/wrap.go b/pkg/resource/wrapper/retryresource/wrap.go
@@ -7,7 +7,7 @@ import (
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger"
 
-	"github.com/giantswarm/operatorkit/v8/pkg/resource"
+	"github.com/giantswarm/operatorkit/v7/pkg/resource"
 )
 
 // WrapConfig is the configuration used to wrap resources with retry resources.