Merge pull request openstack-k8s-operators#194 from abays/split_lib_d…

…ataplane Split lib/dataplane into nodeset and deployment
abays · Apr 23, 2024 · 86fd5f3 · 86fd5f3
2 parents e562e84 + 2b89719
commit 86fd5f3
Show file tree

Hide file tree

Showing 7 changed files with 136 additions and 124 deletions.
diff --git a/lib/dataplane/deployment/kustomization.yaml b/lib/dataplane/deployment/kustomization.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+  - openstackdataplanedeployment.yaml
diff --git a/...taplane/openstackdataplanedeployment.yaml → ...loyment/openstackdataplanedeployment.yaml b/...taplane/openstackdataplanedeployment.yaml → ...loyment/openstackdataplanedeployment.yaml
diff --git a/lib/dataplane/kustomization.yaml b/lib/dataplane/kustomization.yaml
@@ -2,127 +2,6 @@
 apiVersion: kustomize.config.k8s.io/v1alpha1
 kind: Component
 
-resources:
-  - dataplane-ssh-secret.yaml
-  - nova-migration-ssh-secret.yaml
-  - openstackdataplanenodeset.yaml
-  - openstackdataplanedeployment.yaml
-
-secretGenerator:
-  - name: libvirt-secret
-    behavior: create
-    literals:
-      - LibvirtPassword=12345678
-    options:
-      disableNameSuffixHash: true
-
-# OpenStackDataPlaneNodeSet customizations
-replacements:
-  - source:
-      kind: ConfigMap
-      name: edpm-values
-      fieldPath: data.nodeset.ansible
-    targets:
-      - select:
-          kind: OpenStackDataPlaneNodeSet
-        fieldPaths:
-          - spec.nodeTemplate.ansible
-        options:
-          create: true
-  - source:
-      kind: ConfigMap
-      name: edpm-values
-      fieldPath: data.nodeset.networks
-    targets:
-      - select:
-          kind: OpenStackDataPlaneNodeSet
-        fieldPaths:
-          - spec.nodeTemplate.networks
-        options:
-          create: true
-  - source:
-      kind: ConfigMap
-      name: edpm-values
-      fieldPath: data.nodeset.nodes
-    targets:
-      - select:
-          kind: OpenStackDataPlaneNodeSet
-        fieldPaths:
-          - spec.nodes
-        options:
-          create: true
-  - source:
-      kind: ConfigMap
-      name: edpm-values
-      fieldPath: data.nodeset.services
-    targets:
-      - select:
-          kind: OpenStackDataPlaneNodeSet
-        fieldPaths:
-          - spec.services
-        options:
-          create: true
-
-  # Dataplane SSH access secret customizations
-  - source:
-      kind: ConfigMap
-      name: edpm-values
-      fieldPath: data.ssh_keys.authorized
-    targets:
-      - select:
-          kind: Secret
-          name: dataplane-ansible-ssh-private-key-secret
-        fieldPaths:
-          - data.authorized_keys
-        options:
-          create: true
-  - source:
-      kind: ConfigMap
-      name: edpm-values
-      fieldPath: data.ssh_keys.private
-    targets:
-      - select:
-          kind: Secret
-          name: dataplane-ansible-ssh-private-key-secret
-        fieldPaths:
-          - data.ssh-privatekey
-        options:
-          create: true
-  - source:
-      kind: ConfigMap
-      name: edpm-values
-      fieldPath: data.ssh_keys.public
-    targets:
-      - select:
-          kind: Secret
-          name: dataplane-ansible-ssh-private-key-secret
-        fieldPaths:
-          - data.ssh-publickey
-        options:
-          create: true
-
-  # Nova migration secret customizations
-  - source:
-      kind: ConfigMap
-      name: edpm-values
-      fieldPath: data.nova.migration.ssh_keys.private
-    targets:
-      - select:
-          kind: Secret
-          name: nova-migration-ssh-key
-        fieldPaths:
-          - data.ssh-privatekey
-        options:
-          create: true
-  - source:
-      kind: ConfigMap
-      name: edpm-values
-      fieldPath: data.nova.migration.ssh_keys.public
-    targets:
-      - select:
-          kind: Secret
-          name: nova-migration-ssh-key
-        fieldPaths:
-          - data.ssh-publickey
-        options:
-          create: true
+components:
+  - nodeset
+  - deployment
diff --git a/lib/dataplane/dataplane-ssh-secret.yaml → ...taplane/nodeset/dataplane-ssh-secret.yaml b/lib/dataplane/dataplane-ssh-secret.yaml → ...taplane/nodeset/dataplane-ssh-secret.yaml
diff --git a/lib/dataplane/nodeset/kustomization.yaml b/lib/dataplane/nodeset/kustomization.yaml
@@ -0,0 +1,127 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+  - dataplane-ssh-secret.yaml
+  - nova-migration-ssh-secret.yaml
+  - openstackdataplanenodeset.yaml
+
+secretGenerator:
+  - name: libvirt-secret
+    behavior: create
+    literals:
+      - LibvirtPassword=12345678
+    options:
+      disableNameSuffixHash: true
+
+# OpenStackDataPlaneNodeSet customizations
+replacements:
+  - source:
+      kind: ConfigMap
+      name: edpm-values
+      fieldPath: data.nodeset.ansible
+    targets:
+      - select:
+          kind: OpenStackDataPlaneNodeSet
+        fieldPaths:
+          - spec.nodeTemplate.ansible
+        options:
+          create: true
+  - source:
+      kind: ConfigMap
+      name: edpm-values
+      fieldPath: data.nodeset.networks
+    targets:
+      - select:
+          kind: OpenStackDataPlaneNodeSet
+        fieldPaths:
+          - spec.nodeTemplate.networks
+        options:
+          create: true
+  - source:
+      kind: ConfigMap
+      name: edpm-values
+      fieldPath: data.nodeset.nodes
+    targets:
+      - select:
+          kind: OpenStackDataPlaneNodeSet
+        fieldPaths:
+          - spec.nodes
+        options:
+          create: true
+  - source:
+      kind: ConfigMap
+      name: edpm-values
+      fieldPath: data.nodeset.services
+    targets:
+      - select:
+          kind: OpenStackDataPlaneNodeSet
+        fieldPaths:
+          - spec.services
+        options:
+          create: true
+
+  # Dataplane SSH access secret customizations
+  - source:
+      kind: ConfigMap
+      name: edpm-values
+      fieldPath: data.ssh_keys.authorized
+    targets:
+      - select:
+          kind: Secret
+          name: dataplane-ansible-ssh-private-key-secret
+        fieldPaths:
+          - data.authorized_keys
+        options:
+          create: true
+  - source:
+      kind: ConfigMap
+      name: edpm-values
+      fieldPath: data.ssh_keys.private
+    targets:
+      - select:
+          kind: Secret
+          name: dataplane-ansible-ssh-private-key-secret
+        fieldPaths:
+          - data.ssh-privatekey
+        options:
+          create: true
+  - source:
+      kind: ConfigMap
+      name: edpm-values
+      fieldPath: data.ssh_keys.public
+    targets:
+      - select:
+          kind: Secret
+          name: dataplane-ansible-ssh-private-key-secret
+        fieldPaths:
+          - data.ssh-publickey
+        options:
+          create: true
+
+  # Nova migration secret customizations
+  - source:
+      kind: ConfigMap
+      name: edpm-values
+      fieldPath: data.nova.migration.ssh_keys.private
+    targets:
+      - select:
+          kind: Secret
+          name: nova-migration-ssh-key
+        fieldPaths:
+          - data.ssh-privatekey
+        options:
+          create: true
+  - source:
+      kind: ConfigMap
+      name: edpm-values
+      fieldPath: data.nova.migration.ssh_keys.public
+    targets:
+      - select:
+          kind: Secret
+          name: nova-migration-ssh-key
+        fieldPaths:
+          - data.ssh-publickey
+        options:
+          create: true
diff --git a/lib/dataplane/nova-migration-ssh-secret.yaml → ...ne/nodeset/nova-migration-ssh-secret.yaml b/lib/dataplane/nova-migration-ssh-secret.yaml → ...ne/nodeset/nova-migration-ssh-secret.yaml
diff --git a/lib/dataplane/openstackdataplanenodeset.yaml → ...ne/nodeset/openstackdataplanenodeset.yaml b/lib/dataplane/openstackdataplanenodeset.yaml → ...ne/nodeset/openstackdataplanenodeset.yaml