From 2b8971938aeb0d1894e3c670c8631dd0268446e1 Mon Sep 17 00:00:00 2001 From: Andrew Bays Date: Tue, 23 Apr 2024 12:01:40 +0000 Subject: [PATCH] Split lib/dataplane into nodeset and deployment --- lib/dataplane/deployment/kustomization.yaml | 6 + .../openstackdataplanedeployment.yaml | 0 lib/dataplane/kustomization.yaml | 127 +----------------- .../{ => nodeset}/dataplane-ssh-secret.yaml | 0 lib/dataplane/nodeset/kustomization.yaml | 127 ++++++++++++++++++ .../nova-migration-ssh-secret.yaml | 0 .../openstackdataplanenodeset.yaml | 0 7 files changed, 136 insertions(+), 124 deletions(-) create mode 100644 lib/dataplane/deployment/kustomization.yaml rename lib/dataplane/{ => deployment}/openstackdataplanedeployment.yaml (100%) rename lib/dataplane/{ => nodeset}/dataplane-ssh-secret.yaml (100%) create mode 100644 lib/dataplane/nodeset/kustomization.yaml rename lib/dataplane/{ => nodeset}/nova-migration-ssh-secret.yaml (100%) rename lib/dataplane/{ => nodeset}/openstackdataplanenodeset.yaml (100%) diff --git a/lib/dataplane/deployment/kustomization.yaml b/lib/dataplane/deployment/kustomization.yaml new file mode 100644 index 000000000..95790db5a --- /dev/null +++ b/lib/dataplane/deployment/kustomization.yaml @@ -0,0 +1,6 @@ +--- +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +resources: + - openstackdataplanedeployment.yaml diff --git a/lib/dataplane/openstackdataplanedeployment.yaml b/lib/dataplane/deployment/openstackdataplanedeployment.yaml similarity index 100% rename from lib/dataplane/openstackdataplanedeployment.yaml rename to lib/dataplane/deployment/openstackdataplanedeployment.yaml diff --git a/lib/dataplane/kustomization.yaml b/lib/dataplane/kustomization.yaml index 030400190..5185c8ab5 100644 --- 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 b/lib/dataplane/nodeset/dataplane-ssh-secret.yaml similarity index 100% rename from lib/dataplane/dataplane-ssh-secret.yaml rename to lib/dataplane/nodeset/dataplane-ssh-secret.yaml diff --git a/lib/dataplane/nodeset/kustomization.yaml b/lib/dataplane/nodeset/kustomization.yaml new file mode 100644 index 000000000..69502fe30 --- /dev/null +++ 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 b/lib/dataplane/nodeset/nova-migration-ssh-secret.yaml similarity index 100% rename from lib/dataplane/nova-migration-ssh-secret.yaml rename to lib/dataplane/nodeset/nova-migration-ssh-secret.yaml diff --git a/lib/dataplane/openstackdataplanenodeset.yaml b/lib/dataplane/nodeset/openstackdataplanenodeset.yaml similarity index 100% rename from lib/dataplane/openstackdataplanenodeset.yaml rename to lib/dataplane/nodeset/openstackdataplanenodeset.yaml