Skip to content

Commit 9208a8a

Browse files
committed
chore: Upgrade ArgoCD golang dependency to v3
1 parent b240fcb commit 9208a8a

File tree

15 files changed

+441
-435
lines changed

15 files changed

+441
-435
lines changed

e2e/e2e_canary_upgrade_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"os"
88
"strings"
99

10-
argocd "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
10+
argocd "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
1111
. "github.com/onsi/ginkgo/v2"
1212
. "github.com/onsi/gomega"
1313
"github.com/stackrox/rox/operator/api/v1alpha1"

emailsender/pkg/metrics/server_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"github.com/prometheus/client_golang/prometheus"
99
io_prometheus_client "github.com/prometheus/client_model/go"
1010
"github.com/prometheus/common/expfmt"
11+
"github.com/prometheus/common/model"
1112
"github.com/stretchr/testify/assert"
1213
"github.com/stretchr/testify/require"
1314
)
@@ -34,7 +35,7 @@ func serveMetrics(t *testing.T, registry *prometheus.Registry) metricResponse {
3435
server.Handler.ServeHTTP(rec, req)
3536
require.Equal(t, http.StatusOK, rec.Code, "status code should be OK")
3637

37-
promParser := expfmt.TextParser{}
38+
promParser := expfmt.NewTextParser(model.UTF8Validation)
3839
metrics, err := promParser.TextToMetricFamilies(rec.Body)
3940
require.NoError(t, err, "failed parsing metrics response")
4041
return metrics

fleetshard/pkg/argox/generic_argo_reconciler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
argocd "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
7+
argocd "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
88
"github.com/golang/glog"
99
"k8s.io/apimachinery/pkg/api/errors"
1010
"k8s.io/apimachinery/pkg/util/json"

fleetshard/pkg/argox/generic_argo_reconciler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package argox
22

33
import (
44
"context"
5-
argocd "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
5+
argocd "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
66
"github.com/stretchr/testify/assert"
77
"github.com/stretchr/testify/require"
88
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

fleetshard/pkg/central/reconciler/argo_reconciler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77
"time"
88

9-
argocd "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
9+
argocd "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
1010
"github.com/golang/glog"
1111
"github.com/stackrox/acs-fleet-manager/fleetshard/config"
1212
"github.com/stackrox/acs-fleet-manager/fleetshard/pkg/argox"

fleetshard/pkg/central/reconciler/reconciler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111
"time"
1212

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

1515
"github.com/aws/smithy-go"
1616
openshiftRouteV1 "github.com/openshift/api/route/v1"

fleetshard/pkg/fleetshardmetrics/server_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77

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

54-
promParser := expfmt.TextParser{}
55+
promParser := expfmt.NewTextParser(model.UTF8Validation)
5556
metrics, err := promParser.TextToMetricFamilies(rec.Body)
5657
require.NoError(t, err, "failed parsing metrics file")
5758
return metrics

fleetshard/pkg/k8s/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package k8s
33

44
import (
5-
argoCd "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
5+
argoCd "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
66
"github.com/golang/glog"
77
openshiftOperatorV1 "github.com/openshift/api/operator/v1"
88
openshiftRouteV1 "github.com/openshift/api/route/v1"

fleetshard/pkg/runtime/runtime_applications_reconciler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"encoding/json"
77
"fmt"
88

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

fleetshard/pkg/runtime/runtime_applications_reconciler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"testing"
66

7-
argocd "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
7+
argocd "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
88
"github.com/stretchr/testify/assert"
99
"github.com/stretchr/testify/require"
1010
"k8s.io/apimachinery/pkg/runtime"

0 commit comments

Comments
 (0)