Merge branch 'deploy-develop' of github.com:EOEPCA/eoepca-plus into d…

…eploy-develop
EOEPCA · Jun 10, 2024 · 9a48410 · 9a48410
2 parents 00bbaa1 + 06ae94b
commit 9a48410
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 7 deletions.
diff --git a/argocd/eoepca/data-access/templates/ss-data-access.yaml b/argocd/eoepca/data-access/templates/ss-data-access.yaml
@@ -0,0 +1,20 @@
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  annotations:
+    sealedsecrets.bitnami.com/namespace-wide: "true"
+  creationTimestamp: null
+  name: data-access-secrets
+  namespace: rm
+spec:
+  encryptedData:
+    CREODIAS_EODATA_S3_ACCESS_KEY: AgCrC2Fa/FkAaUF8BktWeB4WKjTEIbJUDtoMwrkvkZJT90M64x18/qrSn02cRF+fIjMlIqFXP+3a6NNdOXLQfxEAwa8uJn5NZ9kaaRTniGGddmt+OBtiU7EhruWxS7fJqvft7OZxYk5Si8o/VfzvBlBTJD2x+huXdRW5m+bXbtK2HM7i+SFBmGZzmJi2xdyZ+KOQJre6vBD9CAKMvzdZWyF2l0J2ZfdT1pwvhQLZY8oGLjCneNvyLSvio0o4tbisYKVqewcTFW7uQnE6+7sVJz/UfL+B17fXQR7XVnlxkD3ZR2wmq1GorLx8zi4beLPLpAUwcUTjfN2cvf8/pR7OYvHT5z3GVvdKRcSj3sZHnJTSWTBMnHvKOgafz6rTsvc4PkRs9va8Bbf6IgHYG9m16tAJivTKUH6zlIBJjIYL4R0JDOIjMf0pB+GJd/GvZD6jz1RwyWHlRFvdcKh3gHzllD3pUaQ8mosfOktGUr6MWvZvrFbEqmPmb18uEOr4fe59KpzTBpaBsAhDBbF7EU3X7S4Caln1RAB5vBqVaXPMdlRvjMuY9ViPdlIHw2i1SePIBodwxI9PkgOTRXokDXil1KNlfK67msWoKWHoWx2ggBKz1EG7P4DKolC7v/3aNRLNLdxMRU0qO4SvK5nNNudHlQp+yjpyOOdHlfqzJKb5mMrcKgG4GYTwjp6GoHjOxSv7NZxvdCqoLdw5gcOQE92PsPzSR05VAg==
+    CREODIAS_EODATA_S3_ACCESS_SECRET: AgBP2Qq9VQ2y15kjz3scqvLCHabjVzAAI7QYXOk7pKTB9q47dqcM+wpVguUHwzy6DnMxe5DIl+q82OY/rUghMpr+e9ya7MZ0aKzJXnGDLutapwxwTo/dgQlHhTi0Cvx+cTAr2OVbkdPTPR+nmvN5FygI/G+k5VAHFKNEVENh503jny++MU9+mxLTdncHUmSI7XF0ZiI6bGlK7fKysmYFZHCFQCKXBbGyHLRQf4Dn38AtMhrlb6cnqMkbEGLGpLFKSO0scAtj0lDyoIUUsu55OEnlh4CIHc+NaY1CNA+wxO7nRg6uAB1uuSmu67S7fXFckH06pJ6EQDCW1Umu2ISwD7RmHHWzspVgBzn9pYiP2M4VDnOLEmxPpV0wUDgp++XhRO8Ga/zmB7OQQfOUhvYOFmgkUDBuEIgMHrs3g/e7qERSwAE08HYh62WZGPrX8k81y4r5S68LDG3y2LIBrcID7UQ0H7U1Pa5Av0ni1ztZeGLACgcfYSWZ2Up4pSgQRNkj7eoB0JocYinnzwtJNxVV4+qJehifTdmDkHmZKhACFAdcjWD9dnvXqj8uWLFk+EXTRFm3A3FPe1betmKrj0mAhUZEP6m7UyRB2hf2PSe+UbL4Izxni429iQTpU+Em3H3ueNPs5MbLwf/JXCRWlvbE57b/ti4NBc8Ehmrdu5+78Hei9uSQE62yh47lAkODSwT7HIcVb/GI9oEqx3E6j8Ebn9UEPBw1kjGgkqjuEdnWF3OvcAnYkHLeG/tJ
+  template:
+    metadata:
+      annotations:
+        sealedsecrets.bitnami.com/namespace-wide: "true"
+      creationTimestamp: null
+      name: data-access-secrets
+      namespace: rm
+    type: Opaque
diff --git a/argocd/eoepca/data-access/values-core.yaml b/argocd/eoepca/data-access/values-core.yaml
@@ -8,13 +8,20 @@ data-access:
       CPL_VSIL_CURL_ALLOWED_EXTENSIONS: .TIF,.TIFF,.tif,.tiff,.xml,.jp2,.jpg,.jpeg,.png,.nc
       AWS_ENDPOINT_URL_S3: https://minio.develop.eoepca.org
       AWS_HTTPS: "FALSE"
+      CREODIAS_EODATA_S3_ENDPOINT: "http://eodata.cloudferro.com"
+      CREODIAS_EODATA_S3_REGION: "WAW3-2"
+      CREODIAS_EODATA_S3_ACCESS_KEY:
+        valueFrom:
+          secretKeyRef:
+            name: data-access-secrets
+            key: CREODIAS_EODATA_S3_ACCESS_KEY
+      CREODIAS_EODATA_S3_ACCESS_SECRET:
+        valueFrom:
+          secretKeyRef:
+            name: data-access-secrets
+            key: CREODIAS_EODATA_S3_ACCESS_SECRET
       startup_scripts:
         - /registrar_pycsw/registrar_pycsw/initialize-collections.sh
-      CREODIAS_EODATA_S3_ENDPOINT: "http://eodata.cloudferro.com"
-      CREODIAS_EODATA_S3_ACCESS_KEY: "4SMIGZNCR8LM1LSUY1HU"
-      CREODIAS_EODATA_S3_ACCESS_SECRET: "MBiw2FOddg3Fs2Rm9NoDy10qufvJ4hzjmlQ1qwzV"
-      CREODIAS_EODATA_S3_REGION: "WAW3-2"  # Cloudferro S3 doesn't seem to care about region
-
     # The data-access relies on the value 'ingress.tls.hosts[0]' to specify the service
     # hostname. So this must be supplied even if the ingress is disabled.
     ingress:
@@ -37,8 +44,16 @@ data-access:
         data:
           type: S3
           endpoint_url: "http://eodata.cloudferro.com"
-          access_key_id: "4SMIGZNCR8LM1LSUY1HU"
-          secret_access_key: "MBiw2FOddg3Fs2Rm9NoDy10qufvJ4hzjmlQ1qwzV"
+          access_key_id:
+            valueFrom:
+              secretKeyRef:
+                name: data-access-secrets
+                key: CREODIAS_EODATA_S3_ACCESS_KEY
+          secret_access_key:
+            valueFrom:
+              secretKeyRef:
+                name: data-access-secrets
+                key: CREODIAS_EODATA_S3_ACCESS_SECRET
           region_name: "WAW3-2"  # Cloudferro S3 doesn't seem to care about region
           validate_bucket_name: false
       cache: