l-24 run done

config/samples/apps_v1_msbdeployment.yaml

@@ -1,12 +0,0 @@
-apiVersion: apps.mashibing.com/v1
-kind: MsbDeployment
-metadata:
-  labels:
-    app.kubernetes.io/name: msbdeployment
-    app.kubernetes.io/instance: msbdeployment-sample
-    app.kubernetes.io/part-of: mashibing-deployment
-    app.kuberentes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: mashibing-deployment
-  name: msbdeployment-sample
-spec:
-  # TODO(user): Add fields here

config/samples/apps_v1_msbdeployment_ingress.yaml

@@ -0,0 +1,11 @@
+apiVersion: apps.mashibing.com/v1
+kind: MsbDeployment
+metadata:
+  name: msbdeployment-ingress
+spec:
+  image: nginx
+  port: 80
+  replicas: 2
+  expose:
+    mode: ingress
+    ingressDomain: www.mashingbing-test.com

config/samples/apps_v1_msbdeployment_ingress2nodeport.yaml

@@ -0,0 +1,11 @@
+apiVersion: apps.mashibing.com/v1
+kind: MsbDeployment
+metadata:
+  name: msbdeployment-ingress
+spec:
+  image: nginx
+  port: 80
+  replicas: 2
+  expose:
+    mode: nodeport
+    nodePort: 30000

config/samples/apps_v1_msbdeployment_nodeport.yaml

@@ -0,0 +1,11 @@
+apiVersion: apps.mashibing.com/v1
+kind: MsbDeployment
+metadata:
+  name: msbdeployment-nodeport
+spec:
+  image: nginx
+  port: 80
+  replicas: 2
+  expose:
+    mode: nodeport
+    nodePort: 30000

config/samples/apps_v1_msbdeployment_nodeport2ingress.yaml

@@ -0,0 +1,11 @@
+apiVersion: apps.mashibing.com/v1
+kind: MsbDeployment
+metadata:
+  name: msbdeployment-nodeport
+spec:
+  image: nginx
+  port: 80
+  replicas: 2
+  expose:
+    mode: ingress
+    ingressDomain: www.mashingbing-test.com

controllers/generate-cr.go

@@ -14,7 +14,7 @@ import (
 )
 
 func parseTemplate(md *myAppsv1.MsbDeployment, templateName string) ([]byte, error) {
-	tmpl, err := template.ParseFiles(fmt.Sprintf("templates/%s", templateName))
+	tmpl, err := template.ParseFiles(fmt.Sprintf("controllers/templates/%s", templateName))
 	if err != nil {
 		return nil, err
 	}

controllers/templates/deployment.yaml

@@ -2,6 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ .ObjectMeta.Name }}
+  namespace: {{ .ObjectMeta.Namespace }}
   labels:
     app: {{ .ObjectMeta.Name }}
 spec:

controllers/templates/ingress.yaml

@@ -2,6 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ .ObjectMeta.Name }}
+  namespace: {{ .ObjectMeta.Namespace }}
 spec:
   ingressClassName: nginx
   rules:

controllers/templates/service-np.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .ObjectMeta.Name }}
+  namespace: {{ .ObjectMeta.Namespace }}
 spec:
   type: NodePort
   selector:

controllers/templates/service.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ .ObjectMeta.Name }}
+  namespace: {{ .ObjectMeta.Namespace }}
 spec:
   selector:
     app: {{ .ObjectMeta.Name }}