feat: switch to helm chart repo for OpenStack

Switched to the published helm chart repo for the OpenStack components and change to using kustomize to execute helm like the other components are.
rackerlabs · Mar 7, 2024 · 12c62a4 · 12c62a4
1 parent 8cec26c
commit 12c62a4
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 60 deletions.
diff --git a/components/10-keystone/README.md b/components/10-keystone/README.md
@@ -1,28 +1,5 @@
 # OpenStack Keystone
 
-So unfortunately OpenStack Helm doesn't publish helm charts that can be consumed like
-regular helm charts. You must instead clone two of their git repos side by side and
-build the dependencies manually. They additionally don't split out secrets but instead
-template them into giant config files or even executable scripts that then get stored
-as secrets, a clear violation of <https://12factor.net>. As a result we cannot store
-a declarative config of Keystone and allow users to supply their own secrets.
-
-Due to the above issues, for now we'll skip the ArgoCD ability for this deployment.
-
-## Get OpenStack Helm Ready
-
-You may have done this for another OpenStack component and can share the same
-git clones. This assumes you're doing this from the top level of this repo.
-
-```bash
-# clone the two repos because they reference the infra one as a relative path
-# so you can't use real helm commands
-git clone https://github.com/openstack/openstack-helm
-git clone https://github.com/openstack/openstack-helm-infra
-# update the dependencies cause we can't use real helm references
-./scripts/openstack-helm-depend-sync.sh keystone
-```
-
 ## Label the node(s)
 
 In order to deploy Openstack control plane, at least one of the Kubernetes
@@ -51,13 +28,11 @@ Secrets Reference:
 # create secrets yaml file if you're not already storing or providing it differently
 ./scripts/gen-os-secrets.sh secret-openstack.yaml
 
-helm --namespace openstack template \
-    keystone \
-    ./openstack-helm/keystone/ \
-    -f components/openstack-2023.1-jammy.yaml \
-    -f components/10-keystone/aio-values.yaml \
-    -f secret-openstack.yaml \
-    | kubectl -n openstack apply -f -
+kubectl kustomize \
+  --enable-helm \
+  --load-restrictor LoadRestrictionsNone \
+  components/10-keystone \
+  | kubectl -n openstack apply -f -
 ```
 
 At this point Keystone will go through some initialization and start up.

diff --git a/components/10-keystone/kustomization.yaml b/components/10-keystone/kustomization.yaml
@@ -5,3 +5,16 @@ kind: Kustomization
 resources:
   - keystone-mariadb-db.yaml
   - keystone-rabbitmq-queue.yaml
+
+helmGlobals:
+  chartHome: ../../charts/
+helmCharts:
+  - name: keystone
+    namespace: openstack
+    releaseName: keystone
+    repo: https://tarballs.opendev.org/openstack/openstack-helm/
+    version: 0.3.7
+    valuesFile: aio-values.yaml
+    additionalValuesFiles:
+    - ../openstack-2023.1-jammy.yaml
+    - ../../secret-openstack.yaml
diff --git a/components/13-ironic/README.md b/components/13-ironic/README.md
@@ -1,28 +1,5 @@
 # OpenStack Ironic
 
-So unfortunately OpenStack Helm doesn't publish helm charts that can be consumed like
-regular helm charts. You must instead clone two of their git repos side by side and
-build the dependencies manually. They additionally don't split out secrets but instead
-template them into giant config files or even executable scripts that then get stored
-as secrets, a clear violation of <https://12factor.net>. As a result we cannot store
-a declarative config of Keystone and allow users to supply their own secrets.
-
-Due to the above issues, for now we'll skip the ArgoCD ability for this deployment.
-
-## Get OpenStack Helm Ready
-
-You may have done this for another OpenStack component and can share the same
-git clones. This assumes you're doing this from the top level of this repo.
-
-```bash
-# clone the two repos because they reference the infra one as a relative path
-# so you can't use real helm commands
-git clone https://github.com/openstack/openstack-helm
-git clone https://github.com/openstack/openstack-helm-infra
-# update the dependencies cause we can't use real helm references
-./scripts/openstack-helm-depend-sync.sh ironic
-```
-
 ## Deploy Ironic
 
 NOTE: The PXE service currently has the host network devices mapped into
@@ -48,13 +25,11 @@ Secrets Reference:
 # create secrets yaml file if you're not already storing or providing it differently
 ./scripts/gen-os-secrets.sh secret-openstack.yaml
 
-helm --namespace openstack template \
-    ironic \
-    ./openstack-helm/ironic/ \
-    -f components/openstack-2023.1-jammy.yaml \
-    -f components/13-ironic/aio-values.yaml \
-    -f secret-openstack.yaml \
-    | kubectl -n openstack apply -f -
+kubectl kustomize \
+  --enable-helm \
+  --load-restrictor LoadRestrictionsNone \
+  components/13-ironic \
+  | kubectl -n openstack apply -f -
 ```
 
 At this point Ironic will go through some initialization and start up.

diff --git a/components/13-ironic/kustomization.yaml b/components/13-ironic/kustomization.yaml
@@ -5,3 +5,16 @@ kind: Kustomization
 resources:
   - ironic-mariadb-db.yaml
   - ironic-rabbitmq-queue.yaml
+
+helmGlobals:
+  chartHome: ../../charts/
+helmCharts:
+  - name: ironic
+    namespace: openstack
+    releaseName: ironic
+    repo: https://tarballs.opendev.org/openstack/openstack-helm/
+    version: 0.2.10
+    valuesFile: aio-values.yaml
+    additionalValuesFiles:
+    - ../openstack-2023.1-jammy.yaml
+    - ../../secret-openstack.yaml