Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

flux2
- Activity
- Members
- Releases
- Model registry
- Model experiments

Snippets Groups Projects

5b9a1ce5

Unverified Commit 5b9a1ce5 authored 3 years ago by Stefan Prodan Committed by GitHub 3 years ago

Downloads
- Plain Diff

Merge pull request #2452 from souleb/fix-stringData-diff

Diff: fix stringData Secret issue

parents 1ff8c280 32ad462e

No related branches found

No related tags found

Loading

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

cmd/flux/diff_kustomization.go 11 additions, 2 deletions

cmd/flux/diff_kustomization.go
cmd/flux/diff_kustomization_test.go 13 additions, 9 deletions

cmd/flux/diff_kustomization_test.go
cmd/flux/testdata/build-kustomization/podinfo-result.yaml 2 additions, 2 deletions

cmd/flux/testdata/build-kustomization/podinfo-result.yaml
cmd/flux/testdata/diff-kustomization/diff-with-drifted-stringdata-sops-secret.golden 6 additions, 0 deletions

...omization/diff-with-drifted-stringdata-sops-secret.golden
cmd/flux/testdata/diff-kustomization/stringdata-sops-secret.yaml 1 addition, 1 deletion

...x/testdata/diff-kustomization/stringdata-sops-secret.yaml
go.mod 21 additions, 20 deletions

go.mod
go.sum 184 additions, 59 deletions

go.sum
internal/build/build.go 36 additions, 5 deletions

internal/build/build.go
internal/build/diff.go 25 additions, 34 deletions

internal/build/diff.go
internal/utils/apply.go 1 addition, 1 deletion

internal/utils/apply.go
pkg/status/status.go 2 additions, 2 deletions

pkg/status/status.go

with 302 additions and 135 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment