Merge pull request #5 from tegridy-io/fix/kubevirt-only-one-instance

Fix multiple instances not supported

class/defaults.yml

@@ -9,4 +9,4 @@ parameters:
     operator:
       replicas: 2
 
-    instances: {}
+    instance: {}

component/instances.jsonnet

@@ -6,21 +6,17 @@ local kube = import 'lib/kube.libjsonnet';
 local inv = kap.inventory();
 local params = inv.parameters.kubevirt_operator;
 
-local prefixedName(name) = params.instancePrefix + '-' + name;
-
 // Define outputs below
 {
-  ['20_kubevirt_' + name]: kube._Object('kubevirt.io/v1', 'KubeVirt', name) {
-    local spec = params.instances[name],
+  '20_kubevirt': kube._Object('kubevirt.io/v1', 'KubeVirt', 'instance') {
     metadata+: {
       labels+: {
         'app.kubernetes.io/managed-by': 'commodore',
-        'app.kubernetes.io/name': name,
-        'app.kubernetes.io/instance': name,
+        'app.kubernetes.io/name': 'instance',
+        'app.kubernetes.io/instance': 'instance',
       },
       namespace: params.namespace,
     },
-    spec+: params.instances[name],
-  }
-  for name in std.objectFields(params.instances)
+    spec+: params.instance,
+  },
 }

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

@@ -26,31 +26,30 @@ operator:
 Configure operator.
 
 
-== `instances`
+== `instance`
 
 [horizontal]
 type:: dictionary
 default::
 +
 [source,yaml]
 ----
-instances: {}
+instance: {}
 ----
 
-Deploy instances, see https://kubevirt.io/user-guide/operations/customize_components/[KubeVirt Documentation] for configuration.
+KubeVirt configuration, see https://kubevirt.io/user-guide/operations/customize_components/[KubeVirt Documentation] for specs.
 
 
 == Example
 
 [source,yaml]
 ----
 instances:
-  default:
-    certificateRotateStrategy: {}
-    configuration: {}
-    customizeComponents: {}
-    imagePullPolicy: IfNotPresent
-    infra:
-      replicas: 1
-    workloadUpdateStrategy: {}
+  certificateRotateStrategy: {}
+  configuration: {}
+  customizeComponents: {}
+  imagePullPolicy: IfNotPresent
+  infra:
+    replicas: 1
+  workloadUpdateStrategy: {}
 ----

tests/defaults.yml

@@ -1,11 +1,8 @@
 parameters:
   kubevirt_operator:
-    instances:
-      default:
-        certificateRotateStrategy: {}
-        configuration: {}
-        customizeComponents: {}
-        imagePullPolicy: IfNotPresent
-        infra:
-          replicas: 1
-        workloadUpdateStrategy: {}
+    instance:
+      certificateRotateStrategy: {}
+      configuration: {}
+      customizeComponents: {}
+      imagePullPolicy: IfNotPresent
+      workloadUpdateStrategy: {}

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

@@ -3,17 +3,15 @@ kind: KubeVirt
 metadata:
   annotations: {}
   labels:
-    app.kubernetes.io/instance: default
+    app.kubernetes.io/instance: instance
     app.kubernetes.io/managed-by: commodore
-    app.kubernetes.io/name: default
-    name: default
-  name: default
+    app.kubernetes.io/name: instance
+    name: instance
+  name: instance
   namespace: syn-kubevirt-operator
 spec:
   certificateRotateStrategy: {}
   configuration: {}
   customizeComponents: {}
   imagePullPolicy: IfNotPresent
-  infra:
-    replicas: 1
   workloadUpdateStrategy: {}