Merge pull request #71 from phoracek/configurable_namespace

allow namespace adjustment during manifests build
kubevirt · Apr 16, 2019 · a62da9d · a62da9d
2 parents 50480d4 + 34fe29e
commit a62da9d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/pkg/components/components.go b/pkg/components/components.go
@@ -48,7 +48,7 @@ func (ai *AddonsImages) FillDefaults() *AddonsImages {
 	return ai
 }
 
-func GetDeployment(repository string, tag string, imagePullPolicy string, addonsImages *AddonsImages) *appsv1.Deployment {
+func GetDeployment(namespace string, repository string, tag string, imagePullPolicy string, addonsImages *AddonsImages) *appsv1.Deployment {
 	image := fmt.Sprintf("%s/%s:%s", repository, Name, tag)
 	deployment := &appsv1.Deployment{
 		TypeMeta: metav1.TypeMeta{
@@ -57,7 +57,7 @@ func GetDeployment(repository string, tag string, imagePullPolicy string, addons
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      Name,
-			Namespace: Name,
+			Namespace: namespace,
 		},
 		Spec: appsv1.DeploymentSpec{
 			Replicas: int32Ptr(1),
@@ -150,15 +150,15 @@ func GetDeployment(repository string, tag string, imagePullPolicy string, addons
 	return deployment
 }
 
-func GetRole() *rbacv1.Role {
+func GetRole(namespace string) *rbacv1.Role {
 	role := &rbacv1.Role{
 		TypeMeta: metav1.TypeMeta{
 			APIVersion: "rbac.authorization.k8s.io/v1",
 			Kind:       "Role",
 		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      Name,
-			Namespace: Name,
+			Namespace: namespace,
 			Labels: map[string]string{
 				"name": Name,
 			},

diff --git a/tools/manifest-templator/manifest-templator.go b/tools/manifest-templator/manifest-templator.go
@@ -136,6 +136,7 @@ func getCNA(data *templateData) {
 
 	// Get CNA Deployment
 	cnadeployment := components.GetDeployment(
+		data.Namespace,
 		data.ContainerPrefix,
 		data.ContainerTag,
 		data.ImagePullPolicy,
@@ -153,7 +154,7 @@ func getCNA(data *templateData) {
 
 	// Get CNA Role
 	writer = strings.Builder{}
-	role := components.GetRole()
+	role := components.GetRole(data.Namespace)
 	marshallObject(role, &writer)
 	roleString := writer.String()