From 0ba097594f056f3031a6578c56d327bfcec3f9a5 Mon Sep 17 00:00:00 2001 From: taylorbot Date: Tue, 19 Nov 2024 09:07:54 +0000 Subject: [PATCH 1/3] Release v7.0.0 --- CHANGELOG.md | 5 +++- flag/flag.go | 2 +- flag/service/helm/helm.go | 2 +- flag/service/service.go | 16 +++++------ go.mod | 2 +- helm/app-operator/Chart.yaml | 2 +- main.go | 8 +++--- pkg/label/label.go | 2 +- pkg/project/project.go | 2 +- server/endpoint/endpoint.go | 2 +- server/middleware/middleware.go | 2 +- server/server.go | 6 ++-- service/controller/app/app.go | 10 +++---- .../app/resource/appnamespace/resource.go | 2 +- .../app/resource/catalog/resource.go | 2 +- .../controller/app/resource/chart/create.go | 2 +- .../controller/app/resource/chart/current.go | 4 +-- .../controller/app/resource/chart/delete.go | 2 +- .../controller/app/resource/chart/desired.go | 8 +++--- .../app/resource/chart/desired_test.go | 6 ++-- .../controller/app/resource/chart/resource.go | 4 +-- .../controller/app/resource/chart/update.go | 2 +- .../app/resource/chart/update_test.go | 4 +-- .../app/resource/chartcrd/create.go | 4 +-- .../app/resource/chartoperator/create.go | 2 +- .../app/resource/chartoperator/create_test.go | 2 +- .../app/resource/chartoperator/delete.go | 2 +- .../app/resource/chartoperator/resource.go | 2 +- .../app/resource/clients/resource.go | 4 +-- .../app/resource/configmap/create.go | 2 +- .../app/resource/configmap/current.go | 2 +- .../app/resource/configmap/delete.go | 2 +- .../app/resource/configmap/desired.go | 6 ++-- .../app/resource/configmap/desired_test.go | 2 +- .../app/resource/configmap/resource.go | 2 +- .../app/resource/configmap/update.go | 2 +- .../controller/app/resource/secret/create.go | 2 +- .../controller/app/resource/secret/current.go | 2 +- .../controller/app/resource/secret/delete.go | 2 +- .../controller/app/resource/secret/desired.go | 6 ++-- .../app/resource/secret/desired_test.go | 2 +- .../app/resource/secret/resource.go | 2 +- .../controller/app/resource/secret/update.go | 2 +- .../controller/app/resource/status/create.go | 2 +- .../app/resource/tcnamespace/create.go | 4 +-- .../app/resource/validation/create.go | 2 +- service/controller/app/resources.go | 28 +++++++++---------- service/controller/catalog/catalog.go | 2 +- .../resource/appcatalogentry/create.go | 4 +-- .../resource/appcatalogentry/resource.go | 2 +- service/controller/catalog/resources.go | 4 +-- .../indexcache/indexcachetest/cache.go | 2 +- service/service.go | 20 ++++++------- service/watcher/appvalue/appvalue.go | 4 +-- 54 files changed, 113 insertions(+), 110 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a5651cec..5d7210151 100644 --- 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 index 9db52cd95..02beeaa42 100644 --- 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 index 79fa8184f..51d0db9cb 100644 --- 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 index 6e4fa6d2c..9c71bbc4d 100644 --- 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 index 1a511f6b9..24ac7f093 100644 --- 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 diff --git a/helm/app-operator/Chart.yaml b/helm/app-operator/Chart.yaml index ad8b494d3..537fff0fe 100644 --- 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/main.go b/main.go index fe39ecaa3..0683b1fcb 100644 --- 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 index 708bf0176..c974b3ba2 100644 --- 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 index f1c99dcfa..32893ab46 100644 --- 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 index c29f28f1e..d08ec368f 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/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 index 506eccd3e..15e0c0968 100644 --- 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 index 118c5474a..c87431c10 100644 --- 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 index 6736ec17b..49926710f 100644 --- 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 index 2db4b2734..a363ba9b4 100644 --- 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 index 6a0e81e7b..514abb12b 100644 --- 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 index e1b0a643c..d7671bff3 100644 --- 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 index f14633a14..7d0d79f8b 100644 --- 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 index 1961e6560..559c03fa9 100644 --- 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 index fc110ec28..a11c24879 100644 --- 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 index 784a3ac21..234c11aee 100644 --- 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 index ed7a2f5f1..1a14f9e07 100644 --- 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 index 907da135a..0b74f7e85 100644 --- 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 { diff --git a/service/controller/app/resource/chart/update_test.go b/service/controller/app/resource/chart/update_test.go index c9d015f59..ae37bf1b2 100644 --- a/service/controller/app/resource/chart/update_test.go +++ b/service/controller/app/resource/chart/update_test.go @@ -17,8 +17,8 @@ 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/indexcachetest" + "github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext" + "github.com/giantswarm/app-operator/v7/service/internal/indexcache/indexcachetest" ) func Test_Resource_newUpdateChange(t *testing.T) { diff --git a/service/controller/app/resource/chartcrd/create.go b/service/controller/app/resource/chartcrd/create.go index 46cb6a366..ed393551a 100644 --- a/service/controller/app/resource/chartcrd/create.go +++ b/service/controller/app/resource/chartcrd/create.go @@ -12,8 +12,8 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "sigs.k8s.io/yaml" - "github.com/giantswarm/app-operator/v6/pkg/crd" - "github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext" + "github.com/giantswarm/app-operator/v7/pkg/crd" + "github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/app/resource/chartoperator/create.go b/service/controller/app/resource/chartoperator/create.go index a69d843db..c73daa2ff 100644 --- a/service/controller/app/resource/chartoperator/create.go +++ b/service/controller/app/resource/chartoperator/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/app-operator/v6/service/controller/app/controllercontext" + "github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext" ) func (r Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/app/resource/chartoperator/create_test.go b/service/controller/app/resource/chartoperator/create_test.go index 38de41ae3..e45a55329 100644 --- a/service/controller/app/resource/chartoperator/create_test.go +++ b/service/controller/app/resource/chartoperator/create_test.go @@ -20,7 +20,7 @@ import ( "k8s.io/client-go/kubernetes/scheme" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext" + "github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext" ) func Test_Resource_triggerReconciliation(t *testing.T) { diff --git a/service/controller/app/resource/chartoperator/delete.go b/service/controller/app/resource/chartoperator/delete.go index 535dfe48e..cd783fe95 100644 --- a/service/controller/app/resource/chartoperator/delete.go +++ b/service/controller/app/resource/chartoperator/delete.go @@ -6,7 +6,7 @@ import ( "github.com/giantswarm/app/v7/pkg/key" "github.com/giantswarm/microerror" - "github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext" + "github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext" ) func (r Resource) EnsureDeleted(ctx context.Context, obj interface{}) error { diff --git a/service/controller/app/resource/chartoperator/resource.go b/service/controller/app/resource/chartoperator/resource.go index e68cb4c70..d073531a8 100644 --- a/service/controller/app/resource/chartoperator/resource.go +++ b/service/controller/app/resource/chartoperator/resource.go @@ -23,7 +23,7 @@ import ( "k8s.io/client-go/kubernetes" "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/clients/resource.go b/service/controller/app/resource/clients/resource.go index 08440b477..63ced72ff 100644 --- a/service/controller/app/resource/clients/resource.go +++ b/service/controller/app/resource/clients/resource.go @@ -12,8 +12,8 @@ import ( "github.com/giantswarm/microerror" "github.com/giantswarm/micrologger" - "github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext" - "github.com/giantswarm/app-operator/v6/service/internal/clientcache" + "github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext" + "github.com/giantswarm/app-operator/v7/service/internal/clientcache" ) const ( diff --git a/service/controller/app/resource/configmap/create.go b/service/controller/app/resource/configmap/create.go index 62f200bfa..7f39e3120 100644 --- a/service/controller/app/resource/configmap/create.go +++ b/service/controller/app/resource/configmap/create.go @@ -10,7 +10,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "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/configmap/current.go b/service/controller/app/resource/configmap/current.go index 317989dcf..c1d479459 100644 --- a/service/controller/app/resource/configmap/current.go +++ b/service/controller/app/resource/configmap/current.go @@ -12,7 +12,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext" + "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/configmap/delete.go b/service/controller/app/resource/configmap/delete.go index c9f96186f..c6239ad26 100644 --- a/service/controller/app/resource/configmap/delete.go +++ b/service/controller/app/resource/configmap/delete.go @@ -8,7 +8,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "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/configmap/desired.go b/service/controller/app/resource/configmap/desired.go index ee0cc1dee..efb11b43c 100644 --- a/service/controller/app/resource/configmap/desired.go +++ b/service/controller/app/resource/configmap/desired.go @@ -14,9 +14,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" - "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/v7/pkg/project" + "github.com/giantswarm/app-operator/v7/pkg/status" + "github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext" ) func (r *Resource) GetDesiredState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/app/resource/configmap/desired_test.go b/service/controller/app/resource/configmap/desired_test.go index 27cd0f2f7..9f0f39186 100644 --- a/service/controller/app/resource/configmap/desired_test.go +++ b/service/controller/app/resource/configmap/desired_test.go @@ -20,7 +20,7 @@ import ( clientgofake "k8s.io/client-go/kubernetes/fake" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext" + "github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext" ) func Test_Resource_GetDesiredState(t *testing.T) { diff --git a/service/controller/app/resource/configmap/resource.go b/service/controller/app/resource/configmap/resource.go index 8ee839d98..40d234bb4 100644 --- a/service/controller/app/resource/configmap/resource.go +++ b/service/controller/app/resource/configmap/resource.go @@ -9,7 +9,7 @@ import ( "github.com/giantswarm/micrologger" corev1 "k8s.io/api/core/v1" - "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/configmap/update.go b/service/controller/app/resource/configmap/update.go index 10777fba5..c24f14f6b 100644 --- a/service/controller/app/resource/configmap/update.go +++ b/service/controller/app/resource/configmap/update.go @@ -8,7 +8,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "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 { diff --git a/service/controller/app/resource/secret/create.go b/service/controller/app/resource/secret/create.go index 787efadc3..c1fe3946d 100644 --- a/service/controller/app/resource/secret/create.go +++ b/service/controller/app/resource/secret/create.go @@ -10,7 +10,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "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/secret/current.go b/service/controller/app/resource/secret/current.go index 24c88e437..8b641bf60 100644 --- a/service/controller/app/resource/secret/current.go +++ b/service/controller/app/resource/secret/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/app-operator/v6/service/controller/app/controllercontext" + "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/secret/delete.go b/service/controller/app/resource/secret/delete.go index f5b0850a7..2d6da1c32 100644 --- a/service/controller/app/resource/secret/delete.go +++ b/service/controller/app/resource/secret/delete.go @@ -8,7 +8,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "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/secret/desired.go b/service/controller/app/resource/secret/desired.go index 9e9040b05..ebd194fc6 100644 --- a/service/controller/app/resource/secret/desired.go +++ b/service/controller/app/resource/secret/desired.go @@ -14,9 +14,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" - "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/v7/pkg/project" + "github.com/giantswarm/app-operator/v7/pkg/status" + "github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext" ) func (r *Resource) GetDesiredState(ctx context.Context, obj interface{}) (interface{}, error) { diff --git a/service/controller/app/resource/secret/desired_test.go b/service/controller/app/resource/secret/desired_test.go index b624cb417..d6176dc39 100644 --- a/service/controller/app/resource/secret/desired_test.go +++ b/service/controller/app/resource/secret/desired_test.go @@ -20,7 +20,7 @@ import ( clientgofake "k8s.io/client-go/kubernetes/fake" "sigs.k8s.io/controller-runtime/pkg/client/fake" - "github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext" + "github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext" ) func Test_Resource_GetDesiredState(t *testing.T) { diff --git a/service/controller/app/resource/secret/resource.go b/service/controller/app/resource/secret/resource.go index be03bf88c..a5e128f1d 100644 --- a/service/controller/app/resource/secret/resource.go +++ b/service/controller/app/resource/secret/resource.go @@ -9,7 +9,7 @@ import ( "github.com/giantswarm/micrologger" corev1 "k8s.io/api/core/v1" - "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/secret/update.go b/service/controller/app/resource/secret/update.go index d64fcc560..e968458b0 100644 --- a/service/controller/app/resource/secret/update.go +++ b/service/controller/app/resource/secret/update.go @@ -8,7 +8,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "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 { diff --git a/service/controller/app/resource/status/create.go b/service/controller/app/resource/status/create.go index 142bfdd04..03e368dd0 100644 --- a/service/controller/app/resource/status/create.go +++ b/service/controller/app/resource/status/create.go @@ -10,7 +10,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/types" - "github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext" + "github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/app/resource/tcnamespace/create.go b/service/controller/app/resource/tcnamespace/create.go index aec1805ac..85563c404 100644 --- a/service/controller/app/resource/tcnamespace/create.go +++ b/service/controller/app/resource/tcnamespace/create.go @@ -12,8 +12,8 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "github.com/giantswarm/app-operator/v6/pkg/project" - "github.com/giantswarm/app-operator/v6/service/controller/app/controllercontext" + "github.com/giantswarm/app-operator/v7/pkg/project" + "github.com/giantswarm/app-operator/v7/service/controller/app/controllercontext" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/app/resource/validation/create.go b/service/controller/app/resource/validation/create.go index 69adf7e18..7a19a06f9 100644 --- a/service/controller/app/resource/validation/create.go +++ b/service/controller/app/resource/validation/create.go @@ -11,7 +11,7 @@ import ( "github.com/giantswarm/operatorkit/v8/pkg/controller/context/reconciliationcanceledcontext" "k8s.io/apimachinery/pkg/types" - "github.com/giantswarm/app-operator/v6/pkg/status" + "github.com/giantswarm/app-operator/v7/pkg/status" ) func (r *Resource) EnsureCreated(ctx context.Context, obj interface{}) error { diff --git a/service/controller/app/resources.go b/service/controller/app/resources.go index 0ceb24da9..3fa00ed99 100644 --- a/service/controller/app/resources.go +++ b/service/controller/app/resources.go @@ -14,20 +14,20 @@ import ( "github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/retryresource" "github.com/spf13/afero" - "github.com/giantswarm/app-operator/v6/service/controller/app/resource/appfinalizermigration" - "github.com/giantswarm/app-operator/v6/service/controller/app/resource/appnamespace" - "github.com/giantswarm/app-operator/v6/service/controller/app/resource/catalog" - "github.com/giantswarm/app-operator/v6/service/controller/app/resource/chart" - "github.com/giantswarm/app-operator/v6/service/controller/app/resource/chartcrd" - "github.com/giantswarm/app-operator/v6/service/controller/app/resource/chartoperator" - "github.com/giantswarm/app-operator/v6/service/controller/app/resource/clients" - "github.com/giantswarm/app-operator/v6/service/controller/app/resource/configmap" - "github.com/giantswarm/app-operator/v6/service/controller/app/resource/secret" - "github.com/giantswarm/app-operator/v6/service/controller/app/resource/status" - "github.com/giantswarm/app-operator/v6/service/controller/app/resource/tcnamespace" - "github.com/giantswarm/app-operator/v6/service/controller/app/resource/validation" - "github.com/giantswarm/app-operator/v6/service/internal/clientcache" - "github.com/giantswarm/app-operator/v6/service/internal/indexcache" + "github.com/giantswarm/app-operator/v7/service/controller/app/resource/appfinalizermigration" + "github.com/giantswarm/app-operator/v7/service/controller/app/resource/appnamespace" + "github.com/giantswarm/app-operator/v7/service/controller/app/resource/catalog" + "github.com/giantswarm/app-operator/v7/service/controller/app/resource/chart" + "github.com/giantswarm/app-operator/v7/service/controller/app/resource/chartcrd" + "github.com/giantswarm/app-operator/v7/service/controller/app/resource/chartoperator" + "github.com/giantswarm/app-operator/v7/service/controller/app/resource/clients" + "github.com/giantswarm/app-operator/v7/service/controller/app/resource/configmap" + "github.com/giantswarm/app-operator/v7/service/controller/app/resource/secret" + "github.com/giantswarm/app-operator/v7/service/controller/app/resource/status" + "github.com/giantswarm/app-operator/v7/service/controller/app/resource/tcnamespace" + "github.com/giantswarm/app-operator/v7/service/controller/app/resource/validation" + "github.com/giantswarm/app-operator/v7/service/internal/clientcache" + "github.com/giantswarm/app-operator/v7/service/internal/indexcache" ) type appResourcesConfig struct { diff --git a/service/controller/catalog/catalog.go b/service/controller/catalog/catalog.go index b7211c3a8..5a7d37f4f 100644 --- a/service/controller/catalog/catalog.go +++ b/service/controller/catalog/catalog.go @@ -9,7 +9,7 @@ import ( "github.com/giantswarm/operatorkit/v8/pkg/resource" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/giantswarm/app-operator/v6/pkg/project" + "github.com/giantswarm/app-operator/v7/pkg/project" ) const catalogControllerSuffix = "-catalog" diff --git a/service/controller/catalog/resource/appcatalogentry/create.go b/service/controller/catalog/resource/appcatalogentry/create.go index 62b7df34b..f53c5f847 100644 --- a/service/controller/catalog/resource/appcatalogentry/create.go +++ b/service/controller/catalog/resource/appcatalogentry/create.go @@ -18,8 +18,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" - pkglabel "github.com/giantswarm/app-operator/v6/pkg/label" - "github.com/giantswarm/app-operator/v6/pkg/project" + pkglabel "github.com/giantswarm/app-operator/v7/pkg/label" + "github.com/giantswarm/app-operator/v7/pkg/project" ) // EnsureCreated ensures appcatalogentry CRs are created or updated for this diff --git a/service/controller/catalog/resource/appcatalogentry/resource.go b/service/controller/catalog/resource/appcatalogentry/resource.go index c5a9f73d5..94e200bf2 100644 --- a/service/controller/catalog/resource/appcatalogentry/resource.go +++ b/service/controller/catalog/resource/appcatalogentry/resource.go @@ -19,7 +19,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/yaml" - "github.com/giantswarm/app-operator/v6/pkg/project" + "github.com/giantswarm/app-operator/v7/pkg/project" ) const ( diff --git a/service/controller/catalog/resources.go b/service/controller/catalog/resources.go index ecf7b2ed9..1a32b907a 100644 --- a/service/controller/catalog/resources.go +++ b/service/controller/catalog/resources.go @@ -8,8 +8,8 @@ import ( "github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/metricsresource" "github.com/giantswarm/operatorkit/v8/pkg/resource/wrapper/retryresource" - "github.com/giantswarm/app-operator/v6/service/controller/catalog/resource/appcatalogentry" - "github.com/giantswarm/app-operator/v6/service/controller/catalog/resource/appcatalogsync" + "github.com/giantswarm/app-operator/v7/service/controller/catalog/resource/appcatalogentry" + "github.com/giantswarm/app-operator/v7/service/controller/catalog/resource/appcatalogsync" ) type catalogResourcesConfig struct { diff --git a/service/internal/indexcache/indexcachetest/cache.go b/service/internal/indexcache/indexcachetest/cache.go index 13119e90f..3d8e9a6f8 100644 --- a/service/internal/indexcache/indexcachetest/cache.go +++ b/service/internal/indexcache/indexcachetest/cache.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/giantswarm/app-operator/v6/service/internal/indexcache" + "github.com/giantswarm/app-operator/v7/service/internal/indexcache" ) type Config struct { diff --git a/service/service.go b/service/service.go index d6b6b6a42..4302c87a2 100644 --- a/service/service.go +++ b/service/service.go @@ -12,16 +12,16 @@ import ( "github.com/spf13/afero" "github.com/spf13/viper" - "github.com/giantswarm/app-operator/v6/flag" - "github.com/giantswarm/app-operator/v6/pkg/env" - "github.com/giantswarm/app-operator/v6/pkg/project" - "github.com/giantswarm/app-operator/v6/service/controller/app" - "github.com/giantswarm/app-operator/v6/service/controller/catalog" - "github.com/giantswarm/app-operator/v6/service/internal/clientcache" - "github.com/giantswarm/app-operator/v6/service/internal/indexcache" - "github.com/giantswarm/app-operator/v6/service/internal/recorder" - "github.com/giantswarm/app-operator/v6/service/watcher/appvalue" - "github.com/giantswarm/app-operator/v6/service/watcher/chartstatus" + "github.com/giantswarm/app-operator/v7/flag" + "github.com/giantswarm/app-operator/v7/pkg/env" + "github.com/giantswarm/app-operator/v7/pkg/project" + "github.com/giantswarm/app-operator/v7/service/controller/app" + "github.com/giantswarm/app-operator/v7/service/controller/catalog" + "github.com/giantswarm/app-operator/v7/service/internal/clientcache" + "github.com/giantswarm/app-operator/v7/service/internal/indexcache" + "github.com/giantswarm/app-operator/v7/service/internal/recorder" + "github.com/giantswarm/app-operator/v7/service/watcher/appvalue" + "github.com/giantswarm/app-operator/v7/service/watcher/chartstatus" ) // Config represents the configuration used to create a new service. diff --git a/service/watcher/appvalue/appvalue.go b/service/watcher/appvalue/appvalue.go index 56549d44c..db0f6d4dc 100644 --- a/service/watcher/appvalue/appvalue.go +++ b/service/watcher/appvalue/appvalue.go @@ -9,8 +9,8 @@ import ( "github.com/giantswarm/micrologger" "k8s.io/apimachinery/pkg/labels" - "github.com/giantswarm/app-operator/v6/pkg/label" - "github.com/giantswarm/app-operator/v6/service/internal/recorder" + "github.com/giantswarm/app-operator/v7/pkg/label" + "github.com/giantswarm/app-operator/v7/service/internal/recorder" ) type AppValueWatcherConfig struct { From c8a578b8483e90d898ffa336de3e2f64599a05cd Mon Sep 17 00:00:00 2001 From: Laszlo Uveges Date: Tue, 19 Nov 2024 10:15:32 +0100 Subject: [PATCH 2/3] Tidy go modules --- go.mod | 2 +- go.sum | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 24ac7f093..d45317258 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( github.com/Masterminds/semver/v3 v3.2.1 github.com/ghodss/yaml v1.0.0 github.com/giantswarm/apiextensions-application v0.6.1 + github.com/giantswarm/app-operator/v6 v6.11.2 github.com/giantswarm/app/v7 v7.0.1 github.com/giantswarm/appcatalog v1.0.0 github.com/giantswarm/apptest v1.2.1 @@ -114,7 +115,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 index d7f21bed1..3af68bc79 100644 --- a/go.sum +++ b/go.sum @@ -207,6 +207,8 @@ github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/giantswarm/apiextensions-application v0.6.1 h1:X1uzWBSrF4QsyyzaV46QkPJa+rXKBr9e0p+6nd8aw3A= github.com/giantswarm/apiextensions-application v0.6.1/go.mod h1:O6mg+EdXC9CyTLgi0d3rf6QTXrQX/79iw4kjMJRinig= +github.com/giantswarm/app-operator/v6 v6.11.2 h1:EUz+CdIbazCUCb+dD4QS0+l2RJDF9+0SntDladFwRZQ= +github.com/giantswarm/app-operator/v6 v6.11.2/go.mod h1:MhHfR29Fyj74zfBAPPDExjicqRjnLLa7WCdRUL2lVYg= github.com/giantswarm/app/v7 v7.0.1 h1:17WeHLroqYoWdcBjncjvBB9kumbo6xZlputgsKtnAeo= github.com/giantswarm/app/v7 v7.0.1/go.mod h1:/4BNdqZPXqjb7v1p4I92E6fzTLz0LswTCDCYVIP446M= github.com/giantswarm/appcatalog v1.0.0 h1:h2vNqd53ciYenoB04nrit4zruG4TeWiNT28t94l0wkw= @@ -931,7 +933,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= From d7549e441c2524e88c6559bdc3cb4c419dba6e29 Mon Sep 17 00:00:00 2001 From: Laszlo Uveges Date: Tue, 19 Nov 2024 10:32:45 +0100 Subject: [PATCH 3/3] Use app-operator v7 in integration tests as well --- go.mod | 1 - go.sum | 6 ++---- integration/key/key.go | 4 ++-- integration/setup/config.go | 4 ++-- integration/setup/setup.go | 6 +++--- integration/test/app/basic/basic_test.go | 4 ++-- integration/test/app/basic/main_test.go | 2 +- integration/test/app/workload/main_test.go | 2 +- integration/test/app/workload/workload_cluster_test.go | 8 ++++---- .../catalog/appcatalogentry/app_catalog_entry_test.go | 6 +++--- integration/test/catalog/appcatalogentry/main_test.go | 2 +- integration/test/watcher/configmap/configmap_test.go | 2 +- integration/test/watcher/configmap/main_test.go | 2 +- 13 files changed, 23 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index d45317258..6e24aeb87 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,6 @@ require ( github.com/Masterminds/semver/v3 v3.2.1 github.com/ghodss/yaml v1.0.0 github.com/giantswarm/apiextensions-application v0.6.1 - github.com/giantswarm/app-operator/v6 v6.11.2 github.com/giantswarm/app/v7 v7.0.1 github.com/giantswarm/appcatalog v1.0.0 github.com/giantswarm/apptest v1.2.1 diff --git a/go.sum b/go.sum index 3af68bc79..6260831cd 100644 --- a/go.sum +++ b/go.sum @@ -207,8 +207,6 @@ github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/giantswarm/apiextensions-application v0.6.1 h1:X1uzWBSrF4QsyyzaV46QkPJa+rXKBr9e0p+6nd8aw3A= github.com/giantswarm/apiextensions-application v0.6.1/go.mod h1:O6mg+EdXC9CyTLgi0d3rf6QTXrQX/79iw4kjMJRinig= -github.com/giantswarm/app-operator/v6 v6.11.2 h1:EUz+CdIbazCUCb+dD4QS0+l2RJDF9+0SntDladFwRZQ= -github.com/giantswarm/app-operator/v6 v6.11.2/go.mod h1:MhHfR29Fyj74zfBAPPDExjicqRjnLLa7WCdRUL2lVYg= github.com/giantswarm/app/v7 v7.0.1 h1:17WeHLroqYoWdcBjncjvBB9kumbo6xZlputgsKtnAeo= github.com/giantswarm/app/v7 v7.0.1/go.mod h1:/4BNdqZPXqjb7v1p4I92E6fzTLz0LswTCDCYVIP446M= github.com/giantswarm/appcatalog v1.0.0 h1:h2vNqd53ciYenoB04nrit4zruG4TeWiNT28t94l0wkw= @@ -539,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= diff --git a/integration/key/key.go b/integration/key/key.go index 698a30376..2404f4d92 100644 --- 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 index 9f27a8134..6716b7c0d 100644 --- 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 index 8b487ce4b..bf01c9f74 100644 --- 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 index 6996b8b4e..28b140f10 100644 --- 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 index 123892d1c..3600d3558 100644 --- 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 index 96f397a9d..b6c511a07 100644 --- 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 index 25da04bf9..cd8075fab 100644 --- 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 index 45210119e..9afa8e4bc 100644 --- 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 index ad56d49e1..8768c7478 100644 --- 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 index f0ef827fc..8ab95f071 100644 --- 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 index e697e6446..00af72c62 100644 --- 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 (