actions/fluxcd-flux2
3
0
Fork 0
mirror of https://github.com/fluxcd/flux2.git synced 2026-02-21 07:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #3721 from yiannistri/3593-fix-double-newline

Browse source 
fix: Avoid printing an extra newline when exporting resources
This commit is contained in:
Hidde Beydals 2023-03-24 11:07:23 +01:00 committed by GitHub
commit 10f8849e12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/flux/export.go
View file

@ -122,5 +122,6 @@ func printExport(export interface{}) error {
func resourceToString(data []byte) string { func resourceToString(data []byte) string {
data = bytes.Replace(data, []byte(" creationTimestamp: null\n"), []byte(""), 1) data = bytes.Replace(data, []byte(" creationTimestamp: null\n"), []byte(""), 1)
data = bytes.Replace(data, []byte("status: {}\n"), []byte(""), 1) data = bytes.Replace(data, []byte("status: {}\n"), []byte(""), 1)
data = bytes.TrimSpace(data)
return string(data) return string(data)
} }

1
cmd/flux/testdata/create_source_git/export.golden vendored
View file

@ -12,4 +12,3 @@ spec:
ref: ref:
branch: master branch: master
url: https://github.com/stefanprodan/podinfo url: https://github.com/stefanprodan/podinfo

1
cmd/flux/testdata/create_source_helm/https.golden vendored
View file

@ -7,4 +7,3 @@ metadata:
spec: spec:
interval: 5m0s interval: 5m0s
url: https://stefanprodan.github.io/charts/podinfo url: https://stefanprodan.github.io/charts/podinfo

1
cmd/flux/testdata/create_source_helm/oci-with-secret.golden vendored
View file

@ -10,4 +10,3 @@ spec:
name: creds name: creds
type: oci type: oci
url: oci://ghcr.io/stefanprodan/charts/podinfo url: oci://ghcr.io/stefanprodan/charts/podinfo

1
cmd/flux/testdata/create_source_helm/oci.golden vendored
View file

@ -8,4 +8,3 @@ spec:
interval: 5m0s interval: 5m0s
type: oci type: oci
url: oci://ghcr.io/stefanprodan/charts/podinfo url: oci://ghcr.io/stefanprodan/charts/podinfo

1
cmd/flux/testdata/export/alert.yaml vendored
View file

@ -14,4 +14,3 @@ spec:
providerRef: providerRef:
name: slack name: slack
summary: Slacktest Notification summary: Slacktest Notification

1
cmd/flux/testdata/export/bucket.yaml vendored
View file

@ -11,4 +11,3 @@ spec:
provider: aws provider: aws
region: us-east-1 region: us-east-1
timeout: 30s timeout: 30s

1
cmd/flux/testdata/export/git-repo.yaml vendored
View file

@ -13,4 +13,3 @@ spec:
name: flux-system name: flux-system
timeout: 1m0s timeout: 1m0s
url: ssh://git@github.com/example/repo url: ssh://git@github.com/example/repo

1
cmd/flux/testdata/export/helm-release.yaml vendored
View file

@ -15,4 +15,3 @@ spec:
namespace: {{ .fluxns }} namespace: {{ .fluxns }}
version: '*' version: '*'
interval: 5m0s interval: 5m0s

1
cmd/flux/testdata/export/helm-repo.yaml vendored
View file

@ -9,4 +9,3 @@ spec:
provider: generic provider: generic
timeout: 1m0s timeout: 1m0s
url: https://stefanprodan.github.io/podinfo url: https://stefanprodan.github.io/podinfo

1
cmd/flux/testdata/export/image-policy.yaml vendored
View file

@ -10,4 +10,3 @@ spec:
policy: policy:
semver: semver:
range: 5.0.x range: 5.0.x

1
cmd/flux/testdata/export/image-repo.yaml vendored
View file

@ -10,4 +10,3 @@ spec:
image: ghcr.io/test/podinfo image: ghcr.io/test/podinfo
interval: 1m0s interval: 1m0s
provider: generic provider: generic

1
cmd/flux/testdata/export/image-update.yaml vendored
View file

@ -17,4 +17,3 @@ spec:
update: update:
path: ./clusters/my-cluster path: ./clusters/my-cluster
strategy: Setters strategy: Setters

1
cmd/flux/testdata/export/ks.yaml vendored
View file

@ -11,4 +11,3 @@ spec:
sourceRef: sourceRef:
kind: GitRepository kind: GitRepository
name: flux-system name: flux-system

1
cmd/flux/testdata/export/provider.yaml vendored
View file

@ -8,4 +8,3 @@ spec:
address: https://hooks.slack.com/services/mock address: https://hooks.slack.com/services/mock
channel: A channel with spacess channel: A channel with spacess
type: slack type: slack

1
cmd/flux/testdata/export/receiver.yaml vendored
View file

@ -15,4 +15,3 @@ spec:
secretRef: secretRef:
name: webhook-token name: webhook-token
type: github type: github

1
cmd/flux/testdata/oci/export.golden vendored
View file

@ -9,4 +9,3 @@ spec:
ref: ref:
tag: 6.3.5 tag: 6.3.5
url: oci://ghcr.io/stefanprodan/manifests/podinfo url: oci://ghcr.io/stefanprodan/manifests/podinfo

1
cmd/flux/testdata/oci/export_with_secret.golden vendored
View file

@ -11,4 +11,3 @@ spec:
secretRef: secretRef:
name: creds name: creds
url: oci://ghcr.io/stefanprodan/manifests/podinfo url: oci://ghcr.io/stefanprodan/manifests/podinfo