From 7e5484512207da38c5a36c677514abdbd185dd52 Mon Sep 17 00:00:00 2001 From: Rob Kooper <kooper@illinois.edu> Date: Fri, 26 Aug 2022 14:39:34 -0500 Subject: [PATCH] switch to taiga --- charts/apps/templates/storage/nfs.yaml | 10 +++++----- charts/apps/values.yaml | 2 -- terraform/modules/argocd/argocd.tf | 3 --- terraform/modules/argocd/templates/argocd.yaml.tmpl | 2 -- terraform/modules/argocd/variables.tf | 12 ------------ terraform/modules/rke1/templates/user_data.tmpl | 2 +- 6 files changed, 6 insertions(+), 25 deletions(-) diff --git a/charts/apps/templates/storage/nfs.yaml b/charts/apps/templates/storage/nfs.yaml index 0918f36..405be9d 100644 --- a/charts/apps/templates/storage/nfs.yaml +++ b/charts/apps/templates/storage/nfs.yaml @@ -13,7 +13,7 @@ spec: project: {{ .Values.cluster.name }} destination: server: {{ .Values.cluster.url }} - namespace: nfs-condo + namespace: nfs-taiga syncPolicy: {{- if .Values.sync }} automated: @@ -29,20 +29,20 @@ spec: targetRevision: {{ .Values.nfs.version | quote }} helm: version: v3 - releaseName: nfs-condo + releaseName: nfs-taiga values: | image: repository: kooper/nfs-subdir-external-provisioner tag: v4.0.3 storageClass: - name: nfs-condo + name: nfs-taiga archiveOnDelete: false reclaimPolicy: Retain defaultClass: true pathPattern: {{ .Values.nfs.pathPattern | quote }} nfs: - server: {{ .Values.nfs.server | quote }} - path: {{ .Values.nfs.path | default (printf "/radiant/projects/%s/%s" .Values.openstack.project .Values.cluster.name) | quote }} + server: taiga-nfs.ncsa.illinois.edu + path: {{ (printf "/taiga/ncsa/radiant/%s" .Values.openstack.project) | quote }} {{- end }} diff --git a/charts/apps/values.yaml b/charts/apps/values.yaml index 7f2115b..d106d80 100644 --- a/charts/apps/values.yaml +++ b/charts/apps/values.yaml @@ -59,8 +59,6 @@ metallb: nfs: enabled: false version: "4.*" - server: radiant-nfs.ncsa.illinois.edu - path: /export pathPattern: longhorn: diff --git a/terraform/modules/argocd/argocd.tf b/terraform/modules/argocd/argocd.tf index d49ed6d..b00e008 100644 --- a/terraform/modules/argocd/argocd.tf +++ b/terraform/modules/argocd/argocd.tf @@ -1,6 +1,5 @@ locals { cluster_argocd_url = var.argocd_master ? "https://kubernetes.default.svc" : "${var.rancher_url}/k8s/clusters/${var.cluster_kube_id}" - nfs_path = var.nfs_path == "" ? "/radiant/projects/${var.openstack_project}" : var.nfs_path argocd_cluster = templatefile("${path.module}/templates/cluster.yaml.tmpl", { cluster_name = var.cluster_name @@ -33,8 +32,6 @@ locals { longhorn_enabled = var.longhorn_enabled longhorn_replicas = var.longhorn_replicas nfs_enabled = var.nfs_enabled - nfs_server = var.nfs_server - nfs_path = local.nfs_path cinder_enabled = var.cinder_enabled metallb_enabled = var.metallb_enabled floating_ip = var.floating_ip diff --git a/terraform/modules/argocd/templates/argocd.yaml.tmpl b/terraform/modules/argocd/templates/argocd.yaml.tmpl index e92d210..150f0fe 100644 --- a/terraform/modules/argocd/templates/argocd.yaml.tmpl +++ b/terraform/modules/argocd/templates/argocd.yaml.tmpl @@ -95,8 +95,6 @@ spec: nfs: enabled: ${nfs_enabled} - server: ${nfs_server} - path: ${nfs_path} pathPattern: "${cluster_name}/$${.PVC.namespace}-$${.PVC.name}-$${.PVC.volume}" cinder: diff --git a/terraform/modules/argocd/variables.tf b/terraform/modules/argocd/variables.tf index 1037e39..27ad7f1 100644 --- a/terraform/modules/argocd/variables.tf +++ b/terraform/modules/argocd/variables.tf @@ -130,18 +130,6 @@ variable "nfs_enabled" { default = true } -variable "nfs_server" { - type = string - description = "NFS server" - default = "radiant-nfs.ncsa.illinois.edu" -} - -variable "nfs_path" { - type = string - description = "path on nfs server to create folder for mounts" - default = "" -} - variable "healthmonitor_enabled" { type = bool description = "Enable healthmonitor" diff --git a/terraform/modules/rke1/templates/user_data.tmpl b/terraform/modules/rke1/templates/user_data.tmpl index 5ae3682..2ac19e1 100644 --- a/terraform/modules/rke1/templates/user_data.tmpl +++ b/terraform/modules/rke1/templates/user_data.tmpl @@ -15,7 +15,7 @@ write_files: permissions: "0644" owner: root:root content: | - radiant-nfs.ncsa.illinois.edu:/radiant/projects/${project_name}/${cluster_name} /condo nfs defaults 0 0 + taiga-nfs.ncsa.illinois.edu:/taiga/ncsa/radiant/${project_name}/${cluster_name} /taiga nfs defaults 0 0 append: true - path: /etc/docker/daemon.json permissions: "0644" -- GitLab