Merge pull request #861 from rabi/cleanup_dataplane_operator

Remove references to dataplane-operator

Makefile

@@ -471,7 +471,6 @@ webhook-cleanup:
 # refresh the bundle extra data based on go.mod entries
 # bundle extra data includes:
 #  - extracted ENV vars from all operators (required for webhooks)
-#  - dataplane-operator bundle (this gets merged into openstack-operator's bundle)
 .PHONY: bundle-cache-extra-data
 bundle-cache-extra-data: build
 	bash hack/bundle-cache-data.sh

config/samples/dataplane_v1beta1_openstackdataplaneservice.yaml

@@ -4,9 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/name: openstackdataplaneservice
     app.kubernetes.io/instance: openstackdataplaneservice-sample
-    app.kubernetes.io/part-of: dataplane-operator
+    app.kubernetes.io/part-of: openstack-operator
     app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: dataplane-operator
+    app.kubernetes.io/created-by: openstack-operator
   name: openstackdataplaneservice-sample
 spec:
   # TODO(user): Add fields here

config/services/dataplane_v1beta1_openstackdataplaneservice_bootstrap.yaml

@@ -4,9 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/name: openstackdataplaneservice
     app.kubernetes.io/instance: openstackdataplaneservice-bootstrap
-    app.kubernetes.io/part-of: dataplane-operator
+    app.kubernetes.io/part-of: openstack-operator
     app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: dataplane-operator
+    app.kubernetes.io/created-by: openstack-operator
   name: bootstrap
 spec:
   playbook: osp.edpm.bootstrap

config/services/dataplane_v1beta1_openstackdataplaneservice_configure_network.yaml

@@ -4,9 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/name: openstackdataplaneservice
     app.kubernetes.io/instance: openstackdataplaneservice-configure-network
-    app.kubernetes.io/part-of: dataplane-operator
+    app.kubernetes.io/part-of: openstack-operator
     app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: dataplane-operator
+    app.kubernetes.io/created-by: openstack-operator
   name: configure-network
 spec:
   playbook: osp.edpm.configure_network

config/services/dataplane_v1beta1_openstackdataplaneservice_configure_ovs_dpdk.yaml

@@ -4,9 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/name: openstackdataplaneservice
     app.kubernetes.io/instance: openstackdataplaneservice-configure-ovs-dpdk
-    app.kubernetes.io/part-of: dataplane-operator
+    app.kubernetes.io/part-of: openstack-operator
     app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: dataplane-operator
+    app.kubernetes.io/created-by: openstack-operator
   name: configure-ovs-dpdk
 spec:
   playbook: osp.edpm.configure_ovs_dpdk

config/services/dataplane_v1beta1_openstackdataplaneservice_derive_pci_devicespec.yaml

@@ -4,9 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/name: openstackdataplaneservice
     app.kubernetes.io/instance: openstackdataplaneservice-derive-pci-devicespec
-    app.kubernetes.io/part-of: dataplane-operator
+    app.kubernetes.io/part-of: openstack-operator
     app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: dataplane-operator
+    app.kubernetes.io/created-by: openstack-operator
   name: derive-pci-devicespec
 spec:
   playbook: osp.edpm.sriov_derive_device_spec

config/services/dataplane_v1beta1_openstackdataplaneservice_download_cache.yaml

@@ -4,9 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/name: openstackdataplaneservice
     app.kubernetes.io/instance: openstackdataplaneservice-download-cache
-    app.kubernetes.io/part-of: dataplane-operator
+    app.kubernetes.io/part-of: openstack-operator
     app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: dataplane-operator
+    app.kubernetes.io/created-by: openstack-operator
   name: download-cache
 spec:
   playbook: osp.edpm.download_cache

config/services/dataplane_v1beta1_openstackdataplaneservice_install_certs.yaml

@@ -4,9 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/name: openstackdataplaneservice
     app.kubernetes.io/instance: openstackdataplaneservice-install-certs
-    app.kubernetes.io/part-of: dataplane-operator
+    app.kubernetes.io/part-of: openstack-operator
     app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: dataplane-operator
+    app.kubernetes.io/created-by: openstack-operator
   name: install-certs
 spec:
   playbook: osp.edpm.install_certs

config/services/dataplane_v1beta1_openstackdataplaneservice_validate_network.yaml

@@ -4,9 +4,9 @@ metadata:
   labels:
     app.kubernetes.io/name: openstackdataplaneservice
     app.kubernetes.io/instance: openstackdataplaneservice-validate-network
-    app.kubernetes.io/part-of: dataplane-operator
+    app.kubernetes.io/part-of: openstack-operator
     app.kubernetes.io/managed-by: kustomize
-    app.kubernetes.io/created-by: dataplane-operator
+    app.kubernetes.io/created-by: openstack-operator
   name: validate-network
 spec:
   playbook: osp.edpm.validate_network

custom-bundle.Dockerfile

@@ -33,7 +33,7 @@ COPY bundle/manifests /manifests/
 COPY bundle_extra_data /bundle_extra_data
 
 # Merge things into our openstack-operator CSV:
