Merge pull request #3 from tegridy-io/fix/kubevirt-deployment

Fix kubevirt instance not deployed in operator namespace

class/defaults.yml

@@ -9,5 +9,4 @@ parameters:
     operator:
       replicas: 2
 
-    instancePrefix: syn-kubevirt
     instances: {}

component/instances.jsonnet

@@ -10,33 +10,17 @@ local prefixedName(name) = params.instancePrefix + '-' + name;
 
 // Define outputs below
 {
-  ['20_kubevirt_' + name]: [
-    kube.Namespace(prefixedName(name)) {
-      local spec = std.get(params.instances[name], 'namespace', { labels: {}, annotations: {} }),
-      metadata+: {
-        annotations: spec.annotations,
-        labels+: spec.labels {
-          'app.kubernetes.io/managed-by': 'commodore',
-          'app.kubernetes.io/name': prefixedName(name),
-        },
+  ['20_kubevirt_' + name]: kube._Object('kubevirt.io/v1', 'KubeVirt', 'instance') {
+    local spec = params.instances[name],
+    metadata+: {
+      labels+: {
+        'app.kubernetes.io/managed-by': 'commodore',
+        'app.kubernetes.io/name': name,
+        'app.kubernetes.io/instance': name,
       },
+      namespace: params.namespace,
     },
-    kube._Object('kubevirt.io/v1', 'KubeVirt', 'instance') {
-      local spec = params.instances[name],
-      metadata+: {
-        labels+: {
-          'app.kubernetes.io/managed-by': 'commodore',
-          'app.kubernetes.io/name': 'instance',
-          'app.kubernetes.io/instance': name,
-        },
-        namespace: prefixedName(name),
-      },
-      spec+: {
-        [k]: spec[k]
-        for k in std.objectFields(spec)
-        if k != 'namespace'
-      },
-    },
-  ]
+    spec+: params.instances[name],
+  }
   for name in std.objectFields(params.instances)
 }

docs/modules/ROOT/pages/references/parameters.adoc

@@ -46,9 +46,6 @@ Deploy instances, see https://kubevirt.io/user-guide/operations/customize_compon
 ----
 instances:
   default:
-    namespace:
-      annotations: {}
-      labels: {}
     certificateRotateStrategy: {}
     configuration: {}
     customizeComponents: {}

tests/defaults.yml

@@ -2,9 +2,6 @@ parameters:
   kubevirt_operator:
     instances:
       default:
-        namespace:
-          annotations: {}
-          labels: {}
         certificateRotateStrategy: {}
         configuration: {}
         customizeComponents: {}

tests/golden/defaults/kubevirt-operator/kubevirt-operator/20_kubevirt_default.yaml

@@ -1,24 +1,14 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  annotations: {}
-  labels:
-    app.kubernetes.io/managed-by: commodore
-    app.kubernetes.io/name: syn-kubevirt-default
-    name: syn-kubevirt-default
-  name: syn-kubevirt-default
----
 apiVersion: kubevirt.io/v1
 kind: KubeVirt
 metadata:
   annotations: {}
   labels:
     app.kubernetes.io/instance: default
     app.kubernetes.io/managed-by: commodore
-    app.kubernetes.io/name: instance
+    app.kubernetes.io/name: default
     name: instance
   name: instance
-  namespace: syn-kubevirt-default
+  namespace: syn-kubevirt-operator
 spec:
   certificateRotateStrategy: {}
   configuration: {}