Re-try the SMB imat bridge

This reverts commit 554e7f0.

Reapply "Fix misspellings"

This reverts commit e41a23e.

Reapply "Fix broken selector"

This reverts commit a373c4a.

Reapply "Switch from nfs to smb for imat"

This reverts commit bc0a49e.

Reapply "Use a different version"

This reverts commit b578979.

Author: Pasarus

apps/smb-bridges/deployment.yml

@@ -0,0 +1,43 @@
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: smb-bridges-staging
+  namespace: argocd
+spec:
+  destination:
+    namespace: fia
+    name: staging
+  project: staging
+  source:
+    path: components/smb-bridges/envs/staging
+    repoURL: https://github.com/interactivereduction/gitops.git
+    targetRevision: HEAD
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: smb-bridges-prod
+  namespace: argocd
+spec:
+  destination:
+    namespace: fia
+    name: prod
+  project: prod
+  source:
+    path: components/smb-bridges/envs/production
+    repoURL: https://github.com/interactivereduction/gitops.git
+    targetRevision: HEAD
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true

components/plotting-service/base/kustomization.yml

@@ -5,6 +5,5 @@ resources:
   - plotting-service-service.yml
   - ceph-pv.yml
   - ceph-pvc.yml
-  - imat-secret.yml
   - plotting-service-secret.yml
   - httproute.yml

components/plotting-service/base/plotting-service.yml

@@ -43,9 +43,8 @@ spec:
           volumeMounts:
             - name: cephfs-mount
               mountPath: /ceph
-            - name: imat-work
+            - name: imat-mount
               mountPath: /imat
-              mountPropagation: HostToContainer
           readinessProbe:
             httpGet:
               path: /healthz
@@ -58,55 +57,16 @@ spec:
               port: 80
             initialDelaySeconds: 5
             periodSeconds: 5
-        - name: imat-mounter
-          image: alpine
-          securityContext:
-            privileged: true
-          command: ["sh", "-c"]
-          args:
-            - |
-              apk add --no-cache cifs-utils
-              mkdir -p /imat
-              
-              while true; do
-                if [ ${STAGING} == true ]; then
-                  sleep 1000000
-                else
-                  if [ ! -f /imat/lastrun.txt ]; then
-                    echo "$(date): Attempting to mount IMAT share..."
-                    if mount -t cifs //NDXIMAT.isis.cclrc.ac.uk/data$ /imat -o username=${IMAT_USER},password=${IMAT_PASSWORD},vers=2.1,ro,noserverino,_netdev 2>/dev/null; then
-                      echo "$(date): IMAT share mounted successfully"
-                    else
-                      echo "$(date): Failed to mount IMAT share, retrying in 5s..."
-                      sleep 5
-                    fi
-                  else
-                    echo "$(date): IMAT is mounted"
-                    sleep 60
-                  fi
-                fi
-              done
-
-          env:
-            - name: IMAT_USER
-              valueFrom:
-                secretKeyRef:
-                  name: imat-creds
-                  key: username
-            - name: IMAT_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: imat-creds
-                  key: password
-            - name: STAGING
-              value: "true"
-          volumeMounts:
-            - name: imat-work
-              mountPath: /imat
-              mountPropagation: Bidirectional
       volumes:
         - name: cephfs-mount
           persistentVolumeClaim:
             claimName: plotting-service-ceph-pvc
-        - name: imat-work
-          emptyDir: {}
+        - name: imat-mount
+          csi:
+            driver: smb.csi.k8s.io
+            volumeHandle: plotting-service-imat-smb
+            volumeAttributes:
+              source: "//smb-bridge-imat.fia.svc.cluster.local/imat"
+            nodeStageSecretRef:
+              name: smb-bridge-secret
+              namespace: fia

components/plotting-service/envs/production/kustomization.yml

@@ -7,5 +7,4 @@ components:
 patches:
   - path: plotting-service.yml
   - path: plotting-service-secret.yml
-  - path: imat-secret.yml
   - path: httproute.yml

components/plotting-service/envs/staging/kustomization.yml

@@ -5,5 +5,4 @@ resources:
 patches:
   - path: plotting-service.yml
   - path: plotting-service-secret.yml
-  - path: imat-secret.yml
   - path: httproute.yml

components/plotting-service/variants/production/imat-mounter.yml

@@ -0,0 +1,28 @@
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  annotations:
+    pv.kubernetes.io/provisioned-by: smb.csi.k8s.io
+  name: imat-pv-smb
+spec:
+  capacity:
+    storage: 1000Gi
+  accessModes:
+    - ReadOnlyMany
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - vers=2.1
+    - noserverino
+    - _netdev
+  csi:
+    driver: smb.csi.k8s.io
+    readOnly: true
+    # volumeHandle format: {smb-server-address}#{sub-dir-name}#{share-name}
+    # make sure this value is unique for every share in the cluster
+    volumeHandle: imat-smb
+    volumeAttributes:
+      source: "//NDXIMAT.isis.cclrc.ac.uk/data$"
+    nodeStageSecretRef:
+      name: imat-creds
+      namespace: fia

components/smb-bridges/base/imat-pv.yml

@@ -0,0 +1,13 @@
+---
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: imat-smb-pvc
+spec:
+  accessModes:
+    - ReadOnlyMany
+  resources:
+    requests:
+      storage: 1000Gi
+  volumeName: imat-pv-smb
+  storageClassName: ""

components/smb-bridges/base/imat-pvc.yml

@@ -0,0 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - imat-pv.yml
+  - imat-pvc.yml
+  - imat-secret.yml
+  - smb-bridge-imat.yml
+  - smb-bridge-imat-svc.yml
+  - smb-bridge-imat-secret.yml