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 852373828abba9194f5923f515353ba7fb588828..fe8d82538a9b97f6455bb5c5bd065709e53b2bef 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 c963f914d7229fab3dbac636feacf61e8e8b262c..53973968d93333ae6e72cd94abc19c941554518f 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 9fedc0d83dfccfdc016c2a52115ce7e513caf27a..786b68ddd71524e3b6a53d20f2b1c79a6c453a4d 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 72b26a64982d8e2c19223a7b71927479b0d1d8b7..3f90e621208eaaafd2cc402d4c4352cada546c88 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 f3ea001892195bba0a3f345371443b6fa61f5fcc..f4e8079a2527beaf0185c0c46cb58e7b87949997 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 }