Skip to content
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: Enable WithIgnoreMutationWebhook #319

Closed
wants to merge 2 commits into from
Closed

Draft: Enable WithIgnoreMutationWebhook #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8175c87
add incluster kubectl client to test serverside with mutatation
davidwin93 Dec 5, 2024
2a7a652
update k8s dep
davidwin93 Dec 5, 2024
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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ require (
k8s.io/api v0.31.3
k8s.io/apiextensions-apiserver v0.31.2
k8s.io/apimachinery v0.31.3
k8s.io/client-go v0.31.3
k8s.io/client-go v1.5.2
k8s.io/klog/v2 v2.130.1
sigs.k8s.io/controller-runtime v0.19.3
sigs.k8s.io/yaml v1.4.0
)
Expand Down Expand Up @@ -295,7 +296,6 @@ require (
k8s.io/cli-runtime v0.31.3 // indirect
k8s.io/component-base v0.31.3 // indirect
k8s.io/component-helpers v0.31.3 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
k8s.io/kube-aggregator v0.31.2 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/kubectl v0.31.2 // indirect
Expand Down
32 changes: 28 additions & 4 deletions pkg/checks/diff/diff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ import (
"context"
"encoding/json"
"fmt"
"io"
"strings"
"time"

cmdutil "github.com/argoproj/argo-cd/v2/cmd/util"
"github.com/argoproj/argo-cd/v2/controller"
"github.com/argoproj/argo-cd/v2/pkg/apiclient/application"
Expand All @@ -20,12 +16,18 @@ import (
"github.com/argoproj/gitops-engine/pkg/sync/hook"
"github.com/argoproj/gitops-engine/pkg/sync/ignore"
"github.com/argoproj/gitops-engine/pkg/utils/kube"
"github.com/argoproj/gitops-engine/pkg/utils/tracing"
"github.com/ghodss/yaml"
"github.com/go-logr/zerologr"
"github.com/pmezard/go-difflib/difflib"
"github.com/rs/zerolog/log"
"io"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/rest"
"k8s.io/klog/v2/textlogger"
"strings"
"time"

"github.com/zapier/kubechecks/pkg/checks"
"github.com/zapier/kubechecks/pkg/msg"
Expand Down Expand Up @@ -201,11 +203,33 @@ func generateDiff(ctx context.Context, request checks.Request, argoSettings *set
ignoreNormalizerOpts := normalizers.IgnoreNormalizerOpts{
JQExecutionTimeout: 1 * time.Second,
}
kubeCtl := &kube.KubectlCmd{
Tracer: tracing.NopTracer{},
Log: textlogger.NewLogger(textlogger.NewConfig()),
}
config, err := rest.InClusterConfig()
if err != nil {
return diff.DiffResult{}, err
}
apiRes, _, err := kubeCtl.LoadOpenAPISchema(config)
if err != nil {
return diff.DiffResult{}, err
}
resources, _, err := kubeCtl.ManageResources(config, apiRes)
if err != nil {
return diff.DiffResult{}, err
}
dryRunner := diff.NewK8sServerSideDryRunner(resources)

diffConfig, err := argodiff.NewDiffConfigBuilder().
WithLogger(zerologr.New(&log.Logger)).
WithDiffSettings(request.App.Spec.IgnoreDifferences, overrides, ignoreAggregatedRoles, ignoreNormalizerOpts).
WithTracking(argoSettings.AppLabelKey, argoSettings.TrackingMethod).
WithNoCache().
WithIgnoreMutationWebhook(false).
WithServerSideDiff(true).
WithServerSideDryRunner(dryRunner).
WithManager("application/apply-patch").
Build()
if err != nil {
telemetry.SetError(span, err, "Build Diff")
Expand Down
Loading