Merge pull request #708 from mengqiy/fixscaffolding

k8s-ci-robot · web-flow · commit a411224018f8 · 2019-05-16T13:44:30.000-07:00
fix a name changing issue and a missing scaffolding
diff --git a/pkg/scaffold/project.go b/pkg/scaffold/project.go
@@ -197,6 +197,7 @@ func (p *V2Project) Scaffold() error {
 		&managerv2.Kustomization{},
 		&webhook.Kustomization{},
 		&webhook.KustomizeConfigWebhook{},
+		&webhook.Service{},
 		&webhook.InjectCAPatch{},
 		&certmanager.CertManager{},
 		&certmanager.Kustomization{},
diff --git a/pkg/scaffold/v2/webhook/kustomization.go b/pkg/scaffold/v2/webhook/kustomization.go
@@ -40,7 +40,7 @@ func (c *Kustomization) GetInput() (input.Input, error) {
 }
 
 var KustomizeWebhookTemplate = `resources:
-- webhookmanifests.yaml
+- manifests.yaml
 - service.yaml
 
 configurations:
diff --git a/pkg/scaffold/v2/webhook/service.go b/pkg/scaffold/v2/webhook/service.go
@@ -49,4 +49,7 @@ spec:
   ports:
     - port: 443
       targetPort: 443
+  selector:
+    control-plane: controller-manager
+    controller-tools.k8s.io: "1.0"
 `
diff --git a/testdata/project-v2/config/webhook/kustomization.yaml b/testdata/project-v2/config/webhook/kustomization.yaml
@@ -1,5 +1,5 @@
 resources:
-- webhookmanifests.yaml
+- manifests.yaml
 - service.yaml
 
 configurations:
diff --git a/testdata/project-v2/config/webhook/manifests.yaml b/testdata/project-v2/config/webhook/manifests.yaml
diff --git a/testdata/project-v2/config/webhook/service.yaml b/testdata/project-v2/config/webhook/service.yaml
@@ -0,0 +1,13 @@
+
+apiVersion: v1
+kind: Service
+metadata:
+  name: webhook-service
+  namespace: system
+spec:
+  ports:
+    - port: 443
+      targetPort: 443
+  selector:
+    control-plane: controller-manager
+    controller-tools.k8s.io: "1.0"

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func (c *Kustomization) GetInput() (input.Input, error) {`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	var KustomizeWebhookTemplate = `resources:
`43`		`-- webhookmanifests.yaml`
	`43`	`+- manifests.yaml`
`44`	`44`	`- service.yaml`
`45`	`45`
`46`	`46`	`configurations:`
Original file line number	Diff line number	Diff line change
`@@ -49,4 +49,7 @@ spec:`
`49`	`49`	`ports:`
`50`	`50`	`- port: 443`
`51`	`51`	`targetPort: 443`
	`52`	`+ selector:`
	`53`	`+ control-plane: controller-manager`
	`54`	`+ controller-tools.k8s.io: "1.0"`
`52`	`55`	`