🏃 write multiple webhooks in one file

kubernetes-sigs · May 14, 2019 · 0f792e9 · 0f792e9
1 parent 89f6323
commit 0f792e9
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 24 deletions.
diff --git a/pkg/crd/gen.go b/pkg/crd/gen.go
@@ -71,7 +71,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
 			toTrivialVersions(&crd)
 		}
 		fileName := fmt.Sprintf("%s_%s.yaml", crd.Spec.Group, crd.Spec.Names.Plural)
-		if err := ctx.WriteYAML(crd, fileName); err != nil {
+		if err := ctx.WriteYAML(fileName, crd); err != nil {
 			return err
 		}
 	}

diff --git a/pkg/genall/genall.go b/pkg/genall/genall.go
@@ -83,27 +83,29 @@ type GenerationContext struct {
 	InputRule
 }
 
-// WriteYAML writes the given object out, serialized as YAML, using the
+// WriteYAML writes the given objects out, serialized as YAML, using the
 // context's OutputRule.
-func (g GenerationContext) WriteYAML(obj interface{}, itemPath string) error {
-	yamlContent, err := yaml.Marshal(obj)
-	if err != nil {
-		return err
-	}
-
+func (g GenerationContext) WriteYAML(itemPath string, objs ...interface{}) error {
 	out, err := g.Open(nil, itemPath)
 	if err != nil {
 		return err
 	}
 	defer out.Close()
 
-	n, err := out.Write(yamlContent)
-	if err != nil {
-		return err
-	}
-	if n < len(yamlContent) {
-		return io.ErrShortWrite
+	for _, obj := range objs {
+		yamlContent, err := yaml.Marshal(obj)
+		if err != nil {
+			return err
+		}
+		n, err := out.Write(append([]byte("---\n"), yamlContent...))
+		if err != nil {
+			return err
+		}
+		if n < len(yamlContent) {
+			return io.ErrShortWrite
+		}
 	}
+
 	return nil
 }
 

diff --git a/pkg/rbac/parser.go b/pkg/rbac/parser.go
@@ -85,7 +85,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
 		return nil
 	}
 
-	if err := ctx.WriteYAML(rbacv1.ClusterRole{
+	if err := ctx.WriteYAML("role.yaml", rbacv1.ClusterRole{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "ClusterRole",
 			APIVersion: rbacv1.SchemeGroupVersion.String(),
@@ -94,7 +94,7 @@ func (g Generator) Generate(ctx *genall.GenerationContext) error {
 			Name: g.RoleName,
 		},
 		Rules: rules,
-	}, "role.yaml"); err != nil {
+	}); err != nil {
 		return err
 	}
 

diff --git a/pkg/webhook/parser.go b/pkg/webhook/parser.go
@@ -140,28 +140,30 @@ func (Generator) Generate(ctx *genall.GenerationContext) error {
 		}
 	}
 
+	var objs []interface{}
 	if len(mutatingCfgs) > 0 {
-		if err := ctx.WriteYAML(admissionreg.MutatingWebhookConfiguration{
+		objs = append(objs, &admissionreg.MutatingWebhookConfiguration{
 			TypeMeta: metav1.TypeMeta{
 				Kind:       "MutatingWebhookConfiguration",
 				APIVersion: admissionreg.SchemeGroupVersion.String(),
 			},
 			Webhooks: mutatingCfgs,
-		}, "mutating-webhook.yaml"); err != nil {
-			return err
-		}
+		})
 	}
 
 	if len(validatingCfgs) > 0 {
-		if err := ctx.WriteYAML(admissionreg.ValidatingWebhookConfiguration{
+		objs = append(objs, &admissionreg.ValidatingWebhookConfiguration{
 			TypeMeta: metav1.TypeMeta{
 				Kind:       "ValidatingWebhookConfiguration",
 				APIVersion: admissionreg.SchemeGroupVersion.String(),
 			},
 			Webhooks: validatingCfgs,
-		}, "validating-webhook.yaml"); err != nil {
-			return err
-		}
+		})
+
+	}
+
+	if err := ctx.WriteYAML("webhookmanifests.yaml", objs...); err != nil {
+		return err
 	}
 
 	return nil