Skip to content

feat(deps): migrate argo-cd v2->v3 and upgrade to k8s 1.34 #6985

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

Draft
prkhrkat wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat(deps): migrate argo-cd v2->v3 and upgrade to k8s 1.34 #6985

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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion api/bean/AppView/AppView.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package AppView

import (
"encoding/json"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/devtron-labs/devtron/pkg/deployment/common/bean"
"time"
)
Expand Down
3 changes: 1 addition & 2 deletions api/helm-app/gRPC/applicationClient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,7 @@ func (impl *HelmAppClientImpl) getConnection() (*grpc.ClientConn, error) {
var opts []grpc.DialOption
ctx, _ := context.WithTimeout(context.Background(), 10*time.Second)
opts = append(opts,
grpc.WithUnaryInterceptor(otelgrpc.UnaryClientInterceptor()),
grpc.WithStreamInterceptor(otelgrpc.StreamClientInterceptor()),
grpc.WithStatsHandler(otelgrpc.NewClientHandler()),
grpc.WithBlock(),
grpc.WithInsecure(),
grpc.WithDefaultCallOptions(
Expand Down
2 changes: 1 addition & 1 deletion api/restHandler/app/appList/AppListingRestHandler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
k8sCommonBean "github.com/devtron-labs/common-lib/utils/k8s/commonBean"
"github.com/devtron-labs/devtron/api/bean/AppView"
"github.com/devtron-labs/devtron/api/restHandler/common"
Expand Down
12 changes: 6 additions & 6 deletions client/argocdServer/ArgoClientWrapperService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (
"context"
"encoding/json"
"fmt"
application2 "github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
"github.com/argoproj/argo-cd/v2/pkg/apiclient/certificate"
cluster2 "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster"
"github.com/argoproj/argo-cd/v2/pkg/apiclient/repocreds"
repository2 "github.com/argoproj/argo-cd/v2/pkg/apiclient/repository"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
application2 "github.com/argoproj/argo-cd/v3/pkg/apiclient/application"
"github.com/argoproj/argo-cd/v3/pkg/apiclient/certificate"
cluster2 "github.com/argoproj/argo-cd/v3/pkg/apiclient/cluster"
"github.com/argoproj/argo-cd/v3/pkg/apiclient/repocreds"
repository2 "github.com/argoproj/argo-cd/v3/pkg/apiclient/repository"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/caarlos0/env"
"github.com/devtron-labs/common-lib/async"
"github.com/devtron-labs/common-lib/utils/retryFunc"
Expand Down
10 changes: 5 additions & 5 deletions client/argocdServer/ArgoClientWrapperServiceEA.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package argocdServer

import (
"context"
application2 "github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
"github.com/argoproj/argo-cd/v2/pkg/apiclient/certificate"
cluster2 "github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster"
"github.com/argoproj/argo-cd/v2/pkg/apiclient/repocreds"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
application2 "github.com/argoproj/argo-cd/v3/pkg/apiclient/application"
"github.com/argoproj/argo-cd/v3/pkg/apiclient/certificate"
cluster2 "github.com/argoproj/argo-cd/v3/pkg/apiclient/cluster"
"github.com/argoproj/argo-cd/v3/pkg/apiclient/repocreds"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/devtron-labs/devtron/client/argocdServer/bean"
config2 "github.com/devtron-labs/devtron/client/argocdServer/config"
"github.com/devtron-labs/devtron/client/argocdServer/repoCredsK8sClient"
Expand Down
2 changes: 1 addition & 1 deletion client/argocdServer/adapter/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package adapter

import (
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/devtron-labs/devtron/client/argocdServer/bean"
)

Expand Down
4 changes: 2 additions & 2 deletions client/argocdServer/application/Application.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package application

import (
"context"
"github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/argo-cd/v3/pkg/apiclient/application"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
argoApplication "github.com/devtron-labs/devtron/client/argocdServer/bean"
"github.com/devtron-labs/devtron/client/argocdServer/connection"
"github.com/devtron-labs/devtron/util"
Expand Down
2 changes: 1 addition & 1 deletion client/argocdServer/application/Application_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package application
import (
"encoding/json"
"fmt"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
argoApplication "github.com/devtron-labs/devtron/client/argocdServer/bean"
"testing"

Expand Down
4 changes: 2 additions & 2 deletions client/argocdServer/bean/bean.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package bean

import (
"github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/argo-cd/v3/pkg/apiclient/application"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/devtron-labs/common-lib/utils/k8sObjectsUtil"
"time"
)
Expand Down
4 changes: 2 additions & 2 deletions client/argocdServer/certificate/Certificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package certificate

import (
"context"
"github.com/argoproj/argo-cd/v2/pkg/apiclient/certificate"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/argo-cd/v3/pkg/apiclient/certificate"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/devtron-labs/devtron/client/argocdServer/bean"
"github.com/devtron-labs/devtron/client/argocdServer/connection"
"go.uber.org/zap"
Expand Down
4 changes: 2 additions & 2 deletions client/argocdServer/cluster/Cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package cluster

import (
"context"
"github.com/argoproj/argo-cd/v2/pkg/apiclient/cluster"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/argo-cd/v3/pkg/apiclient/cluster"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/devtron-labs/devtron/client/argocdServer/bean"
"github.com/devtron-labs/devtron/client/argocdServer/connection"
"go.uber.org/zap"
Expand Down
6 changes: 3 additions & 3 deletions client/argocdServer/connection/Connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package connection
import (
"context"
"fmt"
"github.com/argoproj/argo-cd/v2/pkg/apiclient/account"
"github.com/argoproj/argo-cd/v2/util/settings"
"github.com/argoproj/argo-cd/v3/pkg/apiclient/account"
"github.com/argoproj/argo-cd/v3/util/settings"
"github.com/devtron-labs/common-lib/async"
"github.com/devtron-labs/common-lib/utils/k8s"
"github.com/devtron-labs/devtron/client/argocdServer/bean"
Expand Down Expand Up @@ -150,7 +150,7 @@ func (impl *ArgoCDConnectionManagerImpl) getConnectionWithToken(connectionConfig
if len(token) > 0 {
option = append(option, grpc.WithPerRPCCredentials(TokenAuth{token: token}))
}
option = append(option, grpc.WithChainUnaryInterceptor(grpc_prometheus.UnaryClientInterceptor, otelgrpc.UnaryClientInterceptor()), grpc.WithChainStreamInterceptor(grpc_prometheus.StreamClientInterceptor, otelgrpc.StreamClientInterceptor()))
option = append(option, grpc.WithChainUnaryInterceptor(grpc_prometheus.UnaryClientInterceptor), grpc.WithChainStreamInterceptor(grpc_prometheus.StreamClientInterceptor), grpc.WithStatsHandler(otelgrpc.NewClientHandler()))
conn, err := grpc.Dial(fmt.Sprintf("%s:%s", connectionConfig.Host, connectionConfig.Port), option...)
if err != nil {
return nil
Expand Down
2 changes: 1 addition & 1 deletion client/argocdServer/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package argocdServer
import (
json2 "encoding/json"
errors3 "errors"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion client/argocdServer/k8sClient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/devtron-labs/common-lib/utils/k8s"
"github.com/devtron-labs/devtron/client/argocdServer/bean"
"github.com/devtron-labs/devtron/internal/util"
Expand Down
4 changes: 2 additions & 2 deletions client/argocdServer/repocreds/repocreds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package repository

import (
"context"
repocreds "github.com/argoproj/argo-cd/v2/pkg/apiclient/repocreds"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
repocreds "github.com/argoproj/argo-cd/v3/pkg/apiclient/repocreds"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
argoApplication "github.com/devtron-labs/devtron/client/argocdServer/bean"
"github.com/devtron-labs/devtron/client/argocdServer/connection"
"go.uber.org/zap"
Expand Down
4 changes: 2 additions & 2 deletions client/argocdServer/repository/Repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package repository

import (
"context"
repository2 "github.com/argoproj/argo-cd/v2/pkg/apiclient/repository"
"github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
repository2 "github.com/argoproj/argo-cd/v3/pkg/apiclient/repository"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
argoApplication "github.com/devtron-labs/devtron/client/argocdServer/bean"
"github.com/devtron-labs/devtron/client/argocdServer/connection"
"go.uber.org/zap"
Expand Down
2 changes: 1 addition & 1 deletion client/argocdServer/session/Session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package session

import (
"context"
"github.com/argoproj/argo-cd/v2/pkg/apiclient/session"
"github.com/argoproj/argo-cd/v3/pkg/apiclient/session"
"google.golang.org/grpc"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion client/argocdServer/version/Version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package version

import (
"context"
"github.com/argoproj/argo-cd/v2/pkg/apiclient/version"
"github.com/argoproj/argo-cd/v3/pkg/apiclient/version"
"github.com/golang/protobuf/ptypes/empty"
"go.uber.org/zap"
"google.golang.org/grpc"
Expand Down
3 changes: 2 additions & 1 deletion client/gitSensor/GitSensorGrpcClient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ func (client *GrpcApiClientImpl) getConnection() (*grpc.ClientConn, error) {
// Configure gRPC dial options
var opts []grpc.DialOption
opts = append(opts,
grpc.WithChainUnaryInterceptor(grpc_prometheus.UnaryClientInterceptor, otelgrpc.UnaryClientInterceptor()),
grpc.WithChainUnaryInterceptor(grpc_prometheus.UnaryClientInterceptor),
grpc.WithStatsHandler(otelgrpc.NewClientHandler()),
grpc.WithBlock(),
grpc.WithTransportCredentials(insecure.NewCredentials()),
grpc.WithDefaultServiceConfig(client.config.ServiceConfig),
Expand Down
Loading