Merge pull request #34 from fultonj/dt_va_sub

Restructure for DTs and rename VA1 to HCI
openstack-k8s-operators · Nov 27, 2023 · a4b6a53 · a4b6a53
2 parents 362f19e + 007ccf0
commit a4b6a53
Show file tree

Hide file tree

Showing 52 changed files with 20 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,6 @@
 # OpenStack K8S Operators Architectures
 
-This repo stores validated OpenStack K8S Operators architectures, represented as CRs for the various operators.
+This repo stores validated OpenStack K8S Operators architectures [VAs](va), represented as CRs for the various operators.
+
+It also stores deployment topologies [DTs](dt) which should only be
+used for testing.
diff --git a/docs/index.md b/docs/index.md
@@ -1 +1 @@
-../validated_arch_1/README.md
+../va/hci/README.md
diff --git a/docs/stage1.md b/docs/stage1.md
@@ -1 +1 @@
-../validated_arch_1/stage1/README.md
+../va/hci/stage1/README.md
diff --git a/docs/stage2.md b/docs/stage2.md
@@ -1 +1 @@
-../validated_arch_1/stage2/README.md
+../va/hci/stage2/README.md
diff --git a/docs/stage3.md b/docs/stage3.md
@@ -1 +1 @@
-../validated_arch_1/stage3/README.md
+../va/hci/stage3/README.md
diff --git a/docs/stage4.md b/docs/stage4.md
@@ -1 +1 @@
-../validated_arch_1/stage4/README.md
+../va/hci/stage4/README.md
diff --git a/docs/stage5.md b/docs/stage5.md
@@ -1 +1 @@
-../validated_arch_1/stage5/README.md
+../va/hci/stage5/README.md
diff --git a/docs/stage6.md b/docs/stage6.md
@@ -1 +1 @@
-../validated_arch_1/stage6/README.md
+../va/hci/stage6/README.md
diff --git a/dt/README.md b/dt/README.md
@@ -0,0 +1,9 @@
+# Deployment Topologies
+
+All validated architectures ([VAs](../va/)) are deployment topologies
+(DTs), but not all DTs are VAs.
+
+DTs represent CI optimizations. We design them to test lots of things
+together so we can have as few of them as possible. Before proposing a
+new DT to test something, consider if an update to an existing DT will
+achieve the same result.
diff --git a/validated_arch_1/README.md → va/hci/README.md b/validated_arch_1/README.md → va/hci/README.md
diff --git a/validated_arch_1/stage1/README.md → va/hci/stage1/README.md b/validated_arch_1/stage1/README.md → va/hci/stage1/README.md
diff --git a/...arch_1/stage1/cert_manager_namespace.yaml → va/hci/stage1/cert_manager_namespace.yaml b/...arch_1/stage1/cert_manager_namespace.yaml → va/hci/stage1/cert_manager_namespace.yaml
diff --git a/..._1/stage1/cert_manager_operatorgroup.yaml → ...ci/stage1/cert_manager_operatorgroup.yaml b/..._1/stage1/cert_manager_operatorgroup.yaml → ...ci/stage1/cert_manager_operatorgroup.yaml
diff --git a/...h_1/stage1/cert_manager_subscription.yaml → va/hci/stage1/cert_manager_subscription.yaml b/...h_1/stage1/cert_manager_subscription.yaml → va/hci/stage1/cert_manager_subscription.yaml
diff --git a/validated_arch_1/stage1/metallb_deploy.yaml → va/hci/stage1/metallb_deploy.yaml b/validated_arch_1/stage1/metallb_deploy.yaml → va/hci/stage1/metallb_deploy.yaml
diff --git a/...ated_arch_1/stage1/metallb_namespace.yaml → va/hci/stage1/metallb_namespace.yaml b/...ated_arch_1/stage1/metallb_namespace.yaml → va/hci/stage1/metallb_namespace.yaml
diff --git a/..._arch_1/stage1/metallb_operatorgroup.yaml → va/hci/stage1/metallb_operatorgroup.yaml b/..._arch_1/stage1/metallb_operatorgroup.yaml → va/hci/stage1/metallb_operatorgroup.yaml
diff --git a/...d_arch_1/stage1/metallb_subscription.yaml → va/hci/stage1/metallb_subscription.yaml b/...d_arch_1/stage1/metallb_subscription.yaml → va/hci/stage1/metallb_subscription.yaml
diff --git a/validated_arch_1/stage1/nmstate_deploy.yaml → va/hci/stage1/nmstate_deploy.yaml b/validated_arch_1/stage1/nmstate_deploy.yaml → va/hci/stage1/nmstate_deploy.yaml
diff --git a/...ated_arch_1/stage1/nmstate_namespace.yaml → va/hci/stage1/nmstate_namespace.yaml b/...ated_arch_1/stage1/nmstate_namespace.yaml → va/hci/stage1/nmstate_namespace.yaml
diff --git a/..._arch_1/stage1/nmstate_operatorgroup.yaml → va/hci/stage1/nmstate_operatorgroup.yaml b/..._arch_1/stage1/nmstate_operatorgroup.yaml → va/hci/stage1/nmstate_operatorgroup.yaml
diff --git a/...d_arch_1/stage1/nmstate_subscription.yaml → va/hci/stage1/nmstate_subscription.yaml b/...d_arch_1/stage1/nmstate_subscription.yaml → va/hci/stage1/nmstate_subscription.yaml
diff --git a/validated_arch_1/stage2/README.md → va/hci/stage2/README.md b/validated_arch_1/stage2/README.md → va/hci/stage2/README.md
diff --git a/validated_arch_1/stage2/catalogsource.yaml → va/hci/stage2/catalogsource.yaml b/validated_arch_1/stage2/catalogsource.yaml → va/hci/stage2/catalogsource.yaml
diff --git a/validated_arch_1/stage2/namespaces.yaml → va/hci/stage2/namespaces.yaml b/validated_arch_1/stage2/namespaces.yaml → va/hci/stage2/namespaces.yaml
diff --git a/validated_arch_1/stage2/operatorgroup.yaml → va/hci/stage2/operatorgroup.yaml b/validated_arch_1/stage2/operatorgroup.yaml → va/hci/stage2/operatorgroup.yaml
diff --git a/validated_arch_1/stage2/subscription.yaml → va/hci/stage2/subscription.yaml b/validated_arch_1/stage2/subscription.yaml → va/hci/stage2/subscription.yaml
diff --git a/validated_arch_1/stage3/README.md → va/hci/stage3/README.md b/validated_arch_1/stage3/README.md → va/hci/stage3/README.md
diff --git a/...arch_1/stage3/metallb_ipaddresspools.yaml → va/hci/stage3/metallb_ipaddresspools.yaml b/...arch_1/stage3/metallb_ipaddresspools.yaml → va/hci/stage3/metallb_ipaddresspools.yaml
diff --git a/...rch_1/stage3/metallb_l2advertisement.yaml → va/hci/stage3/metallb_l2advertisement.yaml b/...rch_1/stage3/metallb_l2advertisement.yaml → va/hci/stage3/metallb_l2advertisement.yaml
diff --git a/...ted_arch_1/stage3/netattach_ctlplane.yaml → va/hci/stage3/netattach_ctlplane.yaml b/...ted_arch_1/stage3/netattach_ctlplane.yaml → va/hci/stage3/netattach_ctlplane.yaml
diff --git a/..._arch_1/stage3/netattach_internalapi.yaml → va/hci/stage3/netattach_internalapi.yaml b/..._arch_1/stage3/netattach_internalapi.yaml → va/hci/stage3/netattach_internalapi.yaml
diff --git a/...ated_arch_1/stage3/netattach_storage.yaml → va/hci/stage3/netattach_storage.yaml b/...ated_arch_1/stage3/netattach_storage.yaml → va/hci/stage3/netattach_storage.yaml
diff --git a/...dated_arch_1/stage3/netattach_tenant.yaml → va/hci/stage3/netattach_tenant.yaml b/...dated_arch_1/stage3/netattach_tenant.yaml → va/hci/stage3/netattach_tenant.yaml
diff --git a/validated_arch_1/stage3/ocp_node_0_nncp.yaml → va/hci/stage3/ocp_node_0_nncp.yaml b/validated_arch_1/stage3/ocp_node_0_nncp.yaml → va/hci/stage3/ocp_node_0_nncp.yaml
diff --git a/validated_arch_1/stage3/ocp_node_1_nncp.yaml → va/hci/stage3/ocp_node_1_nncp.yaml b/validated_arch_1/stage3/ocp_node_1_nncp.yaml → va/hci/stage3/ocp_node_1_nncp.yaml
diff --git a/validated_arch_1/stage3/ocp_node_2_nncp.yaml → va/hci/stage3/ocp_node_2_nncp.yaml b/validated_arch_1/stage3/ocp_node_2_nncp.yaml → va/hci/stage3/ocp_node_2_nncp.yaml
diff --git a/validated_arch_1/stage4/README.md → va/hci/stage4/README.md b/validated_arch_1/stage4/README.md → va/hci/stage4/README.md
diff --git a/validated_arch_1/stage4/netconfig.yaml → va/hci/stage4/netconfig.yaml b/validated_arch_1/stage4/netconfig.yaml → va/hci/stage4/netconfig.yaml
diff --git a/..._arch_1/stage4/openstackcontrolplane.yaml → va/hci/stage4/openstackcontrolplane.yaml b/..._arch_1/stage4/openstackcontrolplane.yaml → va/hci/stage4/openstackcontrolplane.yaml
diff --git a/validated_arch_1/stage4/osp-secrets.yaml → va/hci/stage4/osp-secrets.yaml b/validated_arch_1/stage4/osp-secrets.yaml → va/hci/stage4/osp-secrets.yaml
diff --git a/validated_arch_1/stage5/README.md → va/hci/stage5/README.md b/validated_arch_1/stage5/README.md → va/hci/stage5/README.md
diff --git a/...ted_arch_1/stage5/dataplanesshsecret.yaml → va/hci/stage5/dataplanesshsecret.yaml b/...ted_arch_1/stage5/dataplanesshsecret.yaml → va/hci/stage5/dataplanesshsecret.yaml
diff --git a/.../stage5/openstackdataplanedeployment.yaml → .../stage5/openstackdataplanedeployment.yaml b/.../stage5/openstackdataplanedeployment.yaml → .../stage5/openstackdataplanedeployment.yaml
diff --git a/...h_1/stage5/openstackdataplanenodeset.yaml → va/hci/stage5/openstackdataplanenodeset.yaml b/...h_1/stage5/openstackdataplanenodeset.yaml → va/hci/stage5/openstackdataplanenodeset.yaml
diff --git a/validated_arch_1/stage6/README.md → va/hci/stage6/README.md b/validated_arch_1/stage6/README.md → va/hci/stage6/README.md
diff --git a/validated_arch_1/stage6/ceph_secret.yaml → va/hci/stage6/ceph_secret.yaml b/validated_arch_1/stage6/ceph_secret.yaml → va/hci/stage6/ceph_secret.yaml
diff --git a/validated_arch_1/stage6/nova_ceph.yaml → va/hci/stage6/nova_ceph.yaml b/validated_arch_1/stage6/nova_ceph.yaml → va/hci/stage6/nova_ceph.yaml
diff --git a/...arch_1/stage6/nova_migration_ssh_key.yaml → va/hci/stage6/nova_migration_ssh_key.yaml b/...arch_1/stage6/nova_migration_ssh_key.yaml → va/hci/stage6/nova_migration_ssh_key.yaml
diff --git a/..._arch_1/stage6/openstackcontrolplane.yaml → va/hci/stage6/openstackcontrolplane.yaml b/..._arch_1/stage6/openstackcontrolplane.yaml → va/hci/stage6/openstackcontrolplane.yaml
diff --git a/.../stage6/openstackdataplanedeployment.yaml → .../stage6/openstackdataplanedeployment.yaml b/.../stage6/openstackdataplanedeployment.yaml → .../stage6/openstackdataplanedeployment.yaml
diff --git a/...h_1/stage6/openstackdataplanenodeset.yaml → va/hci/stage6/openstackdataplanenodeset.yaml b/...h_1/stage6/openstackdataplanenodeset.yaml → va/hci/stage6/openstackdataplanenodeset.yaml
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../validated_arch_1/stage1/README.md
		../va/hci/stage1/README.md
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../validated_arch_1/stage2/README.md
		../va/hci/stage2/README.md
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../validated_arch_1/stage3/README.md
		../va/hci/stage3/README.md
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../validated_arch_1/stage4/README.md
		../va/hci/stage4/README.md
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../validated_arch_1/stage5/README.md
		../va/hci/stage5/README.md
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../validated_arch_1/stage6/README.md
		../va/hci/stage6/README.md