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 (