From d6f36ce534b9067091b56eec76e10be870ebeeee Mon Sep 17 00:00:00 2001
From: Rob Kooper <kooper@illinois.edu>
Date: Mon, 3 Jun 2024 10:44:07 -0500
Subject: [PATCH] manila not manilla
---
.../storage/{manilla.yaml => manila.yaml} | 16 ++++++++--------
charts/apps/values.yaml | 2 +-
terraform/modules/argocd/argocd.tf | 2 +-
.../modules/argocd/templates/argocd.yaml.tmpl | 3 +++
terraform/modules/argocd/variables.tf | 4 ++--
5 files changed, 15 insertions(+), 12 deletions(-)
rename charts/apps/templates/storage/{manilla.yaml => manila.yaml} (80%)
diff --git a/charts/apps/templates/storage/manilla.yaml b/charts/apps/templates/storage/manila.yaml
similarity index 80%
rename from charts/apps/templates/storage/manilla.yaml
rename to charts/apps/templates/storage/manila.yaml
index 8523738..fe8d825 100644
--- a/charts/apps/templates/storage/manilla.yaml
+++ b/charts/apps/templates/storage/manila.yaml
@@ -1,11 +1,11 @@
-{{- if and .Values.manilla .Values.manilla.enabled }}
+{{- if and .Values.manila .Values.manila.enabled }}
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
- name: {{ .Values.cluster.name }}-manilla
+ name: {{ .Values.cluster.name }}-manila
labels:
cluster: {{ .Values.cluster.name | quote }}
- app: manilla
+ app: manila
namespace: {{ .Values.cluster.namespace | default "argocd" | quote }}
annotations:
{{- toYaml .Values.notifications | nindent 4 }}
@@ -13,7 +13,7 @@ spec:
project: {{ .Values.cluster.name }}
destination:
server: {{ .Values.cluster.url }}
- namespace: manilla-csi
+ namespace: manila-csi
syncPolicy:
{{- if .Values.sync }}
automated:
@@ -30,16 +30,16 @@ spec:
pod-security.kubernetes.io/warn: privileged
source:
repoURL: https://kubernetes.github.io/cloud-provider-openstack
- chart: openstack-manilla-csi
- targetRevision: {{ .Values.manilla.version | quote }}
+ chart: openstack-manila-csi
+ targetRevision: {{ .Values.manila.version | quote }}
helm:
version: v3
- releaseName: manilla-csi
+ releaseName: manila-csi
values: |
secret:
enabled: true
create: true
- name: manilla-csi-cloud-config
+ name: manila-csi-cloud-config
data:
cloud.conf: |-
[Global]
diff --git a/charts/apps/values.yaml b/charts/apps/values.yaml
index c963f91..5397396 100644
--- a/charts/apps/values.yaml
+++ b/charts/apps/values.yaml
@@ -89,7 +89,7 @@ cinder:
enabled: false
version: "2.*"
-manilla:
+manila:
enabled: false
version: "2.*"
diff --git a/terraform/modules/argocd/argocd.tf b/terraform/modules/argocd/argocd.tf
index 9fedc0d..786b68d 100644
--- a/terraform/modules/argocd/argocd.tf
+++ b/terraform/modules/argocd/argocd.tf
@@ -35,7 +35,7 @@ locals {
longhorn_replicas = var.longhorn_replicas
nfs_enabled = var.nfs_enabled
cinder_enabled = var.cinder_enabled
- manilla_enabled = var.manilla_enabled
+ manila_enabled = var.manila_enabled
metallb_enabled = var.metallb_enabled
floating_ip = var.floating_ip
ingress_controller_enabled = var.ingress_controller_enabled
diff --git a/terraform/modules/argocd/templates/argocd.yaml.tmpl b/terraform/modules/argocd/templates/argocd.yaml.tmpl
index 72b26a6..3f90e62 100644
--- a/terraform/modules/argocd/templates/argocd.yaml.tmpl
+++ b/terraform/modules/argocd/templates/argocd.yaml.tmpl
@@ -122,3 +122,6 @@ spec:
cinder:
enabled: ${cinder_enabled}
+
+ manila:
+ enabled: ${manila_enabled}
diff --git a/terraform/modules/argocd/variables.tf b/terraform/modules/argocd/variables.tf
index f3ea001..f4e8079 100644
--- a/terraform/modules/argocd/variables.tf
+++ b/terraform/modules/argocd/variables.tf
@@ -117,9 +117,9 @@ variable "cinder_enabled" {
default = true
}
-variable "manilla_enabled" {
+variable "manila_enabled" {
type = bool
- description = "Enable manilla storage"
+ description = "Enable manila storage"
default = false
}
--
GitLab