-#  -dataplane-operator CSV
+#  -openstack-operator CSV
 #  -ENV vars from all operators (for webhooks)
 RUN /workspace/csv-merger \
 	--import-env-files=/bundle_extra_data/env-vars.yaml \

docs/assemblies/con_data-plane-services.adoc

@@ -1,27 +1,27 @@
 = Composable services
 
-Composable services with dataplane-operator provide a way for users to
+Composable services with openstack-operator provide a way for users to
 customize services that are deployed on dataplane nodes. It is possible to
 "compose" a set of services such that the dataplane deployment can be
 customized in whichever ways are needed.
 
 Composing services can take different forms. The interfaces in
-dataplane-operator allow for:
+openstack-operator allow for:
 
 * Enabling/disabling services
 * Ordering services
 * Developing custom services
 
-For the purposes of the interfaces in dataplane-operator, a service is an
+For the purposes of the interfaces in openstack-operator, a service is an
 ansible execution that manages a software deployment (installation,
 configuration, execution, etc) on dataplane nodes. The ansible content that
 makes up each service is defined by the service itself. Each service is a
 resource instance of the
 xref:openstack_dataplaneservice.adoc[`OpenStackDataPlaneService`] CRD.
 
-== dataplane-operator provided services
+== openstack-operator provided services
 
-dataplane-operator provides a default list of services that will be deployed on
+openstack-operator provides a default list of services that will be deployed on
 dataplane nodes. The services list is set on the
 <<openstackdataplanenodesetspec,OpenStackDataPlaneNodeSet>> CRD.
 

docs/assemblies/design.adoc

@@ -1,12 +1,12 @@
 = Data Plane Design
 
-The dataplane-operator provisions and configures nodes that make up the
+The openstack-operator provisions and configures nodes that make up the
 OpenStack data plane. The data plane consists of nodes that host end-user
 workloads and applications. Depending on the OpenStack deployment, these data
 plane nodes are often compute nodes, but may also be storage nodes, networker
 nodes, or other types of nodes.
 
-The dataplane-operator provides a Kubernetes like abstraction and API for
+The openstack-operator provides a Kubernetes like abstraction and API for
 deploying the data plane. It uses the
 https://github.com/openstack-k8s-operators/openstack-baremetal-operator[openstack-baremetal-operator]
 to optionally provision baremetal. It then uses the
@@ -22,9 +22,9 @@ While the Ansible executions themselves run on the Kubernetes cluster as native
 Kubernetes workloads, they communicate using SSH with data plane nodes and use
 various Ansible modules to deploy software on data plane nodes.
 
-== dataplane-operator CRD Design and Resources
+== CRD Design and Resources
 
-The dataplane-operator exposes the concepts of `OpenStackDataPlaneNodeSets`,
+The openstack-operator exposes the concepts of `OpenStackDataPlaneNodeSets`,
 `OpenStackDataPlaneServices`, and `OpenStackDataPlaneDeployments` as CRD's:
 
 * <<openstackdataplanenodeset>>

docs/assemblies/proc_creating-a-custom-service.adoc

@@ -114,7 +114,7 @@ spec:
 
 . Optional: Specify the `edpmServiceType` field for the service. Different custom services may use the same ansible content to manage the same EDPM service (such as `ovn` or `nova`). The `DataSources`, TLS certificates, and CA certificates need to be mounted at the same locations so they can be found by the ansible content even when using a custom service. `edpmServiceType` is used to create this association. The value is the name of the default service that uses the same ansible content as the custom service.
 +
-For example, a custom service that uses the `edpm_ovn` ansible content from `edpm-ansible` would set `edpmServiceType` to `ovn`, which matches the default `ovn` service name provided by `dataplane-operator`.
+For example, a custom service that uses the `edpm_ovn` ansible content from `edpm-ansible` would set `edpmServiceType` to `ovn`, which matches the default `ovn` service name provided by `openstack-operator`.
 +
 ----
 apiVersion: dataplane.openstack.org/v1beta1

docs/assemblies/tls.adoc

@@ -4,7 +4,7 @@ When an OpenStackDataPlaneNodeSet is deployed with TLS Enabled, communications
 between dataplane services and with control plane services can be encrypted using
 TLS connections.
 
-Functionality has been added to the dataplane-operator to generate the needed
+Functionality has been added to the openstack-operator to generate the needed
 certificates for all compute nodes in the nodeset.  The details on how to enable
 this functionality and how dataplane services (including custom services) can take
 advantage of this functionality is provided here.

docs/dataplane.adoc

@@ -6,9 +6,9 @@
 :doctype: book
 :context: osp
 
-The dataplane-operator automates the deployment of an OpenStack dataplane. A
+The openstack-operator automates the deployment of an OpenStack dataplane. A
 dataplane is a collection of nodes that will be used for hosting OpenStack
-workloads. The dataplane-operator prepares the nodes with enough operating
+workloads. The openstack-operator prepares the nodes with enough operating
 system configuration so that they are ready for hosting other required
 OpenStack services and workloads.
 

hack/bundle-cache-data.sh

@@ -2,7 +2,6 @@
 
 # extract select data from bundles:
 #  -env vars from all service operators
-#  -dataplane-operator bundle is cached (in order to merge at build time)
 set -ex
 
 function extract_csv {