Elgato_dark/argo-cd
1
0
Fork 0
mirror of https://github.com/argoproj/argo-cd synced 2026-04-21 08:57:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

chore: fix gitops-engine mod name so it can be referenced by external repos (#26407)

Browse source 
Signed-off-by: Leonardo Luz Almeida <leonardo_almeida@intuit.com>
This commit is contained in:
Leonardo Luz Almeida 2026-02-12 09:29:40 -05:00 committed by GitHub
parent 18efd0cf1b
commit 0cdd44bda7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
184 changed files with 1155 additions and 1143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.mockery.yaml
View file

@ -79,10 +79,10 @@ packages:
github.com/argoproj/argo-cd/v3/util/workloadidentity: github.com/argoproj/argo-cd/v3/util/workloadidentity:
interfaces: interfaces:
TokenProvider: {} TokenProvider: {}
github.com/argoproj/gitops-engine/pkg/cache: github.com/argoproj/argo-cd/gitops-engine/pkg/cache:
interfaces: interfaces:
ClusterCache: {} ClusterCache: {}
github.com/argoproj/gitops-engine/pkg/diff: github.com/argoproj/argo-cd/gitops-engine/pkg/diff:
interfaces: interfaces:
ServerSideDryRunner: {} ServerSideDryRunner: {}
github.com/microsoft/azure-devops-go-api/azuredevops/v7/git: github.com/microsoft/azure-devops-go-api/azuredevops/v7/git:

4
Makefile
View file

@ -445,7 +445,7 @@ test: test-tools-image
.PHONY: test-local .PHONY: test-local
test-local: test-gitops-engine test-local: test-gitops-engine
# run if TEST_MODULE is empty or does not point to gitops-engine tests # run if TEST_MODULE is empty or does not point to gitops-engine tests
ifneq ($(if $(TEST_MODULE),,ALL)$(filter-out github.com/argoproj/gitops-engine% ./gitops-engine%,$(TEST_MODULE)),) ifneq ($(if $(TEST_MODULE),,ALL)$(filter-out github.com/argoproj/argo-cd/gitops-engine% ./gitops-engine%,$(TEST_MODULE)),)
if test "$(TEST_MODULE)" = ""; then \ if test "$(TEST_MODULE)" = ""; then \
DIST_DIR=${DIST_DIR} RERUN_FAILS=0 PACKAGES=`go list ./... | grep -v 'test/e2e'` ./hack/test.sh -args -test.gocoverdir="$(PWD)/test-results"; \ DIST_DIR=${DIST_DIR} RERUN_FAILS=0 PACKAGES=`go list ./... | grep -v 'test/e2e'` ./hack/test.sh -args -test.gocoverdir="$(PWD)/test-results"; \
else \ else \
@ -457,7 +457,7 @@ endif
.PHONY: test-gitops-engine .PHONY: test-gitops-engine
test-gitops-engine: test-gitops-engine:
# run if TEST_MODULE is empty or points to gitops-engine tests # run if TEST_MODULE is empty or points to gitops-engine tests
ifneq ($(if $(TEST_MODULE),,ALL)$(filter github.com/argoproj/gitops-engine% ./gitops-engine%,$(TEST_MODULE)),) ifneq ($(if $(TEST_MODULE),,ALL)$(filter github.com/argoproj/argo-cd/gitops-engine% ./gitops-engine%,$(TEST_MODULE)),)
mkdir -p $(PWD)/test-results mkdir -p $(PWD)/test-results
cd gitops-engine && go test -race -cover ./... -args -test.gocoverdir="$(PWD)/test-results" cd gitops-engine && go test -race -cover ./... -args -test.gocoverdir="$(PWD)/test-results"
endif endif

2
applicationset/controllers/applicationset_controller.go
View file

@ -48,7 +48,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/predicate"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
"github.com/argoproj/argo-cd/v3/applicationset/controllers/template" "github.com/argoproj/argo-cd/v3/applicationset/controllers/template"
"github.com/argoproj/argo-cd/v3/applicationset/generators" "github.com/argoproj/argo-cd/v3/applicationset/generators"

4
applicationset/controllers/applicationset_controller_test.go
View file

@ -28,8 +28,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
"sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/event"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/argoproj/argo-cd/v3/applicationset/generators" "github.com/argoproj/argo-cd/v3/applicationset/generators"
"github.com/argoproj/argo-cd/v3/applicationset/generators/mocks" "github.com/argoproj/argo-cd/v3/applicationset/generators/mocks"

4
cmd/argocd/commands/admin/app.go
View file

@ -10,8 +10,8 @@ import (
"sort" "sort"
"time" "time"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/spf13/cobra" "github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

6
cmd/argocd/commands/admin/app_test.go
View file

@ -3,9 +3,9 @@ package admin
import ( import (
"testing" "testing"
clustermocks "github.com/argoproj/gitops-engine/pkg/cache/mocks" clustermocks "github.com/argoproj/argo-cd/gitops-engine/pkg/cache/mocks"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

2
cmd/argocd/commands/admin/backup.go
View file

@ -8,7 +8,7 @@ import (
"strings" "strings"
"time" "time"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
apierrors "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors"

2
cmd/argocd/commands/admin/backup_test.go
View file

@ -7,7 +7,7 @@ import (
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1" "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/argoproj/argo-cd/v3/util/security" "github.com/argoproj/argo-cd/v3/util/security"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
cmd/argocd/commands/admin/cluster.go
View file

@ -10,7 +10,7 @@ import (
"text/tabwriter" "text/tabwriter"
"time" "time"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"

2
cmd/argocd/commands/admin/generatespec_utils.go
View file

@ -7,7 +7,7 @@ import (
"io" "io"
"os" "os"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"

2
cmd/argocd/commands/admin/project.go
View file

@ -17,7 +17,7 @@ import (
utilio "github.com/argoproj/argo-cd/v3/util/io" utilio "github.com/argoproj/argo-cd/v3/util/io"
"github.com/argoproj/argo-cd/v3/util/templates" "github.com/argoproj/argo-cd/v3/util/templates"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/spf13/cobra" "github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"

2
cmd/argocd/commands/admin/settings.go
View file

@ -13,7 +13,7 @@ import (
"strings" "strings"
"text/tabwriter" "text/tabwriter"
healthutil "github.com/argoproj/gitops-engine/pkg/health" healthutil "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"

12
cmd/argocd/commands/app.go
View file

@ -19,11 +19,11 @@ import (
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/argoproj/gitops-engine/pkg/sync/hook" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/hook"
"github.com/argoproj/gitops-engine/pkg/sync/ignore" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/ignore"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/retry" grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/retry"
"github.com/mattn/go-isatty" "github.com/mattn/go-isatty"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
@ -46,7 +46,7 @@ import (
argocdclient "github.com/argoproj/argo-cd/v3/pkg/apiclient" argocdclient "github.com/argoproj/argo-cd/v3/pkg/apiclient"
"github.com/argoproj/argo-cd/v3/pkg/apiclient/application" "github.com/argoproj/argo-cd/v3/pkg/apiclient/application"
resourceutil "github.com/argoproj/gitops-engine/pkg/sync/resource" resourceutil "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/resource"
clusterpkg "github.com/argoproj/argo-cd/v3/pkg/apiclient/cluster" clusterpkg "github.com/argoproj/argo-cd/v3/pkg/apiclient/cluster"
projectpkg "github.com/argoproj/argo-cd/v3/pkg/apiclient/project" projectpkg "github.com/argoproj/argo-cd/v3/pkg/apiclient/project"

4
cmd/argocd/commands/app_test.go
View file

@ -12,8 +12,8 @@ import (
"testing" "testing"
"time" "time"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/coreos/go-oidc/v3/oidc" "github.com/coreos/go-oidc/v3/oidc"
"github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts" "github.com/google/go-cmp/cmp/cmpopts"

2
cmd/argocd/commands/tree.go
View file

@ -6,7 +6,7 @@ import (
"text/tabwriter" "text/tabwriter"
"time" "time"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
"k8s.io/apimachinery/pkg/util/duration" "k8s.io/apimachinery/pkg/util/duration"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1" "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"

2
cmd/util/app.go
View file

@ -13,7 +13,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"

2
cmd/util/applicationset.go
View file

@ -5,7 +5,7 @@ import (
"net/url" "net/url"
"os" "os"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
argoprojiov1alpha1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1" argoprojiov1alpha1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/argoproj/argo-cd/v3/util/config" "github.com/argoproj/argo-cd/v3/util/config"

2
cmpserver/plugin/plugin.go
View file

@ -24,7 +24,7 @@ import (
argoexec "github.com/argoproj/argo-cd/v3/util/exec" argoexec "github.com/argoproj/argo-cd/v3/util/exec"
"github.com/argoproj/argo-cd/v3/util/io/files" "github.com/argoproj/argo-cd/v3/util/io/files"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
securejoin "github.com/cyphar/filepath-securejoin" securejoin "github.com/cyphar/filepath-securejoin"
"github.com/mattn/go-zglob" "github.com/mattn/go-zglob"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"

12
controller/appcontroller.go
View file

@ -17,12 +17,12 @@ import (
"sync" "sync"
"time" "time"
clustercache "github.com/argoproj/gitops-engine/pkg/cache" clustercache "github.com/argoproj/argo-cd/gitops-engine/pkg/cache"
"github.com/argoproj/gitops-engine/pkg/diff" "github.com/argoproj/argo-cd/gitops-engine/pkg/diff"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
synccommon "github.com/argoproj/gitops-engine/pkg/sync/common" synccommon "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
resourceutil "github.com/argoproj/gitops-engine/pkg/sync/resource" resourceutil "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/resource"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
jsonpatch "github.com/evanphx/json-patch" jsonpatch "github.com/evanphx/json-patch"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"golang.org/x/sync/semaphore" "golang.org/x/sync/semaphore"

12
controller/appcontroller_test.go
View file

@ -9,9 +9,9 @@ import (
"testing" "testing"
"time" "time"
clustercache "github.com/argoproj/gitops-engine/pkg/cache" clustercache "github.com/argoproj/argo-cd/gitops-engine/pkg/cache"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
"github.com/argoproj/gitops-engine/pkg/utils/kube/kubetest" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube/kubetest"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
@ -24,9 +24,9 @@ import (
statecache "github.com/argoproj/argo-cd/v3/controller/cache" statecache "github.com/argoproj/argo-cd/v3/controller/cache"
"github.com/argoproj/argo-cd/v3/controller/sharding" "github.com/argoproj/argo-cd/v3/controller/sharding"
"github.com/argoproj/gitops-engine/pkg/cache/mocks" "github.com/argoproj/argo-cd/gitops-engine/pkg/cache/mocks"
synccommon "github.com/argoproj/gitops-engine/pkg/sync/common" synccommon "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
appsv1 "k8s.io/api/apps/v1" appsv1 "k8s.io/api/apps/v1"

6
controller/cache/cache.go vendored
View file

@ -16,9 +16,9 @@ import (
"syscall" "syscall"
"time" "time"
clustercache "github.com/argoproj/gitops-engine/pkg/cache" clustercache "github.com/argoproj/argo-cd/gitops-engine/pkg/cache"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"golang.org/x/sync/semaphore" "golang.org/x/sync/semaphore"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"

8
controller/cache/cache_test.go vendored
View file

@ -18,10 +18,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"github.com/argoproj/gitops-engine/pkg/cache" "github.com/argoproj/argo-cd/gitops-engine/pkg/cache"
"github.com/argoproj/gitops-engine/pkg/cache/mocks" "github.com/argoproj/argo-cd/gitops-engine/pkg/cache/mocks"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"

4
controller/cache/info.go vendored
View file

@ -9,8 +9,8 @@ import (
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/argoproj/gitops-engine/pkg/utils/text" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/text"
"github.com/cespare/xxhash/v2" "github.com/cespare/xxhash/v2"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"

2
controller/cache/info_test.go vendored
View file

@ -4,7 +4,7 @@ import (
"sort" "sort"
"testing" "testing"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"

4
controller/cache/mocks/LiveStateCache.go generated vendored
View file

@ -7,10 +7,10 @@ package mocks
import ( import (
"context" "context"
"github.com/argoproj/argo-cd/gitops-engine/pkg/cache"
"github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
cache0 "github.com/argoproj/argo-cd/v3/controller/cache" cache0 "github.com/argoproj/argo-cd/v3/controller/cache"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1" "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
"github.com/argoproj/gitops-engine/pkg/cache"
"github.com/argoproj/gitops-engine/pkg/utils/kube"
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"

4
controller/clusterinfoupdater.go
View file

@ -7,8 +7,8 @@ import (
"github.com/argoproj/argo-cd/v3/common" "github.com/argoproj/argo-cd/v3/common"
"github.com/argoproj/gitops-engine/pkg/cache" "github.com/argoproj/argo-cd/gitops-engine/pkg/cache"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"

2
controller/clusterinfoupdater_test.go
View file

@ -21,7 +21,7 @@ import (
"github.com/argoproj/argo-cd/v3/util/db" "github.com/argoproj/argo-cd/v3/util/db"
"github.com/argoproj/argo-cd/v3/util/settings" "github.com/argoproj/argo-cd/v3/util/settings"
clustercache "github.com/argoproj/gitops-engine/pkg/cache" clustercache "github.com/argoproj/argo-cd/gitops-engine/pkg/cache"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"

8
controller/health.go
View file

@ -3,10 +3,10 @@ package controller
import ( import (
"fmt" "fmt"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
hookutil "github.com/argoproj/gitops-engine/pkg/sync/hook" hookutil "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/hook"
"github.com/argoproj/gitops-engine/pkg/sync/ignore" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/ignore"
kubeutil "github.com/argoproj/gitops-engine/pkg/utils/kube" kubeutil "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
"github.com/argoproj/argo-cd/v3/common" "github.com/argoproj/argo-cd/v3/common"

6
controller/health_test.go
View file

@ -6,9 +6,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
synccommon "github.com/argoproj/gitops-engine/pkg/sync/common" synccommon "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

8
controller/hook.go
View file

@ -5,10 +5,10 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/argoproj/gitops-engine/pkg/sync/hook" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/hook"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

2
controller/hydrator/hydrator_test.go
View file

@ -17,7 +17,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/utils/ptr" "k8s.io/utils/ptr"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
commitclient "github.com/argoproj/argo-cd/v3/commitserver/apiclient" commitclient "github.com/argoproj/argo-cd/v3/commitserver/apiclient"
commitservermocks "github.com/argoproj/argo-cd/v3/commitserver/apiclient/mocks" commitservermocks "github.com/argoproj/argo-cd/v3/commitserver/apiclient/mocks"

2
controller/metrics/clustercollector.go
View file

@ -5,7 +5,7 @@ import (
"sync" "sync"
"time" "time"
"github.com/argoproj/gitops-engine/pkg/cache" "github.com/argoproj/argo-cd/gitops-engine/pkg/cache"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"

2
controller/metrics/clustercollector_test.go
View file

@ -4,7 +4,7 @@ import (
"errors" "errors"
"testing" "testing"
gitopsCache "github.com/argoproj/gitops-engine/pkg/cache" gitopsCache "github.com/argoproj/argo-cd/gitops-engine/pkg/cache"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
dbmocks "github.com/argoproj/argo-cd/v3/util/db/mocks" dbmocks "github.com/argoproj/argo-cd/v3/util/db/mocks"

2
controller/metrics/metrics.go
View file

@ -10,7 +10,7 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/robfig/cron/v3" "github.com/robfig/cron/v3"

4
controller/metrics/metrics_test.go
View file

@ -13,8 +13,8 @@ import (
"github.com/argoproj/argo-cd/v3/util/db/mocks" "github.com/argoproj/argo-cd/v3/util/db/mocks"
gitopsCache "github.com/argoproj/gitops-engine/pkg/cache" gitopsCache "github.com/argoproj/argo-cd/gitops-engine/pkg/cache"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
controller/sort_delete.go
View file

@ -3,7 +3,7 @@ package controller
import ( import (
"sort" "sort"
"github.com/argoproj/gitops-engine/pkg/sync/syncwaves" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/syncwaves"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
) )

4
controller/sort_delete_test.go
View file

@ -6,8 +6,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
. "github.com/argoproj/gitops-engine/pkg/utils/testing" . "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/testing"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
) )

18
controller/state.go
View file

@ -11,17 +11,17 @@ import (
goSync "sync" goSync "sync"
"time" "time"
synccommon "github.com/argoproj/gitops-engine/pkg/sync/common" synccommon "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"github.com/argoproj/gitops-engine/pkg/diff" "github.com/argoproj/argo-cd/gitops-engine/pkg/diff"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
"github.com/argoproj/gitops-engine/pkg/sync" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync"
hookutil "github.com/argoproj/gitops-engine/pkg/sync/hook" hookutil "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/hook"
"github.com/argoproj/gitops-engine/pkg/sync/ignore" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/ignore"
resourceutil "github.com/argoproj/gitops-engine/pkg/sync/resource" resourceutil "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/resource"
"github.com/argoproj/gitops-engine/pkg/sync/syncwaves" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/syncwaves"
kubeutil "github.com/argoproj/gitops-engine/pkg/utils/kube" kubeutil "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

10
controller/state_test.go
View file

@ -8,11 +8,11 @@ import (
"time" "time"
"dario.cat/mergo" "dario.cat/mergo"
cachemocks "github.com/argoproj/gitops-engine/pkg/cache/mocks" cachemocks "github.com/argoproj/argo-cd/gitops-engine/pkg/cache/mocks"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
synccommon "github.com/argoproj/gitops-engine/pkg/sync/common" synccommon "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
. "github.com/argoproj/gitops-engine/pkg/utils/testing" . "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/testing"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
logrustest "github.com/sirupsen/logrus/hooks/test" logrustest "github.com/sirupsen/logrus/hooks/test"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"

8
controller/sync.go
View file

@ -13,10 +13,10 @@ import (
cdcommon "github.com/argoproj/argo-cd/v3/common" cdcommon "github.com/argoproj/argo-cd/v3/common"
gitopsDiff "github.com/argoproj/gitops-engine/pkg/diff" gitopsDiff "github.com/argoproj/argo-cd/gitops-engine/pkg/diff"
"github.com/argoproj/gitops-engine/pkg/sync" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
jsonpatch "github.com/evanphx/json-patch" jsonpatch "github.com/evanphx/json-patch"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
controller/sync_namespace.go
View file

@ -3,7 +3,7 @@ package controller
import ( import (
"maps" "maps"
gitopscommon "github.com/argoproj/gitops-engine/pkg/sync/common" gitopscommon "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1" "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"

6
controller/sync_test.go
View file

@ -4,9 +4,9 @@ import (
"strconv" "strconv"
"testing" "testing"
"github.com/argoproj/gitops-engine/pkg/sync" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync"
synccommon "github.com/argoproj/gitops-engine/pkg/sync/common" synccommon "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"

2
gitops-engine/Makefile
View file

@ -29,4 +29,4 @@ agent-manifests:
.PHONY: generate-mocks .PHONY: generate-mocks
generate-mocks: generate-mocks:
go generate -x -v "github.com/argoproj/gitops-engine/pkg/utils/tracing/tracer_testing" go generate -x -v "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/tracing/tracer_testing"

12
gitops-engine/README.md
View file

@ -9,3 +9,15 @@ This library implements core GitOps features:
- Sync Planning ✅ - Sync Planning ✅
- Access to Git repositories - Access to Git repositories
- Manifest Generation - Manifest Generation
## Usage
This library is mainly designed to be used by the Argo CD project.
However, it can also be used by other projects that need GitOps
features.
To use the library, add it as a dependency in your Go module:
```bash
go get github.com/argoproj/argo-cd/gitops-engine
```

10
gitops-engine/agent/main.go
View file

@ -14,7 +14,7 @@ import (
"text/tabwriter" "text/tabwriter"
"time" "time"
"github.com/argoproj/gitops-engine/pkg/utils/text" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/text"
"github.com/go-logr/logr" "github.com/go-logr/logr"
"github.com/spf13/cobra" "github.com/spf13/cobra"
@ -22,10 +22,10 @@ import (
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
"k8s.io/klog/v2/textlogger" "k8s.io/klog/v2/textlogger"
"github.com/argoproj/gitops-engine/pkg/cache" "github.com/argoproj/argo-cd/gitops-engine/pkg/cache"
"github.com/argoproj/gitops-engine/pkg/engine" "github.com/argoproj/argo-cd/gitops-engine/pkg/engine"
"github.com/argoproj/gitops-engine/pkg/sync" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
_ "net/http/pprof" _ "net/http/pprof"
) )

2
gitops-engine/go.mod
View file

@ -1,4 +1,4 @@
module github.com/argoproj/gitops-engine module github.com/argoproj/argo-cd/gitops-engine
go 1.26.0 go 1.26.0

2
gitops-engine/internal/kubernetes_vendor/pkg/api/v1/endpoints/util.go
View file

@ -22,7 +22,7 @@ import (
"hash" "hash"
"sort" "sort"
hashutil "github.com/argoproj/gitops-engine/internal/kubernetes_vendor/pkg/util/hash" hashutil "github.com/argoproj/argo-cd/gitops-engine/internal/kubernetes_vendor/pkg/util/hash"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
) )

4
gitops-engine/pkg/cache/cluster.go vendored
View file

@ -56,8 +56,8 @@ import (
"k8s.io/klog/v2/textlogger" "k8s.io/klog/v2/textlogger"
"k8s.io/kubectl/pkg/util/openapi" "k8s.io/kubectl/pkg/util/openapi"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/argoproj/gitops-engine/pkg/utils/tracing" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/tracing"
) )
const ( const (

4
gitops-engine/pkg/cache/cluster_test.go vendored
View file

@ -33,8 +33,8 @@ import (
testcore "k8s.io/client-go/testing" testcore "k8s.io/client-go/testing"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/argoproj/gitops-engine/pkg/utils/kube/kubetest" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube/kubetest"
) )
func mustToUnstructured(obj any) *unstructured.Unstructured { func mustToUnstructured(obj any) *unstructured.Unstructured {

4
gitops-engine/pkg/cache/mocks/ClusterCache.go generated vendored
View file

@ -5,8 +5,8 @@
package mocks package mocks
import ( import (
"github.com/argoproj/gitops-engine/pkg/cache" "github.com/argoproj/argo-cd/gitops-engine/pkg/cache"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
mock "github.com/stretchr/testify/mock" mock "github.com/stretchr/testify/mock"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"

2
gitops-engine/pkg/cache/predicates_test.go vendored
View file

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"testing" "testing"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"

2
gitops-engine/pkg/cache/references.go vendored
View file

@ -10,7 +10,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
// mightHaveInferredOwner returns true of given resource might have inferred owners // mightHaveInferredOwner returns true of given resource might have inferred owners

2
gitops-engine/pkg/cache/references_test.go vendored
View file

@ -10,7 +10,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
func Test_isStatefulSetChild(t *testing.T) { func Test_isStatefulSetChild(t *testing.T) {

2
gitops-engine/pkg/cache/resource.go vendored
View file

@ -9,7 +9,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
// Resource holds the information about Kubernetes resource, ownership references and optional information // Resource holds the information about Kubernetes resource, ownership references and optional information

6
gitops-engine/pkg/cache/settings.go vendored
View file

@ -7,9 +7,9 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/argoproj/gitops-engine/pkg/utils/tracing" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/tracing"
) )
// NewNoopSettings returns cache settings that has not health customizations and don't filter any resources // NewNoopSettings returns cache settings that has not health customizations and don't filter any resources

2
gitops-engine/pkg/cache/settings_test.go vendored
View file

@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"github.com/argoproj/gitops-engine/pkg/utils/kube/kubetest" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube/kubetest"
) )
func TestSetSettings(t *testing.T) { func TestSetSettings(t *testing.T) {

10
gitops-engine/pkg/diff/diff.go
View file

@ -26,11 +26,11 @@ import (
"sigs.k8s.io/structured-merge-diff/v6/merge" "sigs.k8s.io/structured-merge-diff/v6/merge"
"sigs.k8s.io/structured-merge-diff/v6/typed" "sigs.k8s.io/structured-merge-diff/v6/typed"
"github.com/argoproj/gitops-engine/internal/kubernetes_vendor/pkg/api/v1/endpoints" "github.com/argoproj/argo-cd/gitops-engine/internal/kubernetes_vendor/pkg/api/v1/endpoints"
"github.com/argoproj/gitops-engine/pkg/diff/internal/fieldmanager" "github.com/argoproj/argo-cd/gitops-engine/pkg/diff/internal/fieldmanager"
"github.com/argoproj/gitops-engine/pkg/sync/resource" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/resource"
jsonutil "github.com/argoproj/gitops-engine/pkg/utils/json" jsonutil "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/json"
gescheme "github.com/argoproj/gitops-engine/pkg/utils/kube/scheme" gescheme "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube/scheme"
) )
const ( const (

4
gitops-engine/pkg/diff/diff_test.go
View file

@ -27,8 +27,8 @@ import (
openapiproto "k8s.io/kube-openapi/pkg/util/proto" openapiproto "k8s.io/kube-openapi/pkg/util/proto"
"sigs.k8s.io/yaml" "sigs.k8s.io/yaml"
"github.com/argoproj/gitops-engine/pkg/diff/mocks" "github.com/argoproj/argo-cd/gitops-engine/pkg/diff/mocks"
"github.com/argoproj/gitops-engine/pkg/diff/testdata" "github.com/argoproj/argo-cd/gitops-engine/pkg/diff/testdata"
) )
func printDiff(ctx context.Context, result *DiffResult) (string, error) { func printDiff(ctx context.Context, result *DiffResult) (string, error) {

12
gitops-engine/pkg/engine/engine.go
View file

@ -4,7 +4,7 @@ and "implements" GitOps.
Example Example
The https://github.com/argoproj/gitops-engine/tree/master/agent demonstrates how to use the engine. The https://github.com/argoproj/argo-cd/gitops-engine/tree/master/agent demonstrates how to use the engine.
*/ */
package engine package engine
@ -18,11 +18,11 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/client-go/rest" "k8s.io/client-go/rest"
"github.com/argoproj/gitops-engine/pkg/cache" "github.com/argoproj/argo-cd/gitops-engine/pkg/cache"
"github.com/argoproj/gitops-engine/pkg/diff" "github.com/argoproj/argo-cd/gitops-engine/pkg/diff"
"github.com/argoproj/gitops-engine/pkg/sync" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
const ( const (

4
gitops-engine/pkg/engine/engine_options.go
View file

@ -4,8 +4,8 @@ import (
"github.com/go-logr/logr" "github.com/go-logr/logr"
"k8s.io/klog/v2/textlogger" "k8s.io/klog/v2/textlogger"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/argoproj/gitops-engine/pkg/utils/tracing" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/tracing"
) )
type Option func(*options) type Option func(*options)

4
gitops-engine/pkg/health/health.go
View file

@ -6,8 +6,8 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"github.com/argoproj/gitops-engine/pkg/sync/hook" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/hook"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
// Represents resource health status // Represents resource health status

2
gitops-engine/pkg/health/health_apiservice.go
View file

@ -8,7 +8,7 @@ import (
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1" apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1" apiregistrationv1beta1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
func getAPIServiceHealth(obj *unstructured.Unstructured) (*HealthStatus, error) { func getAPIServiceHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {

2
gitops-engine/pkg/health/health_daemonset.go
View file

@ -7,7 +7,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
func getDaemonSetHealth(obj *unstructured.Unstructured) (*HealthStatus, error) { func getDaemonSetHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {

2
gitops-engine/pkg/health/health_deployment.go
View file

@ -7,7 +7,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
func getDeploymentHealth(obj *unstructured.Unstructured) (*HealthStatus, error) { func getDeploymentHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {

2
gitops-engine/pkg/health/health_hpa.go
View file

@ -11,7 +11,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
var progressingStatus = &HealthStatus{ var progressingStatus = &HealthStatus{

2
gitops-engine/pkg/health/health_job.go
View file

@ -9,7 +9,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
func getJobHealth(obj *unstructured.Unstructured) (*HealthStatus, error) { func getJobHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {

2
gitops-engine/pkg/health/health_pod.go
View file

@ -9,7 +9,7 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubectl/pkg/util/podutils" "k8s.io/kubectl/pkg/util/podutils"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
func getPodHealth(obj *unstructured.Unstructured) (*HealthStatus, error) { func getPodHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {

2
gitops-engine/pkg/health/health_pvc.go
View file

@ -7,7 +7,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
func getPVCHealth(obj *unstructured.Unstructured) (*HealthStatus, error) { func getPVCHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {

2
gitops-engine/pkg/health/health_replicaset.go
View file

@ -8,7 +8,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
func getReplicaSetHealth(obj *unstructured.Unstructured) (*HealthStatus, error) { func getReplicaSetHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {

2
gitops-engine/pkg/health/health_service.go
View file

@ -7,7 +7,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
func getServiceHealth(obj *unstructured.Unstructured) (*HealthStatus, error) { func getServiceHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {

2
gitops-engine/pkg/health/health_statefulset.go
View file

@ -7,7 +7,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
func getStatefulSetHealth(obj *unstructured.Unstructured) (*HealthStatus, error) { func getStatefulSetHealth(obj *unstructured.Unstructured) (*HealthStatus, error) {

2
gitops-engine/pkg/sync/common/types.go
View file

@ -4,7 +4,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
const ( const (

2
gitops-engine/pkg/sync/doc.go
View file

@ -100,6 +100,6 @@ in-sync and healthy.
# Example # Example
Find real-life example in https://github.com/argoproj/gitops-engine/blob/master/pkg/engine/engine.go Find real-life example in https://github.com/argoproj/argo-cd/gitops-engine/blob/master/pkg/engine/engine.go
*/ */
package sync package sync

10
gitops-engine/pkg/sync/helper_test.go
View file

@ -7,11 +7,11 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
synccommon "github.com/argoproj/gitops-engine/pkg/sync/common" synccommon "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/argoproj/gitops-engine/pkg/sync/hook" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/hook"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
testingutils "github.com/argoproj/gitops-engine/pkg/utils/testing" testingutils "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/testing"
) )
type resourceNameHealthOverride map[string]health.HealthStatusCode type resourceNameHealthOverride map[string]health.HealthStatusCode

6
gitops-engine/pkg/sync/hook/delete_policy.go
View file

@ -3,9 +3,9 @@ package hook
import ( import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
helmhook "github.com/argoproj/gitops-engine/pkg/sync/hook/helm" helmhook "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/hook/helm"
resourceutil "github.com/argoproj/gitops-engine/pkg/sync/resource" resourceutil "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/resource"
) )
func DeletePolicies(obj *unstructured.Unstructured) []common.HookDeletePolicy { func DeletePolicies(obj *unstructured.Unstructured) []common.HookDeletePolicy {

4
gitops-engine/pkg/sync/hook/delete_policy_test.go
View file

@ -5,8 +5,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
testingutils "github.com/argoproj/gitops-engine/pkg/utils/testing" testingutils "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/testing"
) )
func TestDeletePolicies(t *testing.T) { func TestDeletePolicies(t *testing.T) {

4
gitops-engine/pkg/sync/hook/helm/delete_policy.go
View file

@ -1,8 +1,8 @@
package helm package helm
import ( import (
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
resourceutil "github.com/argoproj/gitops-engine/pkg/sync/resource" resourceutil "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/resource"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
) )

4
gitops-engine/pkg/sync/hook/helm/delete_policy_test.go
View file

@ -5,8 +5,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
testingutils "github.com/argoproj/gitops-engine/pkg/utils/testing" testingutils "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/testing"
) )
func TestDeletePolicies(t *testing.T) { func TestDeletePolicies(t *testing.T) {

2
gitops-engine/pkg/sync/hook/helm/hook_test.go
View file

@ -5,7 +5,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
testingutils "github.com/argoproj/gitops-engine/pkg/utils/testing" testingutils "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/testing"
) )
func TestIsHook(t *testing.T) { func TestIsHook(t *testing.T) {

4
gitops-engine/pkg/sync/hook/helm/type.go
View file

@ -3,8 +3,8 @@ package helm
import ( import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
resourceutil "github.com/argoproj/gitops-engine/pkg/sync/resource" resourceutil "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/resource"
) )
type Type string type Type string

4
gitops-engine/pkg/sync/hook/helm/type_test.go
View file

@ -5,8 +5,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
testingutils "github.com/argoproj/gitops-engine/pkg/utils/testing" testingutils "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/testing"
) )
func TestTypes(t *testing.T) { func TestTypes(t *testing.T) {

2
gitops-engine/pkg/sync/hook/helm/weight_test.go
View file

@ -3,7 +3,7 @@ package helm
import ( import (
"testing" "testing"
testingutils "github.com/argoproj/gitops-engine/pkg/utils/testing" testingutils "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

6
gitops-engine/pkg/sync/hook/hook.go
View file

@ -3,9 +3,9 @@ package hook
import ( import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
helmhook "github.com/argoproj/gitops-engine/pkg/sync/hook/helm" helmhook "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/hook/helm"
resourceutil "github.com/argoproj/gitops-engine/pkg/sync/resource" resourceutil "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/resource"
) )
const ( const (

4
gitops-engine/pkg/sync/hook/hook_test.go
View file

@ -6,8 +6,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
testingutils "github.com/argoproj/gitops-engine/pkg/utils/testing" testingutils "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/testing"
) )
func TestNoHooks(t *testing.T) { func TestNoHooks(t *testing.T) {

2
gitops-engine/pkg/sync/ignore/ignore.go
View file

@ -3,7 +3,7 @@ package ignore
import ( import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/sync/hook" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/hook"
) )
// should we Ignore this resource? // should we Ignore this resource?

4
gitops-engine/pkg/sync/ignore/ignore_test.go
View file

@ -5,11 +5,11 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
testingutils "github.com/argoproj/gitops-engine/pkg/utils/testing" testingutils "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/testing"
) )
func newHook(obj *unstructured.Unstructured, hookType common.HookType) *unstructured.Unstructured { func newHook(obj *unstructured.Unstructured, hookType common.HookType) *unstructured.Unstructured {

8
gitops-engine/pkg/sync/reconcile.go
View file

@ -4,10 +4,10 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
hookutil "github.com/argoproj/gitops-engine/pkg/sync/hook" hookutil "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/hook"
"github.com/argoproj/gitops-engine/pkg/sync/ignore" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/ignore"
kubeutil "github.com/argoproj/gitops-engine/pkg/utils/kube" kubeutil "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/argoproj/gitops-engine/pkg/utils/text" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/text"
) )
func splitHooks(target []*unstructured.Unstructured) ([]*unstructured.Unstructured, []*unstructured.Unstructured) { func splitHooks(target []*unstructured.Unstructured) ([]*unstructured.Unstructured, []*unstructured.Unstructured) {

2
gitops-engine/pkg/sync/reconcile_test.go
View file

@ -8,7 +8,7 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
type unknownResourceInfoProvider struct{} type unknownResourceInfoProvider struct{}

2
gitops-engine/pkg/sync/resource/annotations_test.go
View file

@ -6,7 +6,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
testingutils "github.com/argoproj/gitops-engine/pkg/utils/testing" testingutils "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/testing"
) )
func TestHasAnnotationOption(t *testing.T) { func TestHasAnnotationOption(t *testing.T) {

12
gitops-engine/pkg/sync/sync_context.go
View file

@ -26,12 +26,12 @@ import (
cmdutil "k8s.io/kubectl/pkg/cmd/util" cmdutil "k8s.io/kubectl/pkg/cmd/util"
"k8s.io/kubectl/pkg/util/openapi" "k8s.io/kubectl/pkg/util/openapi"
"github.com/argoproj/gitops-engine/pkg/diff" "github.com/argoproj/argo-cd/gitops-engine/pkg/diff"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/argoproj/gitops-engine/pkg/sync/hook" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/hook"
resourceutil "github.com/argoproj/gitops-engine/pkg/sync/resource" resourceutil "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/resource"
kubeutil "github.com/argoproj/gitops-engine/pkg/utils/kube" kubeutil "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
type reconciledResource struct { type reconciledResource struct {

16
gitops-engine/pkg/sync/sync_context_test.go
View file

@ -28,13 +28,13 @@ import (
testcore "k8s.io/client-go/testing" testcore "k8s.io/client-go/testing"
"k8s.io/klog/v2/textlogger" "k8s.io/klog/v2/textlogger"
"github.com/argoproj/gitops-engine/pkg/diff" "github.com/argoproj/argo-cd/gitops-engine/pkg/diff"
"github.com/argoproj/gitops-engine/pkg/health" "github.com/argoproj/argo-cd/gitops-engine/pkg/health"
synccommon "github.com/argoproj/gitops-engine/pkg/sync/common" synccommon "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/argoproj/gitops-engine/pkg/sync/hook" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/hook"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
"github.com/argoproj/gitops-engine/pkg/utils/kube/kubetest" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube/kubetest"
testingutils "github.com/argoproj/gitops-engine/pkg/utils/testing" testingutils "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/testing"
) )
func newTestSyncCtx(getResourceFunc *func(ctx context.Context, config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string) (*unstructured.Unstructured, error), opts ...SyncOpt) *syncContext { func newTestSyncCtx(getResourceFunc *func(ctx context.Context, config *rest.Config, gvk schema.GroupVersionKind, name string, namespace string) (*unstructured.Unstructured, error), opts ...SyncOpt) *syncContext {
@ -551,7 +551,7 @@ func TestSync_ApplyOutOfSyncOnly_ClusterResources(t *testing.T) {
// spec.destination.namespace is set for all resources that does not have a namespace set, irrespective of whether // spec.destination.namespace is set for all resources that does not have a namespace set, irrespective of whether
// the resource is cluster scoped or namespace scoped. // the resource is cluster scoped or namespace scoped.
// //
// Refer to https://github.com/argoproj/gitops-engine/blob/8007df5f6c5dd78a1a8cef73569468ce4d83682c/pkg/sync/sync_context.go#L827-L833 // Refer to https://github.com/argoproj/argo-cd/gitops-engine/blob/8007df5f6c5dd78a1a8cef73569468ce4d83682c/pkg/sync/sync_context.go#L827-L833
ns2Target.SetNamespace("ns-2") ns2Target.SetNamespace("ns-2")
syncCtx := newTestSyncCtx(nil, WithResourceModificationChecker(true, diffResultListClusterResource())) syncCtx := newTestSyncCtx(nil, WithResourceModificationChecker(true, diffResultListClusterResource()))

4
gitops-engine/pkg/sync/sync_phase.go
View file

@ -3,8 +3,8 @@ package sync
import ( import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/argoproj/gitops-engine/pkg/sync/hook" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/hook"
) )
func syncPhases(obj *unstructured.Unstructured) []common.SyncPhase { func syncPhases(obj *unstructured.Unstructured) []common.SyncPhase {

4
gitops-engine/pkg/sync/sync_phase_test.go
View file

@ -6,8 +6,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
testingutils "github.com/argoproj/gitops-engine/pkg/utils/testing" testingutils "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/testing"
) )
func TestSyncPhaseNone(t *testing.T) { func TestSyncPhaseNone(t *testing.T) {

10
gitops-engine/pkg/sync/sync_task.go
View file

@ -6,10 +6,10 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/argoproj/gitops-engine/pkg/sync/hook" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/hook"
"github.com/argoproj/gitops-engine/pkg/sync/syncwaves" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/syncwaves"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
// syncTask holds the live and target object. At least one should be non-nil. A targetObj of nil // syncTask holds the live and target object. At least one should be non-nil. A targetObj of nil
@ -157,7 +157,7 @@ func (t *syncTask) resourceKey() kube.ResourceKey {
// To prevent resource lookup issues, we always rely on the namespace of the live object if it is available. // To prevent resource lookup issues, we always rely on the namespace of the live object if it is available.
// This logic will work for both cluster scoped and namespace scoped resources. // This logic will work for both cluster scoped and namespace scoped resources.
// //
// Refer to https://github.com/argoproj/gitops-engine/blob/8007df5f6c5dd78a1a8cef73569468ce4d83682c/pkg/sync/sync_context.go#L827-L833 // Refer to https://github.com/argoproj/argo-cd/gitops-engine/blob/8007df5f6c5dd78a1a8cef73569468ce4d83682c/pkg/sync/sync_context.go#L827-L833
resourceKey.Namespace = t.liveObj.GetNamespace() resourceKey.Namespace = t.liveObj.GetNamespace()
} }
return resourceKey return resourceKey

4
gitops-engine/pkg/sync/sync_task_test.go
View file

@ -6,8 +6,8 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
testingutils "github.com/argoproj/gitops-engine/pkg/utils/testing" testingutils "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/testing"
) )
func Test_syncTask_hookType(t *testing.T) { func Test_syncTask_hookType(t *testing.T) {

4
gitops-engine/pkg/sync/sync_tasks.go
View file

@ -7,8 +7,8 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
"github.com/argoproj/gitops-engine/pkg/utils/kube" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube"
) )
// kindOrder represents the correct order of Kubernetes resources within a manifest // kindOrder represents the correct order of Kubernetes resources within a manifest

4
gitops-engine/pkg/sync/sync_tasks_test.go
View file

@ -8,8 +8,8 @@ import (
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
testingutils "github.com/argoproj/gitops-engine/pkg/utils/testing" testingutils "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/testing"
) )
func Test_syncTasks_kindOrder(t *testing.T) { func Test_syncTasks_kindOrder(t *testing.T) {

4
gitops-engine/pkg/sync/syncwaves/waves.go
View file

@ -5,8 +5,8 @@ import (
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"github.com/argoproj/gitops-engine/pkg/sync/common" "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/common"
helmhook "github.com/argoproj/gitops-engine/pkg/sync/hook/helm" helmhook "github.com/argoproj/argo-cd/gitops-engine/pkg/sync/hook/helm"
) )
func Wave(obj *unstructured.Unstructured) int { func Wave(obj *unstructured.Unstructured) int {

2
gitops-engine/pkg/sync/syncwaves/waves_test.go
View file

@ -5,7 +5,7 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
testingutils "github.com/argoproj/gitops-engine/pkg/utils/testing" testingutils "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/testing"
) )
func TestWave(t *testing.T) { func TestWave(t *testing.T) {

2
gitops-engine/pkg/utils/kube/convert.go
View file

@ -7,7 +7,7 @@ import (
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"github.com/argoproj/gitops-engine/pkg/utils/kube/scheme" "github.com/argoproj/argo-cd/gitops-engine/pkg/utils/kube/scheme"
) )
func convertToVersionWithScheme(obj *unstructured.Unstructured, group string, version string) (*unstructured.Unstructured, error) { func convertToVersionWithScheme(obj *unstructured.Unstructured, group string, version string) (*unstructured.Unstructured, error) {

Some files were not shown because too many files have changed in this diff Show more