Release v7.0.0 (#1312)

giantswarm · Nov 19, 2024 · c10548d · c10548d
1 parent f7b5d89
commit c10548d
Show file tree

Hide file tree

Showing 66 changed files with 136 additions and 135 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,8 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
 
 ## [Unreleased]
 
+## [7.0.0] - 2024-11-19
+
 ### Removed
 
 - Removed PSP support and thus support for pre v1.25 Kubernetes clusters.
@@ -771,7 +773,8 @@ from Helm 2 to Helm 3.
 
 - Flattening operator release structure.
 
-[Unreleased]: https://github.com/giantswarm/app-operator/compare/v6.11.2...HEAD
+[Unreleased]: https://github.com/giantswarm/app-operator/compare/v7.0.0...HEAD
+[7.0.0]: https://github.com/giantswarm/app-operator/compare/v6.11.2...v7.0.0
 [6.11.2]: https://github.com/giantswarm/app-operator/compare/v6.11.1...v6.11.2
 [6.11.1]: https://github.com/giantswarm/app-operator/compare/v6.11.0...v6.11.1
 [6.11.0]: https://github.com/giantswarm/app-operator/compare/v6.10.3...v6.11.0

diff --git a/flag/flag.go b/flag/flag.go
@@ -3,7 +3,7 @@ package flag
 import (
 	"github.com/giantswarm/microkit/flag"
 
-	"github.com/giantswarm/app-operator/v6/flag/service"
+	"github.com/giantswarm/app-operator/v7/flag/service"
 )
 
 // Flag provides data structure for service command line flags.

diff --git a/flag/service/helm/helm.go b/flag/service/helm/helm.go
@@ -1,7 +1,7 @@
 package helm
 
 import (
-	"github.com/giantswarm/app-operator/v6/flag/service/helm/http"
+	"github.com/giantswarm/app-operator/v7/flag/service/helm/http"
 )
 
 type Helm struct {

diff --git a/flag/service/service.go b/flag/service/service.go
@@ -1,14 +1,14 @@
 package service
 
 import (
-	"github.com/giantswarm/app-operator/v6/flag/service/app"
-	"github.com/giantswarm/app-operator/v6/flag/service/appcatalog"
-	"github.com/giantswarm/app-operator/v6/flag/service/chart"
-	"github.com/giantswarm/app-operator/v6/flag/service/helm"
-	"github.com/giantswarm/app-operator/v6/flag/service/image"
-	"github.com/giantswarm/app-operator/v6/flag/service/kubernetes"
-	"github.com/giantswarm/app-operator/v6/flag/service/operatorkit"
-	"github.com/giantswarm/app-operator/v6/flag/service/provider"
+	"github.com/giantswarm/app-operator/v7/flag/service/app"
+	"github.com/giantswarm/app-operator/v7/flag/service/appcatalog"
+	"github.com/giantswarm/app-operator/v7/flag/service/chart"
+	"github.com/giantswarm/app-operator/v7/flag/service/helm"
+	"github.com/giantswarm/app-operator/v7/flag/service/image"
+	"github.com/giantswarm/app-operator/v7/flag/service/kubernetes"
+	"github.com/giantswarm/app-operator/v7/flag/service/operatorkit"
+	"github.com/giantswarm/app-operator/v7/flag/service/provider"
 )
 
 // Service is an intermediate data structure for command line configuration flags.

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/giantswarm/app-operator/v6
+module github.com/giantswarm/app-operator/v7
 
 go 1.21
 
@@ -114,7 +114,6 @@ require (
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/moby/locker v1.0.1 // indirect
 	github.com/moby/spdystream v0.2.0 // indirect
-	github.com/moby/sys/mountinfo v0.6.2 // indirect
 	github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect

diff --git a/go.sum b/go.sum
@@ -537,8 +537,8 @@ github.com/moby/moby v20.10.27+incompatible h1:+4udGmxaQ3uP7Cu1IBmar/A95hXFP/OSR
 github.com/moby/moby v20.10.27+incompatible/go.mod h1:fDXVQ6+S340veQPv35CzDahGBmHsiclFwfEygB/TWMc=
 github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8=
 github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
-github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78=
-github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
+github.com/moby/sys/mountinfo v0.5.0 h1:2Ks8/r6lopsxWi9m58nlwjaeSzUX9iiL1vj5qB/9ObI=
+github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
 github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA1fcDN2L11Bule0iFy3YlAI=
 github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -931,7 +931,6 @@ golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210909193231-528a39cd75f3/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
 golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

diff --git a/helm/app-operator/Chart.yaml b/helm/app-operator/Chart.yaml
@@ -3,7 +3,7 @@ description: A Helm chart for the app-operator
 home: https://github.com/giantswarm/app-operator
 name: app-operator
 appVersion: 6.11.3-dev
-version: 6.11.3-dev
+version: 7.0.0
 icon: https://s.giantswarm.io/app-icons/giantswarm/1/dark.svg
 annotations:
   application.giantswarm.io/team: "honeybadger"

diff --git a/integration/key/key.go b/integration/key/key.go
@@ -7,9 +7,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/giantswarm/app-operator/v6/integration/env"
+	"github.com/giantswarm/app-operator/v7/integration/env"
 
-	"github.com/giantswarm/app-operator/v6/pkg/project"
+	"github.com/giantswarm/app-operator/v7/pkg/project"
 )
 
 func CatalogConfigMapName() string {

diff --git a/integration/setup/config.go b/integration/setup/config.go
@@ -15,8 +15,8 @@ import (
 
 	prometheusMonitoringV1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 
-	"github.com/giantswarm/app-operator/v6/integration/env"
-	"github.com/giantswarm/app-operator/v6/integration/release"
+	"github.com/giantswarm/app-operator/v7/integration/env"
+	"github.com/giantswarm/app-operator/v7/integration/release"
 )
 
 type Config struct {

diff --git a/integration/setup/setup.go b/integration/setup/setup.go
@@ -16,9 +16,9 @@ import (
 	"github.com/spf13/afero"
 	"sigs.k8s.io/yaml"
 
-	"github.com/giantswarm/app-operator/v6/integration/key"
-	"github.com/giantswarm/app-operator/v6/integration/templates"
-	"github.com/giantswarm/app-operator/v6/pkg/project"
+	"github.com/giantswarm/app-operator/v7/integration/key"
+	"github.com/giantswarm/app-operator/v7/integration/templates"
+	"github.com/giantswarm/app-operator/v7/pkg/project"
 )
 
 func Setup(m *testing.M, config Config) {

diff --git a/integration/test/app/basic/basic_test.go b/integration/test/app/basic/basic_test.go
@@ -16,8 +16,8 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/yaml"
 
-	"github.com/giantswarm/app-operator/v6/integration/key"
-	"github.com/giantswarm/app-operator/v6/integration/templates"
+	"github.com/giantswarm/app-operator/v7/integration/key"
+	"github.com/giantswarm/app-operator/v7/integration/templates"
 )
 
 // TestAppLifecycle tests a chart CR can be created, updated and deleted

diff --git a/integration/test/app/basic/main_test.go b/integration/test/app/basic/main_test.go
@@ -6,7 +6,7 @@ package basic
 import (
 	"testing"
 
-	"github.com/giantswarm/app-operator/v6/integration/setup"
+	"github.com/giantswarm/app-operator/v7/integration/setup"
 )
 
 var (

diff --git a/integration/test/app/workload/main_test.go b/integration/test/app/workload/main_test.go
@@ -6,7 +6,7 @@ package workload
 import (
 	"testing"
 
-	"github.com/giantswarm/app-operator/v6/integration/setup"
+	"github.com/giantswarm/app-operator/v7/integration/setup"
 )
 
 var (

diff --git a/integration/test/app/workload/workload_cluster_test.go b/integration/test/app/workload/workload_cluster_test.go
@@ -14,10 +14,10 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/clientcmd/api"
 
-	"github.com/giantswarm/app-operator/v6/integration/env"
-	"github.com/giantswarm/app-operator/v6/integration/key"
-	"github.com/giantswarm/app-operator/v6/integration/templates"
-	"github.com/giantswarm/app-operator/v6/pkg/project"
+	"github.com/giantswarm/app-operator/v7/integration/env"
+	"github.com/giantswarm/app-operator/v7/integration/key"
+	"github.com/giantswarm/app-operator/v7/integration/templates"
+	"github.com/giantswarm/app-operator/v7/pkg/project"
 )
 
 const (

diff --git a/integration/test/catalog/appcatalogentry/app_catalog_entry_test.go b/integration/test/catalog/appcatalogentry/app_catalog_entry_test.go
@@ -21,9 +21,9 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/giantswarm/app-operator/v6/integration/key"
-	pkglabel "github.com/giantswarm/app-operator/v6/pkg/label"
-	"github.com/giantswarm/app-operator/v6/pkg/project"
+	"github.com/giantswarm/app-operator/v7/integration/key"
+	pkglabel "github.com/giantswarm/app-operator/v7/pkg/label"
+	"github.com/giantswarm/app-operator/v7/pkg/project"
 )
 
 // TestAppCatalogEntry tests appcatalogentry CRs are generated for the

diff --git a/integration/test/catalog/appcatalogentry/main_test.go b/integration/test/catalog/appcatalogentry/main_test.go
@@ -6,7 +6,7 @@ package appcatalogentry
 import (
 	"testing"
 
-	"github.com/giantswarm/app-operator/v6/integration/setup"
+	"github.com/giantswarm/app-operator/v7/integration/setup"
 )
 
 var (

diff --git a/integration/test/watcher/configmap/configmap_test.go b/integration/test/watcher/configmap/configmap_test.go
@@ -18,7 +18,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
-	"github.com/giantswarm/app-operator/v6/integration/key"
+	"github.com/giantswarm/app-operator/v7/integration/key"
 )
 
 // TestWatchingConfigMap tests app CRs are updated when wired configmaps are updated

diff --git a/integration/test/watcher/configmap/main_test.go b/integration/test/watcher/configmap/main_test.go
@@ -6,7 +6,7 @@ package configmap
 import (
 	"testing"
 
-	"github.com/giantswarm/app-operator/v6/integration/setup"
+	"github.com/giantswarm/app-operator/v7/integration/setup"
 )
 
 var (

diff --git a/main.go b/main.go
@@ -15,10 +15,10 @@ import (
 	"github.com/spf13/viper"
 	"k8s.io/client-go/rest"
 
-	"github.com/giantswarm/app-operator/v6/flag"
-	"github.com/giantswarm/app-operator/v6/pkg/project"
-	"github.com/giantswarm/app-operator/v6/server"
-	"github.com/giantswarm/app-operator/v6/service"
+	"github.com/giantswarm/app-operator/v7/flag"
+	"github.com/giantswarm/app-operator/v7/pkg/project"
+	"github.com/giantswarm/app-operator/v7/server"
+	"github.com/giantswarm/app-operator/v7/service"
 )
 
 var (

diff --git a/pkg/label/label.go b/pkg/label/label.go
@@ -8,7 +8,7 @@ import (
 	"github.com/giantswarm/k8smetadata/pkg/label"
 	"k8s.io/apimachinery/pkg/labels"
 
-	"github.com/giantswarm/app-operator/v6/pkg/project"
+	"github.com/giantswarm/app-operator/v7/pkg/project"
 )
 
 const (

diff --git a/pkg/project/project.go b/pkg/project/project.go
@@ -5,7 +5,7 @@ var (
 	gitSHA      = "n/a"
 	name        = "app-operator"
 	source      = "https://github.com/giantswarm/app-operator"
-	version     = "6.11.3-dev"
+	version     = "7.0.0"
 )
 
 func Description() string {

diff --git 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/app-operator/v6/service"
+	"github.com/giantswarm/app-operator/v7/service"
 )
 
 // Config represents the configuration used to construct an endpoint.

diff --git a/server/middleware/middleware.go b/server/middleware/middleware.go
@@ -3,7 +3,7 @@ package middleware
 import (
 	"github.com/giantswarm/micrologger"
 
-	"github.com/giantswarm/app-operator/v6/service"
+	"github.com/giantswarm/app-operator/v7/service"
 )
 
 // Config represents the configuration used to construct middleware.

diff --git a/server/server.go b/server/server.go
@@ -10,9 +10,9 @@ import (
 	"github.com/giantswarm/micrologger"
 	"github.com/spf13/viper"
 
-	"github.com/giantswarm/app-operator/v6/pkg/project"
-	"github.com/giantswarm/app-operator/v6/server/endpoint"
-	"github.com/giantswarm/app-operator/v6/service"
+	"github.com/giantswarm/app-operator/v7/pkg/project"
+	"github.com/giantswarm/app-operator/v7/server/endpoint"
+	"github.com/giantswarm/app-operator/v7/service"
 )
 
 // Config represents the configuration used to construct server object.

diff --git a/service/controller/app/app.go b/service/controller/app/app.go
@@ -15,11 +15,11 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/giantswarm/app-operator/v6/pkg/label"
-	"github.com/giantswarm/app-operator/v6/pkg/project"
-	"github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext"
-	"github.com/giantswarm/app-operator/v6/service/internal/clientcache"
-	"github.com/giantswarm/app-operator/v6/service/internal/indexcache"
+	"github.com/giantswarm/app-operator/v7/pkg/label"
+	"github.com/giantswarm/app-operator/v7/pkg/project"
+	"github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext"
+	"github.com/giantswarm/app-operator/v7/service/internal/clientcache"
+	"github.com/giantswarm/app-operator/v7/service/internal/indexcache"
 )
 
 const appControllerSuffix = "-app"

diff --git a/service/controller/app/resource/appnamespace/resource.go b/service/controller/app/resource/appnamespace/resource.go
@@ -9,7 +9,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 
-	"github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext"
+	"github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext"
 )
 
 const (

diff --git a/service/controller/app/resource/catalog/resource.go b/service/controller/app/resource/catalog/resource.go
@@ -12,7 +12,7 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext"
+	"github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext"
 )
 
 const (

diff --git a/service/controller/app/resource/chart/create.go b/service/controller/app/resource/chart/create.go
@@ -8,7 +8,7 @@ import (
 	"github.com/giantswarm/microerror"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 
-	"github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext"
+	"github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext"
 )
 
 func (r *Resource) ApplyCreateChange(ctx context.Context, obj, createChange interface{}) error {

diff --git a/service/controller/app/resource/chart/current.go b/service/controller/app/resource/chart/current.go
@@ -11,8 +11,8 @@ import (
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 
-	"github.com/giantswarm/app-operator/v6/pkg/status"
-	"github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext"
+	"github.com/giantswarm/app-operator/v7/pkg/status"
+	"github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext"
 )
 
 func (r *Resource) GetCurrentState(ctx context.Context, obj interface{}) (interface{}, error) {

diff --git a/service/controller/app/resource/chart/delete.go b/service/controller/app/resource/chart/delete.go
@@ -8,7 +8,7 @@ import (
 	"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 
-	"github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext"
+	"github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext"
 )
 
 func (r *Resource) ApplyDeleteChange(ctx context.Context, obj, deleteChange interface{}) error {

diff --git a/service/controller/app/resource/chart/desired.go b/service/controller/app/resource/chart/desired.go
@@ -24,10 +24,10 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/giantswarm/app-operator/v6/pkg/project"
-	"github.com/giantswarm/app-operator/v6/pkg/status"
-	"github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext"
-	"github.com/giantswarm/app-operator/v6/service/internal/indexcache"
+	"github.com/giantswarm/app-operator/v7/pkg/project"
+	"github.com/giantswarm/app-operator/v7/pkg/status"
+	"github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext"
+	"github.com/giantswarm/app-operator/v7/service/internal/indexcache"
 )
 
 const (

diff --git a/service/controller/app/resource/chart/desired_test.go b/service/controller/app/resource/chart/desired_test.go
@@ -24,9 +24,9 @@ import (
 	clientgofake "k8s.io/client-go/kubernetes/fake"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake" //nolint:staticcheck
 
-	"github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext"
-	"github.com/giantswarm/app-operator/v6/service/internal/indexcache"
-	"github.com/giantswarm/app-operator/v6/service/internal/indexcache/indexcachetest"
+	"github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext"
+	"github.com/giantswarm/app-operator/v7/service/internal/indexcache"
+	"github.com/giantswarm/app-operator/v7/service/internal/indexcache/indexcachetest"
 )
 
 func Test_Resource_GetDesiredState(t *testing.T) {

diff --git a/service/controller/app/resource/chart/resource.go b/service/controller/app/resource/chart/resource.go
@@ -13,8 +13,8 @@ import (
 	"k8s.io/client-go/dynamic"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	"github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext"
-	"github.com/giantswarm/app-operator/v6/service/internal/indexcache"
+	"github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext"
+	"github.com/giantswarm/app-operator/v7/service/internal/indexcache"
 )
 
 const (

diff --git a/service/controller/app/resource/chart/update.go b/service/controller/app/resource/chart/update.go
@@ -10,7 +10,7 @@ import (
 	"github.com/giantswarm/operatorkit/v8/pkg/resource/crud"
 	"github.com/google/go-cmp/cmp"
 
-	"github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext"
+	"github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext"
 )
 
 func (r *Resource) ApplyUpdateChange(ctx context.Context, obj, updateChange interface{}) error {