Skip to content

Commit

Permalink
Use app-operator v7 in integration tests as well
Browse files Browse the repository at this point in the history
  • Loading branch information
@uvegla
uvegla committed Nov 19, 2024
1 parent c8a578b commit d7549e4
Show file tree
Hide file tree
Showing 13 changed files with 23 additions and 26 deletions.
1 change: 0 additions & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 2 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down
4 changes: 2 additions & 2 deletions integration/key/key.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions integration/setup/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions integration/setup/setup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions integration/test/app/basic/basic_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration/test/app/basic/main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion integration/test/app/workload/main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
8 changes: 4 additions & 4 deletions integration/test/app/workload/workload_cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions integration/test/catalog/appcatalogentry/app_catalog_entry_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration/test/catalog/appcatalogentry/main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion integration/test/watcher/configmap/configmap_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion integration/test/watcher/configmap/main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down

0 comments on commit d7549e4

Please sign in to comment.