Skip to content

Commit 7858309

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #388 from mbaldessari/update-argo3
Update modules
2 parents a6b6189 + 6074f61 commit 7858309

File tree

3,674 files changed

+403976
-231567
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,674 files changed

+403976
-231567
lines changed

‎go.mod‎

Lines changed: 124 additions & 114 deletions
Large diffs are not rendered by default.

‎go.sum‎

Lines changed: 226 additions & 436 deletions
Large diffs are not rendered by default.

‎internal/controller/argo.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import (
3535
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
3636

3737
argooperator "github.com/argoproj-labs/argocd-operator/api/v1beta1"
38-
argoapi "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
39-
argoclient "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
38+
argoapi "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
39+
argoclient "github.com/argoproj/argo-cd/v3/pkg/client/clientset/versioned"
4040
api "github.com/hybrid-cloud-patterns/patterns-operator/api/v1alpha1"
4141
routev1 "github.com/openshift/api/route/v1"
4242
)

‎internal/controller/argo_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"github.com/onsi/gomega/format"
1414
routev1 "github.com/openshift/api/route/v1"
1515

16-
argoapi "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
17-
argoclient "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned/fake"
16+
argoapi "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
17+
argoclient "github.com/argoproj/argo-cd/v3/pkg/client/clientset/versioned/fake"
1818
v1 "k8s.io/api/core/v1"
1919
kerrors "k8s.io/apimachinery/pkg/api/errors"
2020
"k8s.io/apimachinery/pkg/api/resource"

‎internal/controller/checkout.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
"github.com/go-git/go-git/v5/plumbing/transport/http"
3636
"github.com/go-git/go-git/v5/plumbing/transport/ssh"
3737

38-
argogit "github.com/argoproj/argo-cd/v2/util/git"
38+
argogit "github.com/argoproj/argo-cd/v3/util/git"
3939
)
4040

4141
type GitAuthenticationBackend uint

‎internal/controller/pattern_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ import (
3838
klog "sigs.k8s.io/controller-runtime/pkg/log"
3939
"sigs.k8s.io/controller-runtime/pkg/reconcile"
4040

41-
argoapi "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
42-
argoclient "github.com/argoproj/argo-cd/v2/pkg/client/clientset/versioned"
41+
argoapi "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
42+
argoclient "github.com/argoproj/argo-cd/v3/pkg/client/clientset/versioned"
4343
configclient "github.com/openshift/client-go/config/clientset/versioned"
4444
routeclient "github.com/openshift/client-go/route/clientset/versioned"
4545
olmclient "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned"

‎vendor/cloud.google.com/go/compute/metadata/CHANGES.md‎

Lines changed: 47 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/cloud.google.com/go/compute/metadata/log.go‎

Lines changed: 149 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)