Complete gitlab lfs secret data

Pythoner6 · Dec 31, 2023 · e0625bf · e0625bf
1 parent baa905f
commit e0625bf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/k8s/gitlab/gitlab.cue b/k8s/gitlab/gitlab.cue
@@ -1,6 +1,7 @@
 package netserv
 
 import (
+  "strconv"
   dcsi "pythoner6.dev/netserv/k8s/democratic-csi:netserv"
   cnpg "pythoner6.dev/netserv/k8s/cnpg:netserv"
   rook "pythoner6.dev/netserv/k8s/rook:netserv"
@@ -118,35 +119,36 @@ kustomizations: $default: manifest: {
       }
       refreshInterval: "0"
       target: {
-        name: metadata.name + "-yaml"
+        name: metadata.name
         deletionPolicy: "Delete"
+        creationPolicy: "Merge"
         template: {
           engineVersion: "v2"
           data:
             connection: """
-              provider: AWS
-              path_style: true
-              host: ""
-              endpoint: ""
-              region: ""
-              aws_signature_version: 4
-              aws_access_key_id: {{ .aws_access_key_id | quote }}
-              aws_secret_access_key: {{ .aws_secret_access_key | quote }}
+            provider: AWS
+            path_style: true
+            host: \(strconv.Quote(rook.objectStoreHost))
+            endpoint: \(strconv.Quote("http://" + rook.objectStoreHost + ":" + strconv.FormatInt(rook.objectStorePort, 10)))
+            region: ""
+            aws_signature_version: 4
+            aws_access_key_id: {{ .aws_access_key_id | quote }}
+            aws_secret_access_key: {{ .aws_secret_access_key | quote }}
             """
         }
       }
       data: [
         {
           secretKey: "aws_access_key_id"
           remoteRef: {
-            key: lfsBucket.metadata.name
+            key: metadata.name
             property: "AWS_ACCESS_KEY_ID"
           }
         },
         {
           secretKey: "aws_secret_access_key"
           remoteRef: {
-            key: lfsBucket.metadata.name
+            key: metadata.name
             property: "AWS_SECRET_ACCESS_KEY"
           }
         },

diff --git a/k8s/rook/rook.cue b/k8s/rook/rook.cue
@@ -116,6 +116,9 @@ kustomizations: cluster: "manifest": {
   }
 }
 
+objectStoreHost: "rook-ceph-rgw-\(kustomizations.cluster.manifest.objectstore.metadata.name).\(namespace.metadata.name).svc"
+objectStorePort: kustomizations.cluster.manifest.objectstore.spec.gateway.port
+
 //kustomizations: objectstore: #dependsOn: [kustomizations.helm]
 //kustomizations: objectstore: "manifest": {
 //}