Skip to content

chore: Upgrade ArgoCD golang dependency to v3 #2592

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kovayur wants to merge 1 commit into from
Closed

chore: Upgrade ArgoCD golang dependency to v3 #2592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion e2e/e2e_canary_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"strings"

argocd "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
argocd "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/stackrox/rox/operator/api/v1alpha1"
Expand Down
3 changes: 2 additions & 1 deletion emailsender/pkg/metrics/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/prometheus/client_golang/prometheus"
io_prometheus_client "github.com/prometheus/client_model/go"
"github.com/prometheus/common/expfmt"
"github.com/prometheus/common/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand All @@ -34,7 +35,7 @@ func serveMetrics(t *testing.T, registry *prometheus.Registry) metricResponse {
server.Handler.ServeHTTP(rec, req)
require.Equal(t, http.StatusOK, rec.Code, "status code should be OK")

promParser := expfmt.TextParser{}
promParser := expfmt.NewTextParser(model.UTF8Validation)
metrics, err := promParser.TextToMetricFamilies(rec.Body)
require.NoError(t, err, "failed parsing metrics response")
return metrics
Expand Down
2 changes: 1 addition & 1 deletion fleetshard/pkg/argox/generic_argo_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

argocd "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
argocd "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/golang/glog"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/util/json"
Expand Down
2 changes: 1 addition & 1 deletion fleetshard/pkg/argox/generic_argo_reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package argox

import (
"context"
argocd "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
argocd "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion fleetshard/pkg/central/reconciler/argo_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"time"

argocd "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
argocd "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/golang/glog"
"github.com/stackrox/acs-fleet-manager/fleetshard/config"
"github.com/stackrox/acs-fleet-manager/fleetshard/pkg/argox"
Expand Down
2 changes: 1 addition & 1 deletion fleetshard/pkg/central/reconciler/reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"testing"
"time"

argocd "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
argocd "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"

"github.com/aws/smithy-go"
openshiftRouteV1 "github.com/openshift/api/route/v1"
Expand Down
3 changes: 2 additions & 1 deletion fleetshard/pkg/fleetshardmetrics/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

io_prometheus_client "github.com/prometheus/client_model/go"
"github.com/prometheus/common/expfmt"
"github.com/prometheus/common/model"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down Expand Up @@ -51,7 +52,7 @@ func serveMetrics(t *testing.T, customMetrics *Metrics) metricResponse {
server.Handler.ServeHTTP(rec, req)
require.Equal(t, http.StatusOK, rec.Code, "status code should be OK")

promParser := expfmt.TextParser{}
promParser := expfmt.NewTextParser(model.UTF8Validation)
metrics, err := promParser.TextToMetricFamilies(rec.Body)
require.NoError(t, err, "failed parsing metrics file")
return metrics
Expand Down
2 changes: 1 addition & 1 deletion fleetshard/pkg/k8s/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
package k8s

import (
argoCd "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
argoCd "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/golang/glog"
openshiftOperatorV1 "github.com/openshift/api/operator/v1"
openshiftRouteV1 "github.com/openshift/api/route/v1"
Expand Down
2 changes: 1 addition & 1 deletion fleetshard/pkg/runtime/runtime_applications_reconciler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"encoding/json"
"fmt"

argocd "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
argocd "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/golang/glog"
ctrlClient "sigs.k8s.io/controller-runtime/pkg/client"

Expand Down
2 changes: 1 addition & 1 deletion fleetshard/pkg/runtime/runtime_applications_reconciler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

argocd "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
argocd "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion fleetshard/pkg/testutils/k8s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"testing"

argoCd "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
argoCd "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/hashicorp/go-multierror"
openshiftOperatorV1 "github.com/openshift/api/operator/v1"
openshiftRouteV1 "github.com/openshift/api/route/v1"
Expand Down
Loading
Loading