Skip to content

Commit a5f3860

Browse files
committed
Updating WriteYAML to not add delimiter to start files
1 parent 699d149 commit a5f3860

File tree

9 files changed

+2
-14
lines changed

9 files changed

+2
-14
lines changed

pkg/crd/testdata/gen/bar.example.com_foos.v1beta1.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1beta1
43
kind: CustomResourceDefinition

pkg/crd/testdata/gen/bar.example.com_foos.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
apiVersion: apiextensions.k8s.io/v1
43
kind: CustomResourceDefinition

pkg/genall/genall.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func (g GenerationContext) WriteYAML(itemPath string, objs ...interface{}) error
135135
if err != nil {
136136
return err
137137
}
138-
n, err := out.Write(append([]byte("\n---\n"), yamlContent...))
138+
n, err := out.Write(append([]byte("---\n"), yamlContent...))
139139
if err != nil {
140140
return err
141141
}

pkg/webhook/parser_integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ var _ = Describe("Webhook Generation From Parsing to CustomResourceDefinition",
178178
})
179179

180180
func unmarshalBothV1(in []byte) (mutating admissionregv1.MutatingWebhookConfiguration, validating admissionregv1.ValidatingWebhookConfiguration) {
181-
documents := bytes.Split(in, []byte("\n---\n"))[1:]
181+
documents := bytes.Split(in, []byte("\n---\n"))
182182
ExpectWithOffset(1, documents).To(HaveLen(2), "expected two documents in file, found %d", len(documents))
183183

184184
ExpectWithOffset(1, yaml.UnmarshalStrict(documents[0], &mutating)).To(Succeed(), "expected the first document in the file to be a mutating webhook configuration")

pkg/webhook/testdata/invalid-admissionReviewVersionsRequired/manifests.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
apiVersion: admissionregistration.k8s.io/v1
43
kind: MutatingWebhookConfiguration
@@ -28,7 +27,6 @@ webhooks:
2827
resources:
2928
- cronjobs
3029
sideEffects: None
31-
3230
---
3331
apiVersion: admissionregistration.k8s.io/v1
3432
kind: ValidatingWebhookConfiguration

pkg/webhook/testdata/invalid-sideEffects/manifests.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
apiVersion: admissionregistration.k8s.io/v1
43
kind: MutatingWebhookConfiguration
@@ -28,7 +27,6 @@ webhooks:
2827
resources:
2928
- cronjobs
3029
sideEffects: None
31-
3230
---
3331
apiVersion: admissionregistration.k8s.io/v1
3432
kind: ValidatingWebhookConfiguration

pkg/webhook/testdata/invalid-v1beta1NotSupported/manifests.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
apiVersion: admissionregistration.k8s.io/v1
43
kind: MutatingWebhookConfiguration
@@ -28,7 +27,6 @@ webhooks:
2827
resources:
2928
- cronjobs
3029
sideEffects: None
31-
3230
---
3331
apiVersion: admissionregistration.k8s.io/v1
3432
kind: ValidatingWebhookConfiguration

pkg/webhook/testdata/manifests.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
apiVersion: admissionregistration.k8s.io/v1
43
kind: MutatingWebhookConfiguration
@@ -28,7 +27,6 @@ webhooks:
2827
resources:
2928
- cronjobs
3029
sideEffects: None
31-
3230
---
3331
apiVersion: admissionregistration.k8s.io/v1
3432
kind: ValidatingWebhookConfiguration

pkg/webhook/testdata/valid/manifests.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
---
32
apiVersion: admissionregistration.k8s.io/v1
43
kind: MutatingWebhookConfiguration
@@ -28,7 +27,6 @@ webhooks:
2827
resources:
2928
- cronjobs
3029
sideEffects: None
31-
3230
---
3331
apiVersion: admissionregistration.k8s.io/v1
3432
kind: ValidatingWebhookConfiguration

0 commit comments

Comments
 (0)