Skip to content

Commit 9918eaa

Browse files
authored
Merge pull request #1125 from rackerlabs/openstack-umbrella-chart
feat(openstack): convert our openstack prereqs to a helm chart
2 parents 593a34e + 9586382 commit 9918eaa

14 files changed

+96
-31
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ docs/workflows/
2929
.direnv
3030

3131
# mkdocs site output
32-
site/
32+
/site/

apps/site/openstack-memcached.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
component: openstack-memcached
3+
componentNamespace: openstack
4+
sources:
5+
- repoURL: https://charts.bitnami.com/bitnami
6+
chart: memcached
7+
targetRevision: 7.8.6
8+
helm:
9+
releaseName: memcached
10+
valueFiles:
11+
- $understack/components/openstack/memcached-values.yaml
12+
- $deploy/{{.name}}/helm-configs/openstack-memcached.yaml
13+
ignoreMissingValueFiles: true
14+
- ref: understack
15+
- ref: deploy

apps/site/openstack.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,10 @@ component: openstack
33
sources:
44
- ref: understack
55
path: 'components/openstack'
6+
helm:
7+
releaseName: openstack
8+
valueFiles:
9+
- $deploy/{{.name}}/helm-configs/openstack.yaml
10+
ignoreMissingValueFiles: true
611
- ref: deploy
712
path: '{{.name}}/manifests/openstack'

components/openstack/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
charts/

components/openstack/Chart.yaml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
apiVersion: v2
2+
name: openstack
3+
description: UnderStack resources for OpenStack Helm
4+
5+
# A chart can be either an 'application' or a 'library' chart.
6+
#
7+
# Application charts are a collection of templates that can be packaged into versioned archives
8+
# to be deployed.
9+
#
10+
# Library charts provide useful utilities or functions for the chart developer. They're included as
11+
# a dependency of application charts to inject those utilities and functions into the rendering
12+
# pipeline. Library charts do not define any templates and therefore cannot be deployed.
13+
type: application
14+
15+
# This is the chart version. This version number should be incremented each time you make changes
16+
# to the chart and its templates, including the app version.
17+
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18+
version: 0.1.0
19+
20+
# This is the version number of the application being deployed. This version number should be
21+
# incremented each time you make changes to the application. Versions are not expected to
22+
# follow Semantic Versioning. They should reflect the version the application is using.
23+
# It is recommended to use it with quotes.
24+
appVersion: "1.16.0"

components/openstack/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
# OpenStack
22

3-
These contain the pre-req components for deploying OpenStack.
3+
This is a Helm chart where UnderStack creates all the prerequisites
4+
for deploying OpenStack Helm. In some cases service/component level
5+
objects (like Keystone Users) are defined here to avoid duplication.

components/openstack/kustomization.yaml

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{{- range .Values.extraObjects }}
2+
---
3+
{{ if typeIs "string" . }}
4+
{{- tpl . $ }}
5+
{{- else }}
6+
{{- tpl (toYaml .) $ }}
7+
{{- end }}
8+
{{ end }}
File renamed without changes.

components/openstack/mariadb-instance.yaml renamed to components/openstack/templates/mariadb-instance.yaml.tpl

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,14 @@ metadata:
77
# do not allow ArgoCD to delete our DB
88
argocd.argoproj.io/sync-options: Delete=false
99
spec:
10-
rootPasswordSecretKeyRef:
11-
name: mariadb
12-
key: root-password
13-
generate: true
10+
rootPasswordSecretKeyRef: {{ .Values.mariadb.rootPasswordSecretKeyRef | toJson }}
1411

1512
# renovate: datasource=docker
1613
image: docker-registry1.mariadb.com/library/mariadb:11.4.4
1714
imagePullPolicy: IfNotPresent
1815

1916
port: 3306
20-
storage:
21-
size: 10Gi
22-
resizeInUseVolumes: true
23-
waitForVolumeResize: true
17+
storage: {{ .Values.mariadb.storage | toJson }}
2418

2519
service:
2620
type: ClusterIP

0 commit comments

Comments
 (0)