Merge pull request #448 from abays/osp_init

softwarefactory-project-zuul[bot] · web-flow · commit e5a762d0fc02 · 2025-01-15T20:49:01.000Z
[OSPRH-12761] Support new OpenStack initialization resource for RHOSO install We have a new upcoming way to install and deploy the OSP operators. OLM will only install one CRD for OSP, which is an initialization resource. A CR must be created for that CRD, which then, when created, causes all the remaining OSP CRDs to be installed and also deploys their respective operators. Depends-On: openstack-k8s-operators/openstack-operator#1185 Reviewed-by: John Fulton <johfulto@redhat.com>
diff --git a/examples/common/README.md b/examples/common/README.md
@@ -3,10 +3,9 @@
 All VAs and DTs assume that these CRs have been created.
 
 ## OLM
-
 The [olm](olm) directory contains a kustomization which will generate
 Namespace, OperatorGroup, and Subscription CRs. Creating these CRs
-will install the OpenStack K8S operators and their dependencies.
+will install the base OpenStack K8s operator.
 
 Observe CRs which will be generated.
 ```
@@ -16,14 +15,12 @@ Create the CRs.
 ```
 oc apply -k examples/common/olm/
 ```
-Watch the OpenStack operator pods start.
-```
-oc get pods -w -n openstack-operators
-```
 The following commands can be used to confirm that each step of this
 procedure is complete.
 ```
-while ! (oc get pod --no-headers=true -l name=cert-manager-operator -n cert-manager-operator| grep "cert-manager-operator"); do sleep 10; done
+while ! (oc get pod --no-headers=true -l openstack.org/operator-name=openstack-controller -n openstack-operators | grep "controller-operator"); do sleep 10; done
+oc wait pod -n openstack-operators --for condition=Ready -l openstack.org/operator-name=openstack-controller --timeout=300s
+while ! (oc get pod --no-headers=true -l name=cert-manager-operator -n cert-manager-operator | grep "cert-manager-operator"); do sleep 10; done
 oc wait pod -n cert-manager-operator --for condition=Ready -l name=cert-manager-operator --timeout=300s
 while ! (oc get pod --no-headers=true -l app=cainjector -n cert-manager | grep "cert-manager-cainjector"); do sleep 10; done
 oc wait pod -n cert-manager -l app=cainjector --for condition=Ready --timeout=300s
@@ -76,3 +73,23 @@ oc wait pod -n openshift-nmstate -l component=kubernetes-nmstate-handler --for c
 timeout 300 bash -c "while ! (oc get deployments/nmstate-webhook -n openshift-nmstate); do sleep 10; done"
 oc wait deployments/nmstate-webhook -n openshift-nmstate --for condition=Available --timeout=300s
 ```
+
+# OpenStack
+
+The [openstack](openstack) directory contains a kustomization which will generate
+the `OpenStack` initialization CR.  Creating this CR will install the remaining
+OpenStack K8s operators.
+
+Observe CRs which will be generated.
+```
+kustomize build examples/common/openstack/
+```
+Create the CRs.
+```
+oc apply -k examples/common/openstack/
+```
+The following command can be used to confirm that each step of this
+procedure is complete.
+```
+oc wait -n openstack-operators openstack openstack --for condition=Ready --timeout=300s
+```
diff --git a/examples/common/openstack/kustomization.yaml b/examples/common/openstack/kustomization.yaml
@@ -0,0 +1,3 @@
+---
+components:
+  - ../../../lib/openstack
diff --git a/lib/openstack/kustomization.yaml b/lib/openstack/kustomization.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+resources:
+  - openstack_deploy.yaml
diff --git a/lib/openstack/openstack_deploy.yaml b/lib/openstack/openstack_deploy.yaml
@@ -0,0 +1,6 @@
+---
+apiVersion: operator.openstack.org/v1beta1
+kind: OpenStack
+metadata:
+  name: openstack
+  namespace: openstack-operators

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+---`
	`2`	`+components:`
	`3`	`+ - ../../../lib/openstack`