Skip to content

Commit

Permalink
Merge pull request #868 from Josh-Everett/update_app_api
Browse files Browse the repository at this point in the history
chore(deps): update application-api reference
  • Loading branch information
Josh-Everett authored Sep 12, 2024
2 parents 0885853 + 995b625 commit f08de4f
Show file tree
Hide file tree
Showing 85 changed files with 686 additions and 2,561 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ vet: ## Run go vet against code.
.PHONY: download-crds
download-crds: ## Vendoring doesn't fetch CRDs yaml files due pruning of dependencies, for testing we need to download full content of these modules with CRDs
# Ugly hack to download CRDs for tests, better solution is welcome
go mod download github.com/redhat-appstudio/application-api
go mod download github.com/konflux-ci/application-api
go mod download github.com/konflux-ci/release-service
go mod download github.com/tektoncd/pipeline

Expand Down
2 changes: 1 addition & 1 deletion cache/cache.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package cache
import (
"context"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/integration-service/api/v1beta2"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"

releasev1alpha1 "github.com/konflux-ci/release-service/api/v1alpha1"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
2 changes: 1 addition & 1 deletion cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ import (
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
integrationv1alpha1 "github.com/konflux-ci/integration-service/api/v1alpha1"
integrationv1beta1 "github.com/konflux-ci/integration-service/api/v1beta1"
integrationv1beta2 "github.com/konflux-ci/integration-service/api/v1beta2"
releasev1alpha1 "github.com/konflux-ci/release-service/api/v1alpha1"
pacv1alpha1 "github.com/openshift-pipelines/pipelines-as-code/pkg/apis/pipelinesascode/v1alpha1"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
//+kubebuilder:scaffold:imports
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/snapshotgc/snapshotgc.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strconv"

"github.com/go-logr/logr"
applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/operator-toolkit/metadata"
releasev1alpha1 "github.com/konflux-ci/release-service/api/v1alpha1"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
zap2 "go.uber.org/zap"
"go.uber.org/zap/zapcore"
core "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion cmd/snapshotgc/snapshotgc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (

gomonkey "github.com/agiledragon/gomonkey/v2"
"github.com/go-logr/logr"
applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
releasev1alpha1 "github.com/konflux-ci/release-service/api/v1alpha1"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/tonglil/buflogr"
core "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion gitops/gitops_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ import (

ctrl "sigs.k8s.io/controller-runtime"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
releasev1alpha1 "github.com/konflux-ci/release-service/api/v1alpha1"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
clientsetscheme "k8s.io/client-go/kubernetes/scheme"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
2 changes: 1 addition & 1 deletion gitops/snapshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ import (
"time"

"github.com/google/go-containerregistry/pkg/name"
applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/integration-service/helpers"
"github.com/konflux-ci/integration-service/pkg/metrics"
"github.com/konflux-ci/integration-service/tekton"
"github.com/konflux-ci/operator-toolkit/metadata"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
Expand Down
2 changes: 1 addition & 1 deletion gitops/snapshot_integration_tests_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"encoding/json"
"fmt"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
intgteststat "github.com/konflux-ci/integration-service/pkg/integrationteststatus"
"github.com/konflux-ci/operator-toolkit/metadata"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"sigs.k8s.io/controller-runtime/pkg/client"
)

Expand Down
2 changes: 1 addition & 1 deletion gitops/snapshot_integration_tests_status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
intgteststat "github.com/konflux-ci/integration-service/pkg/integrationteststatus"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"

"github.com/konflux-ci/integration-service/gitops"
"github.com/konflux-ci/operator-toolkit/metadata"
Expand Down
2 changes: 1 addition & 1 deletion gitops/snapshot_predicate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"

applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"

"sigs.k8s.io/controller-runtime/pkg/event"

Expand Down
2 changes: 1 addition & 1 deletion gitops/snapshot_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"strconv"
"time"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/integration-service/gitops"
"github.com/konflux-ci/operator-toolkit/metadata"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/types"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ require (
github.com/go-logr/logr v1.4.2
github.com/google/go-containerregistry v0.20.1
github.com/google/go-github/v45 v45.2.0
github.com/konflux-ci/application-api v0.0.0-20240812090716-e7eb2ecfb409
github.com/konflux-ci/operator-toolkit v0.0.0-20240402130556-ef6dcbeca69d
github.com/konflux-ci/release-service v0.0.0-20240514150425-d25d533f66ba
github.com/onsi/ginkgo/v2 v2.19.1
github.com/onsi/gomega v1.34.0
github.com/openshift-pipelines/pipelines-as-code v0.27.2
github.com/prometheus/client_golang v1.19.1
github.com/redhat-appstudio/application-api v0.0.0-20240106104232-18f545e48a03
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
github.com/tektoncd/pipeline v0.60.2
github.com/tonglil/buflogr v1.1.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,8 @@ github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dv
github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/konflux-ci/application-api v0.0.0-20240812090716-e7eb2ecfb409 h1:hAhhcfc/EXW9eKS827PmyYuhk+Y4KkVOsT53Uo9OzCU=
github.com/konflux-ci/application-api v0.0.0-20240812090716-e7eb2ecfb409/go.mod h1:948Z+a1IbfRT0RtoHzWWSN9YEucSbMJTHaMhz7dVICc=
github.com/konflux-ci/operator-toolkit v0.0.0-20240402130556-ef6dcbeca69d h1:z7j3mglNoXvIrw5Vz/Ul+izoITRaqYURPIWrFoEyHgI=
github.com/konflux-ci/operator-toolkit v0.0.0-20240402130556-ef6dcbeca69d/go.mod h1:AcChx7FjpYSIkDvQgaUKyauuF0PXm3ivB5MqZSC9Eis=
github.com/konflux-ci/release-service v0.0.0-20240514150425-d25d533f66ba h1:04A7d9bdym9vY6dXqjFE6RaB3elm7sSthnQQA/IBQxk=
Expand Down Expand Up @@ -322,8 +324,6 @@ github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43Z
github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9dFqnUakOjnEuMPJJJnI=
github.com/prometheus/statsd_exporter v0.26.1 h1:ucbIAdPmwAUcA+dU+Opok8Qt81Aw8HanlO+2N/Wjv7w=
github.com/prometheus/statsd_exporter v0.26.1/go.mod h1:XlDdjAmRmx3JVvPPYuFNUg+Ynyb5kR69iPPkQjxXFMk=
github.com/redhat-appstudio/application-api v0.0.0-20240106104232-18f545e48a03 h1:UUgrEyvQJhEnvghkEaY9YlxeAk+D4cop+Bd3+8jh0eQ=
github.com/redhat-appstudio/application-api v0.0.0-20240106104232-18f545e48a03/go.mod h1:YvckuKHe82eWloGk0/BpSw4YYG2owrGZAanztbOj3pQ=
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
Expand Down
2 changes: 1 addition & 1 deletion helpers/helpers_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ import (

ctrl "sigs.k8s.io/controller-runtime"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
releasev1alpha1 "github.com/konflux-ci/release-service/api/v1alpha1"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
clientsetscheme "k8s.io/client-go/kubernetes/scheme"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
2 changes: 1 addition & 1 deletion helpers/integration.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion helpers/integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ import (
. "github.com/onsi/gomega"
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/integration-service/gitops"
"github.com/konflux-ci/integration-service/helpers"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"github.com/tonglil/buflogr"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion helpers/logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"

"github.com/go-logr/logr"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
)
Expand Down
2 changes: 1 addition & 1 deletion helpers/logs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

"github.com/tonglil/buflogr"

applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/buildpipeline/buildpipeline_adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ import (

"k8s.io/client-go/util/retry"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/integration-service/gitops"
h "github.com/konflux-ci/integration-service/helpers"
"github.com/konflux-ci/integration-service/loader"
"github.com/konflux-ci/integration-service/tekton"
"github.com/konflux-ci/operator-toolkit/controller"
"github.com/konflux-ci/operator-toolkit/metadata"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
"k8s.io/apimachinery/pkg/api/errors"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ import (

ctrl "sigs.k8s.io/controller-runtime"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
toolkit "github.com/konflux-ci/operator-toolkit/loader"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
"github.com/tonglil/buflogr"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"k8s.io/client-go/util/retry"

"github.com/go-logr/logr"
applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/integration-service/helpers"
"github.com/konflux-ci/integration-service/loader"
"github.com/konflux-ci/integration-service/tekton"
"github.com/konflux-ci/operator-toolkit/controller"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (

ctrl "sigs.k8s.io/controller-runtime"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/integration-service/api/v1beta2"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"

toolkit "github.com/konflux-ci/operator-toolkit/test"
releasev1alpha1 "github.com/konflux-ci/release-service/api/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/component/component_adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (

"fmt"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/integration-service/gitops"
h "github.com/konflux-ci/integration-service/helpers"
"github.com/konflux-ci/integration-service/loader"
"github.com/konflux-ci/operator-toolkit/controller"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"k8s.io/apimachinery/pkg/api/errors"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/component/component_adapter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/integration-service/loader"
toolkit "github.com/konflux-ci/operator-toolkit/loader"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

Expand Down
2 changes: 1 addition & 1 deletion internal/controller/component/component_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"fmt"

"github.com/go-logr/logr"
applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/integration-service/helpers"
"github.com/konflux-ci/integration-service/loader"
"github.com/konflux-ci/operator-toolkit/controller"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/component/component_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/component/component_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ import (

ctrl "sigs.k8s.io/controller-runtime"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
releasev1alpha1 "github.com/konflux-ci/release-service/api/v1alpha1"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
clientsetscheme "k8s.io/client-go/kubernetes/scheme"
"sigs.k8s.io/controller-runtime/pkg/client"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import (
"fmt"
"strings"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/integration-service/gitops"
h "github.com/konflux-ci/integration-service/helpers"
"github.com/konflux-ci/integration-service/loader"
intgteststat "github.com/konflux-ci/integration-service/pkg/integrationteststatus"
"github.com/konflux-ci/integration-service/tekton"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"

"github.com/konflux-ci/operator-toolkit/controller"
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"

applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
tektonv1 "github.com/tektoncd/pipeline/pkg/apis/pipeline/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"context"
"fmt"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/integration-service/cache"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"k8s.io/client-go/util/retry"

"github.com/go-logr/logr"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/integration-service/gitops"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (

ctrl "sigs.k8s.io/controller-runtime"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/integration-service/api/v1beta2"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"

toolkit "github.com/konflux-ci/operator-toolkit/test"
releasev1alpha1 "github.com/konflux-ci/release-service/api/v1alpha1"
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/scenario/scenario_adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ package scenario

import (
"context"
applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/integration-service/api/v1beta2"
h "github.com/konflux-ci/integration-service/helpers"
"github.com/konflux-ci/integration-service/loader"
"github.com/konflux-ci/operator-toolkit/controller"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"
"k8s.io/apimachinery/pkg/api/meta"
"reflect"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/scenario/scenario_adapter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (

ctrl "sigs.k8s.io/controller-runtime"

applicationapiv1alpha1 "github.com/konflux-ci/application-api/api/v1alpha1"
"github.com/konflux-ci/integration-service/api/v1beta2"
"github.com/konflux-ci/integration-service/helpers"
applicationapiv1alpha1 "github.com/redhat-appstudio/application-api/api/v1alpha1"

"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
Loading

0 comments on commit f08de4f

Please sign in to comment.