From 4fd272ddf7a7f238e387244498bc86f047bfa640 Mon Sep 17 00:00:00 2001 From: rblundon Date: Fri, 1 Aug 2025 09:26:48 -0500 Subject: [PATCH] change nfs provisioner --- cluster/nfs-storage-appset.yaml | 42 +++++++++++++++++++++++ cluster/nfs-storage/deployment.yaml | 4 +-- cluster/nfs-storage/nfs-storage.yaml | 33 ------------------ cluster/openshift-image-registry/pvc.yaml | 2 +- 4 files changed, 45 insertions(+), 36 deletions(-) create mode 100644 cluster/nfs-storage-appset.yaml delete mode 100644 cluster/nfs-storage/nfs-storage.yaml diff --git a/cluster/nfs-storage-appset.yaml b/cluster/nfs-storage-appset.yaml new file mode 100644 index 0000000..42b1665 --- /dev/null +++ b/cluster/nfs-storage-appset.yaml @@ -0,0 +1,42 @@ +--- +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: nfs-storage + namespace: openshift-gitops + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + goTemplate: true + goTemplateOptions: ["missingkey=error"] + generators: + - clusters: {} # Variable is .name + template: + metadata: + name: '{{.name}}-nfs-storage' + annotations: + argocd.argoproj.io/sync-wave: "2" + spec: + destination: + name: '{{.name}}' + namespace: openshift-nfs-storage + project: default + source: + path: cluster/nfs-storage + repoURL: https://github.com/rblundon/homelab.git + targetRevision: HEAD + syncPolicy: + automated: + prune: true + selfHeal: true + syncOptions: + - RespectIgnoreDifferences=true + - CreateNamespace=true + managedNamespaceMetadata: + labels: + argocd.argoproj.io/managed-by: openshift-gitops + ignoreDifferences: + - group: apps + kind: Deployment + jsonPointers: + - /spec/replicas \ No newline at end of file diff --git a/cluster/nfs-storage/deployment.yaml b/cluster/nfs-storage/deployment.yaml index 74ba40e..507dede 100644 --- a/cluster/nfs-storage/deployment.yaml +++ b/cluster/nfs-storage/deployment.yaml @@ -30,9 +30,9 @@ spec: - name: NFS_SERVER value: 10.10.121.35 - name: NFS_PATH - value: /volume1/nfs-ocp + value: /volume1/openshift-nfs volumes: - name: nfs-client-root nfs: server: 10.10.121.35 - path: /volume1/nfs-ocp + path: /volume1/openshift-nfs diff --git a/cluster/nfs-storage/nfs-storage.yaml b/cluster/nfs-storage/nfs-storage.yaml deleted file mode 100644 index 59aa1d7..0000000 --- a/cluster/nfs-storage/nfs-storage.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: nfs-storage - finalizers: - - resources-finalizer.argocd.argoproj.io - annotations: - argocd.argoproj.io/sync-wave: "2" -spec: - destination: - name: in-cluster - namespace: openshift-nfs-storage - project: default - source: - path: cluster-applications/nfs-storage - repoURL: git@github.com:rblundon/MK-Labs.git - targetRevision: HEAD - syncPolicy: - automated: - prune: true - selfHeal: true - syncOptions: - - RespectIgnoreDifferences=true - - CreateNamespace=true - managedNamespaceMetadata: - labels: - argocd.argoproj.io/managed-by: openshift-gitops - ignoreDifferences: - - group: apps - kind: Deployment - jsonPointers: - - /spec/replicas \ No newline at end of file diff --git a/cluster/openshift-image-registry/pvc.yaml b/cluster/openshift-image-registry/pvc.yaml index 361dfcb..cdeac3d 100644 --- a/cluster/openshift-image-registry/pvc.yaml +++ b/cluster/openshift-image-registry/pvc.yaml @@ -12,4 +12,4 @@ spec: resources: requests: storage: 100Gi - storageClassName: synology-nfs-storage + storageClassName: synology-nfs